diff --git a/pom.xml b/pom.xml index ff8378e52..253601536 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.3 + 17.103.9 diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/justice/api/resource/CourtDocumentCommandProvider.java b/progression-command/progression-command-api/src/main/java/uk/gov/justice/api/resource/CourtDocumentCommandProvider.java index 781b145c1..78e040cef 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/justice/api/resource/CourtDocumentCommandProvider.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/justice/api/resource/CourtDocumentCommandProvider.java @@ -11,7 +11,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObjectBuilder; @Provider @@ -23,7 +23,7 @@ public class CourtDocumentCommandProvider { public Action getDocumentTypeId(final Action action) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder().add("courtDocumentId", action.envelope().payloadAsJsonObject().getString("courtDocumentId")); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder().add("courtDocumentId", action.envelope().payloadAsJsonObject().getString("courtDocumentId")); final MetadataBuilder metadataBuilder = metadataFrom(action.metadata()).withName("progression.query.courtdocument"); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CaseStatusApi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CaseStatusApi.java index 20004126b..a7993f091 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CaseStatusApi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CaseStatusApi.java @@ -11,7 +11,7 @@ import uk.gov.moj.cpp.progression.domain.constant.CaseStatusEnum; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; @ServiceComponent(COMMAND_API) @@ -25,7 +25,7 @@ public class CaseStatusApi { @Handles("progression.inactive-case-bdf") public void handleCaseInactiveViaBdf(final JsonEnvelope envelope) { final JsonObject payload = envelope.payloadAsJsonObject(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("prosecutionCaseId", payload.getString("prosecutionCaseId")) .add("caseStatus", CaseStatusEnum.INACTIVE.name()) .build(); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CreateCourtDocumentApi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CreateCourtDocumentApi.java index e74268c77..56caed91b 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CreateCourtDocumentApi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/CreateCourtDocumentApi.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.command; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchAndResendLaaCaseOutcomeAPi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchAndResendLaaCaseOutcomeAPi.java index 483e10563..2093fa8fd 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchAndResendLaaCaseOutcomeAPi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchAndResendLaaCaseOutcomeAPi.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -31,7 +31,7 @@ public void handle(final JsonEnvelope envelope) { for (int i = 0; i < caseHearings.size(); i++) { final JsonObject caseHearing = caseHearings.getJsonObject(i); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseHearing.getString("caseId")) .add("hearingId", caseHearing.getString("hearingId")) .add("resultDate", caseHearing.getString("resultDate")) diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApi.java index aa59be18a..0acbb37c6 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApi.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -32,7 +32,7 @@ public void handle(final JsonEnvelope envelope) { for (int i = 0; i < applications.size(); i++) { final JsonObject application = applications.getJsonObject(i); - final JsonObjectBuilder jsonObject = Json.createObjectBuilder() + final JsonObjectBuilder jsonObject = JsonObjects.createObjectBuilder() .add(ID, application.getString(ID)); if (application.containsKey(APPLICATION_STATUS)) { jsonObject.add(APPLICATION_STATUS, application.getString(APPLICATION_STATUS)); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApi.java index f09909af0..dac41dee1 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApi.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -26,7 +26,7 @@ public void handle(final JsonEnvelope envelope) { final JsonArray jsonArrayOfCaseIds = payload.getJsonArray("caseIds"); jsonArrayOfCaseIds.forEach(caseId -> - sender.send(envelop(Json.createObjectBuilder().add("caseId", caseId).build()) + sender.send(envelop(JsonObjects.createObjectBuilder().add("caseId", caseId).build()) .withName("progression.command.handler.reapply-media-reporting-restrictions") .withMetadataFrom(envelope)) ); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApi.java index 2d245b2c1..2f14a25ae 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApi.java @@ -3,7 +3,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.stream.Stream.concat; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApi.java index 30714be71..9456cd005 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApi.java @@ -3,7 +3,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReferCasesToCourtCommandApi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReferCasesToCourtCommandApi.java index c5dfc7f1c..cc6af5a11 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReferCasesToCourtCommandApi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ReferCasesToCourtCommandApi.java @@ -22,7 +22,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -70,7 +70,7 @@ private JsonObject getUpdatedCourtReferral(final JsonObject referCasesToCourt, f } private JsonArray getUpdatedProsecutionCases(final JsonArray originProsecutionCases, final JsonEnvelope envelope) { - final JsonArrayBuilder builder = Json.createArrayBuilder(); + final JsonArrayBuilder builder = JsonObjects.createArrayBuilder(); originProsecutionCases.forEach(jsonValue -> { final JsonObject jsonObject = (JsonObject) jsonValue; builder.add(addProperty(jsonObject, PROSECUTION_CASE_IDENTIFIER, getUpdatedCaseIdentifier(jsonObject.getJsonObject(PROSECUTION_CASE_IDENTIFIER), envelope))); @@ -91,7 +91,7 @@ public static JsonObject addProperty(final JsonObject origin, final String key, } private static JsonObjectBuilder createObjectBuilder(final JsonObject origin) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()) { builder.add(entry.getKey(), entry.getValue()); } diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPi.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPi.java index cfe8aa601..f58de1e51 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPi.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPi.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -32,7 +32,7 @@ public void handle(final JsonEnvelope envelope) { for (int i = 0; i < jsonArrayOfCaseIds.size(); i++) { final String caseId = jsonArrayOfCaseIds.getJsonString(i).getString(); - sender.send(envelop(Json.createObjectBuilder().add("caseId", caseId).build()) + sender.send(envelop(JsonObjects.createObjectBuilder().add("caseId", caseId).build()) .withName("progression.command.handler.resend-laa-outcome-concluded") .withMetadataFrom(envelope)); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearch.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearch.java index 19a9e3dfd..14a2b616a 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearch.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearch.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -31,7 +31,7 @@ public void handleUpdateLaaHearingDetailsUnifiedSearch(final JsonEnvelope envelo for (int i = 0; i < jsonArrayOfCaseIds.size(); i++) { final String caseId = jsonArrayOfCaseIds.getJsonString(i).getString(); - sender.send(envelop(Json.createObjectBuilder().add("hearingId", caseId).build()) + sender.send(envelop(JsonObjects.createObjectBuilder().add("hearingId", caseId).build()) .withName("progression.command.handler.update-hearing-details-in-unified-search") .withMetadataFrom(envelope)); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/accesscontrol/PermissionRuleConstants.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/accesscontrol/PermissionRuleConstants.java index 8ecfe0e26..505ed0cb9 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/accesscontrol/PermissionRuleConstants.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/accesscontrol/PermissionRuleConstants.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.command.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.accesscontrol.drools.ExpectedPermission.builder; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoader.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoader.java index ea21b2c93..dc5edb8cc 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoader.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoader.java @@ -3,7 +3,7 @@ import static java.lang.String.format; import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -23,7 +23,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -45,7 +45,7 @@ public class UserDetailsLoader { public static boolean isUserHasPermissionForApplicationTypeCode(final Metadata metadata, final Requester requester, final String applicationTypeCode) { - final JsonObject getOrganisationForUserRequest = Json.createObjectBuilder() + final JsonObject getOrganisationForUserRequest = JsonObjects.createObjectBuilder() .add(ACTION, ACCESS_TO_STANDALONE_APPLICATION) .add(OBJECT, applicationTypeCode) .build(); @@ -63,7 +63,7 @@ public static boolean isUserHasPermissionForApplicationTypeCode(final Metadata m public List getPermissions(final Metadata metadata, final Requester requester, String defendantId) { - final JsonObject getOrganisationForUserRequest = Json.createObjectBuilder().add(ACTION, "Upload").add(OBJECT, "DefendantDocuments").add(TARGET, defendantId).build(); + final JsonObject getOrganisationForUserRequest = JsonObjects.createObjectBuilder().add(ACTION, "Upload").add(OBJECT, "DefendantDocuments").add(TARGET, defendantId).build(); final MetadataBuilder metadataWithActionName = Envelope.metadataFrom(metadata).withName("usersgroups.permissions"); final JsonEnvelope requestEnvelope = envelopeFrom(metadataWithActionName, getOrganisationForUserRequest); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/accesscontrol/PermissionConstants.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/accesscontrol/PermissionConstants.java index 0d2f92283..524d4d2c4 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/accesscontrol/PermissionConstants.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/api/accesscontrol/PermissionConstants.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.command.api.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; public class PermissionConstants { static final String COTR_DEFENCE_ACCESS = "defence-access"; diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/DefenceQueryService.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/DefenceQueryService.java index fd015a04a..59ea92561 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/DefenceQueryService.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/DefenceQueryService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command.service; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/OrganisationService.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/OrganisationService.java index 8d1ce216d..6c9753529 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/OrganisationService.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/OrganisationService.java @@ -5,7 +5,7 @@ import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.Envelope; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import java.util.ArrayList; @@ -21,7 +21,7 @@ public class OrganisationService { public JsonObject getAssociatedOrganisation(final Envelope envelope, final String defendantId, final Requester requester) { - final JsonObject getUserGroupsForUserRequest = Json.createObjectBuilder().add("defendantId", defendantId).build(); + final JsonObject getUserGroupsForUserRequest = JsonObjects.createObjectBuilder().add("defendantId", defendantId).build(); final Envelope requestEnvelope = Enveloper.envelop(getUserGroupsForUserRequest) .withName(DEFENCE_ASSOCIATION_QUERY).withMetadataFrom(envelope); final Envelope response = requester.requestAsAdmin(requestEnvelope, JsonObject.class); @@ -33,7 +33,7 @@ public final List getAssociatedDefendants(final Envelope envelope, fina final String userId = envelope.metadata().userId() .orElseThrow(() -> new IllegalStateException("User id Not Supplied for the UserGroups look up")); - final JsonObject request = Json.createObjectBuilder().add("userId", userId).build(); + final JsonObject request = JsonObjects.createObjectBuilder().add("userId", userId).build(); final Envelope requestEnvelope = Enveloper.envelop(request) .withName(DEFENCE_ASSOCIATED_DEFENDANTS_QUERY).withMetadataFrom(envelope); final Envelope response = requester.requestAsAdmin(requestEnvelope, JsonObject.class); diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryService.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryService.java index 06b010909..984b249c1 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryService.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.command.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryService.java b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryService.java index 871aa6579..0a81fc6cf 100644 --- a/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryService.java +++ b/progression-command/progression-command-api/src/main/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command.service; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -19,7 +19,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class UserGroupQueryService { @@ -72,7 +72,7 @@ public Optional validateNonCPSUserOrg(final JsonEnvelope envelope, final } private JsonObject getUserGroups(final Metadata metadata, final UUID userId) { - final JsonObject getGroupsForUserRequest = Json.createObjectBuilder().add(USER_ID, userId.toString()).build(); + final JsonObject getGroupsForUserRequest = JsonObjects.createObjectBuilder().add(USER_ID, userId.toString()).build(); final Metadata metadataWithActionName = metadataFrom(metadata).withName("usersgroups.get-logged-in-user-groups").build(); final JsonEnvelope requestEnvelope = envelopeFrom(metadataWithActionName, getGroupsForUserRequest); final Envelope response = requester.request(requestEnvelope, JsonObject.class); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCaseNoteApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCaseNoteApiTest.java index 5f91dc84b..45e1fc3ad 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCaseNoteApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCaseNoteApiTest.java @@ -15,7 +15,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ public class AddCaseNoteApiTest { @Test public void shouldAddCaseNote() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("note", "This is a new case note.") .build(); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCourtDocumentApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCourtDocumentApiTest.java index ee1a1a4eb..8cac6dedf 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCourtDocumentApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AddCourtDocumentApiTest.java @@ -4,7 +4,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ApplicationNoteApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ApplicationNoteApiTest.java index 612aa5526..e5ea3ce4e 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ApplicationNoteApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ApplicationNoteApiTest.java @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -43,7 +43,7 @@ public class ApplicationNoteApiTest { @Test public void shouldAddApplicationNote() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("note", "Sample application note") .add("isPinned", false) .build(); @@ -58,7 +58,7 @@ public void shouldAddApplicationNote() { @Test public void shouldEditApplicationNote() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("isPinned", true) .build(); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AuditCourtDocumentApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AuditCourtDocumentApiTest.java index 8ffc2f1aa..99067f1ed 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AuditCourtDocumentApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/AuditCourtDocumentApiTest.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ public void whenRequestReceivedPassItToCommandHandler() { final UUID uuid = randomUUID(); final UUID userId = randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("organisationId", randomUUID().toString()) .build(); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CaseStatusApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CaseStatusApiTest.java index 2e84e2c9e..0d6e40f3d 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CaseStatusApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CaseStatusApiTest.java @@ -2,7 +2,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CorrectHearingDaysWithoutCourtCentreApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CorrectHearingDaysWithoutCourtCentreApiTest.java index 6f0fd9d8b..9c0dd03c7 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CorrectHearingDaysWithoutCourtCentreApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CorrectHearingDaysWithoutCourtCentreApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CourtRegisterApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CourtRegisterApiTest.java index 91107d7f4..a8c22591c 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CourtRegisterApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/CourtRegisterApiTest.java @@ -20,7 +20,7 @@ import java.time.LocalDate; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -92,7 +92,7 @@ public void shouldGenerateCourtRegisterDocumentByDate() { } private JsonEnvelope buildGenerateCourtRegisterByDateEnvelope() { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("registerDate", LocalDate.now().toString()) .build(); final Metadata metadata = Envelope @@ -105,7 +105,7 @@ private JsonEnvelope buildGenerateCourtRegisterByDateEnvelope() { } private JsonEnvelope buildGenerateCourtRegisterEnvelope() { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .build(); final Metadata metadata = Envelope .metadataBuilder() @@ -117,8 +117,8 @@ private JsonEnvelope buildGenerateCourtRegisterEnvelope() { } private JsonEnvelope buildEnvelope() { - final JsonObject payload = Json.createObjectBuilder() - .add("courtRegisterDocumentRequest", Json.createObjectBuilder().add("courtCentreId", randomUUID().toString()).build()) + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("courtRegisterDocumentRequest", JsonObjects.createObjectBuilder().add("courtCentreId", randomUUID().toString()).build()) .build(); final Metadata metadata = Envelope diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantMatchingApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantMatchingApiTest.java index fca5d13e8..f2e43ab04 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantMatchingApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantMatchingApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ public class DefendantMatchingApiTest { @Test public void shouldMatchDefendant() { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .add("prosecutionCaseId", randomUUID().toString()) .add("matchedDefendants", createArrayBuilder().build()) diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantUnmatchingApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantUnmatchingApiTest.java index 8d6a55758..65bc9f0cc 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantUnmatchingApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DefendantUnmatchingApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ public class DefendantUnmatchingApiTest { @Test public void shouldUnmatchDefendant() { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("unmatchedDefendants", createArrayBuilder().build()) .build(); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteDefendantFinancialMeansApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteDefendantFinancialMeansApiTest.java index d1f8b83a7..77780198f 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteDefendantFinancialMeansApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteDefendantFinancialMeansApiTest.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.JsonEnvelope; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; @@ -29,7 +29,7 @@ public class DeleteDefendantFinancialMeansApiTest { public void shouldRaiseCommandToDeleteDefendantFinancialMeans() throws Exception { final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( metadataWithDefaults().withName("progression.delete-financial-means"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .build() ); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteNotificationInfoApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteNotificationInfoApiTest.java index 160652a4e..c131e6a23 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteNotificationInfoApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/DeleteNotificationInfoApiTest.java @@ -10,7 +10,7 @@ import java.time.ZonedDateTime; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,7 +31,7 @@ public class DeleteNotificationInfoApiTest { public void shouldHandleDeleteNotificationInfo() { final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( metadataWithDefaults().withName("progression.delete-notification-info"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .build() ); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCaseNoteApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCaseNoteApiTest.java index 15873e0ec..4581337c2 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCaseNoteApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCaseNoteApiTest.java @@ -15,7 +15,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ public class EditCaseNoteApiTest { @Test public void shouldEditCaseNote() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("isPinned", true) .build(); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCourtFeeForCivilApplicationApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCourtFeeForCivilApplicationApiTest.java index 05eb1ce1a..cd6a146bb 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCourtFeeForCivilApplicationApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/EditCourtFeeForCivilApplicationApiTest.java @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class EditCourtFeeForCivilApplicationApiTest { @Test public void shouldEditCivilFee() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("applicationId", "cca197ad-2a4c-4cb2-acf9-d4c5e114e3d1") - .add("courtApplicationPayment", Json.createArrayBuilder().add(Json.createObjectBuilder() + .add("courtApplicationPayment", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("feeType", "Initial") .add("feeStatus", "Outstanding") .add("paymentReference", "REF001") diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/FormApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/FormApiTest.java index aa3a16735..93ba4f44f 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/FormApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/FormApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateCourtApplicationProceedingsCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateCourtApplicationProceedingsCommandApiTest.java index 37b03dfb3..74a902fa2 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateCourtApplicationProceedingsCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateCourtApplicationProceedingsCommandApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -12,7 +12,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import uk.gov.justice.services.adapter.rest.exception.BadRequestException; import uk.gov.justice.services.common.exception.ForbiddenRequestException; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.core.sender.Sender; @@ -22,12 +21,12 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; +import org.mockito.ArgumentCaptor;import org.mockito.Captor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; @@ -48,7 +47,7 @@ public class InitiateCourtApplicationProceedingsCommandApiTest { private InitiateCourtApplicationProceedingsCommandApi initiateCourtApplicationProceedingsCommandApi; @Test - public void shouldInitialCourtProceedingsForCourtApplicationWhenNoApplicationReferenceSet() { + public void shouldInitialCourtProceedingsForCourtApplication() { final JsonEnvelope commandEnvelope = buildEnvelope(); final Envelope queryResponseEnvelope = mock(Envelope.class); @@ -66,128 +65,6 @@ public void shouldInitialCourtProceedingsForCourtApplicationWhenNoApplicationRef assertThat(newCommand.payload(), equalTo(commandEnvelope.payloadAsJsonObject())); } - @Test - public void shouldInitialCourtProceedingsForCourtApplicationWhenApplicationReferenceIsValid() { - final String validURN = "ASD1RTY5WE1";//11 Char length, alfaNumeric, all upper case - final JsonObject payload = createObjectBuilder() - .add("courtApplication", createObjectBuilder() - .add("id", randomUUID().toString()) - .add("type", createObjectBuilder() - .add("code", "anyCode") - .add("linkType", "STANDALONE")) - .add("applicationReference", validURN) - .build()) - .build(); - - final JsonEnvelope commandEnvelope = buildEnvelope(payload); - - final Envelope queryResponseEnvelope = mock(Envelope.class); - when(queryResponseEnvelope.payload()).thenReturn(createObjectBuilder().add("hasPermission", true).build()); - when(requester.request(any(), any())).thenReturn(queryResponseEnvelope); - - - initiateCourtApplicationProceedingsCommandApi.initiateCourtApplicationProceedings(commandEnvelope); - - verify(sender, times(1)).send(envelopeCaptor.capture()); - - final DefaultEnvelope newCommand = envelopeCaptor.getValue(); - - assertThat(newCommand.metadata().name(), is("progression.command.initiate-court-proceedings-for-application")); - assertThat(newCommand.payload(), equalTo(commandEnvelope.payloadAsJsonObject())); - } - - @Test - public void shouldValidationFailOnInitialCourtProceedingsForCourtApplicationWhenApplicationReferenceIsEmpty() { - final String invalidURN = ""; - final JsonObject payload = createObjectBuilder() - .add("courtApplication", createObjectBuilder() - .add("id", randomUUID().toString()) - .add("type", createObjectBuilder() - .add("code", "anyCode") - .add("linkType", "STANDALONE")) - .add("applicationReference", invalidURN) - .build()) - .build(); - - final JsonEnvelope commandEnvelope = buildEnvelope(payload); - - final Envelope queryResponseEnvelope = mock(Envelope.class); - when(queryResponseEnvelope.payload()).thenReturn(createObjectBuilder().add("hasPermission", true).build()); - when(requester.request(any(), any())).thenReturn(queryResponseEnvelope); - - assertThrows(BadRequestException.class, () -> initiateCourtApplicationProceedingsCommandApi.initiateCourtApplicationProceedings(commandEnvelope)); - - } - - @Test - public void shouldValidationFailOnInitialCourtProceedingsForCourtApplicationWhenApplicationReferenceIsNineCharLength() { - final String invalidURN = "ASDERTYUW";//NOT 11 Char length, alfaNumeric, all upper case - final JsonObject payload = createObjectBuilder() - .add("courtApplication", createObjectBuilder() - .add("id", randomUUID().toString()) - .add("type", createObjectBuilder() - .add("code", "anyCode") - .add("linkType", "STANDALONE")) - .add("applicationReference", invalidURN) - .build()) - .build(); - - final JsonEnvelope commandEnvelope = buildEnvelope(payload); - - final Envelope queryResponseEnvelope = mock(Envelope.class); - when(queryResponseEnvelope.payload()).thenReturn(createObjectBuilder().add("hasPermission", true).build()); - when(requester.request(any(), any())).thenReturn(queryResponseEnvelope); - - assertThrows(BadRequestException.class, () -> initiateCourtApplicationProceedingsCommandApi.initiateCourtApplicationProceedings(commandEnvelope)); - - } - - @Test - public void shouldValidationFailOnInitialCourtProceedingsForCourtApplicationWhenApplicationReferenceIsNotAllCapital() { - final String invalidURN = "ASDERTYUWXe";//11 Char length, alfaNumeric, NOT all upper case - final JsonObject payload = createObjectBuilder() - .add("courtApplication", createObjectBuilder() - .add("id", randomUUID().toString()) - .add("type", createObjectBuilder() - .add("linkType", "STANDALONE") - .add("code", "anyCode")) - .add("applicationReference", invalidURN) - .build()) - .build(); - - final JsonEnvelope commandEnvelope = buildEnvelope(payload); - - final Envelope queryResponseEnvelope = mock(Envelope.class); - when(queryResponseEnvelope.payload()).thenReturn(createObjectBuilder().add("hasPermission", true).build()); - when(requester.request(any(), any())).thenReturn(queryResponseEnvelope); - - assertThrows(BadRequestException.class, () -> initiateCourtApplicationProceedingsCommandApi.initiateCourtApplicationProceedings(commandEnvelope)); - - } - - @Test - public void shouldValidationFailOnInitialCourtProceedingsForCourtApplicationWhenApplicationReferenceIsNotAllAlfaNumeric() { - final String invalidURN = "ASD!RTYU1EX";//11 Char length, NOT all alfaNumeric, all upper case - final JsonObject payload = createObjectBuilder() - .add("courtApplication", createObjectBuilder() - .add("id", randomUUID().toString()) - .add("type", createObjectBuilder() - .add("code", "anyCode") - .add("linkType", "STANDALONE")) - .add("applicationReference", invalidURN) - .build()) - .build(); - - final JsonEnvelope commandEnvelope = buildEnvelope(payload); - - final Envelope queryResponseEnvelope = mock(Envelope.class); - when(queryResponseEnvelope.payload()).thenReturn(createObjectBuilder().add("hasPermission", true).build()); - when(requester.request(any(), any())).thenReturn(queryResponseEnvelope); - - assertThrows(BadRequestException.class, () -> initiateCourtApplicationProceedingsCommandApi.initiateCourtApplicationProceedings(commandEnvelope)); - - } - @Test public void shouldThrowForbiddenRequestExceptionForInitialCourtProceedingsForCourtApplicationWhenUserNotAuthorisedForTheApplicationType() { final JsonEnvelope commandEnvelope = buildEnvelope(); @@ -231,17 +108,10 @@ private JsonEnvelope buildEnvelope() { final JsonObject payload = createObjectBuilder() .add("courtApplication", createObjectBuilder() .add("id", randomUUID().toString()) - .add("type", createObjectBuilder() - .add("code", "anyCode") - .add("linkType", "STANDALONE")) + .add("type", createObjectBuilder().add("code", "anyCode").add("linkType", "STANDALONE")) .build()) .build(); - return buildEnvelope(payload); - } - - private JsonEnvelope buildEnvelope(final JsonObject payload) { - final Metadata metadata = Envelope .metadataBuilder() .withName("progression.initiate-court-proceedings-for-application") diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateGroupCasesApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateGroupCasesApiTest.java index 61faba3a8..ede56ef9e 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateGroupCasesApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/InitiateGroupCasesApiTest.java @@ -17,7 +17,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -66,8 +66,8 @@ public void shouldSendCommand() { } private JsonEnvelope buildEnvelope() { - final JsonObject payload = Json.createObjectBuilder() - .add("civilBulkInitiateCourtProceedings", Json.createObjectBuilder().build()) + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("civilBulkInitiateCourtProceedings", JsonObjects.createObjectBuilder().build()) .build(); final Metadata metadata = Envelope diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/LinkSplitMergeCasesApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/LinkSplitMergeCasesApiTest.java index bcf88e48a..d8f736d98 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/LinkSplitMergeCasesApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/LinkSplitMergeCasesApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NotificationApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NotificationApiTest.java index 639e05ec2..6c4d43b13 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NotificationApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NotificationApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.atLeastOnce; @@ -17,7 +17,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -42,7 +42,7 @@ public class NotificationApiTest { @Test public void shouldHandleSendEmail() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .add("applicationId", randomUUID().toString()) .add("materialId", randomUUID().toString()) @@ -63,7 +63,7 @@ public void shouldHandleSendEmail() { @Test public void shouldHandleSendPrint() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .add("notificationId", randomUUID().toString()) .add("materialId", randomUUID().toString()) @@ -80,7 +80,7 @@ public void shouldHandleSendPrint() { @Test public void shouldHandleSendToCps() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("courtDocumentId", randomUUID().toString()) .add("sendToCps", true) .build(); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NowDocumentRequestApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NowDocumentRequestApiTest.java index 3aec3989d..98e88143f 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NowDocumentRequestApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/NowDocumentRequestApiTest.java @@ -21,7 +21,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -80,8 +80,8 @@ public void shouldNotProcessNowDocumentRequestWhenHearingNowsFeatureIsEnabled() } private JsonEnvelope buildEnvelope() { - final JsonObject payload = Json.createObjectBuilder() - .add("nowDocumentRequest", Json.createObjectBuilder().add("materialId", randomUUID().toString()).build()) + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("nowDocumentRequest", JsonObjects.createObjectBuilder().add("materialId", randomUUID().toString()).build()) .build(); final Metadata metadata = Envelope diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/OnlinePleasAllocationApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/OnlinePleasAllocationApiTest.java index 4380c608e..2e7b69bd5 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/OnlinePleasAllocationApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/OnlinePleasAllocationApiTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApiTest.java index 498132e19..e4ff647bd 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PatchUpdateApplicationsStatusApiTest.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -46,10 +46,10 @@ class PatchUpdateApplicationsStatusApiTest { void shouldHandlePatchUpdateApplications() { final UUID application1Id = randomUUID(); final UUID application2Id = randomUUID(); - final JsonObject payload = Json.createObjectBuilder() - .add("applications", Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("id", application1Id.toString()).add("applicationStatus", FINALISED.toString()).build()) - .add(Json.createObjectBuilder().add("id", application2Id.toString()).build()) + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("applications", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("id", application1Id.toString()).add("applicationStatus", FINALISED.toString()).build()) + .add(JsonObjects.createObjectBuilder().add("id", application2Id.toString()).build()) ) .build(); final MetadataBuilder metadataBuilder = metadataFrom(metadataWithRandomUUID("progression.patch-update-application-status").withUserId(randomUUID().toString()).build()); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PetFormApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PetFormApiTest.java index 26ad945fa..5313e5505 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PetFormApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PetFormApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PleadOnlineApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PleadOnlineApiTest.java index 63ed5e5ac..975c70f98 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PleadOnlineApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PleadOnlineApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PrisonCourtRegisterApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PrisonCourtRegisterApiTest.java index 3cc555896..2bf910b84 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PrisonCourtRegisterApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/PrisonCourtRegisterApiTest.java @@ -17,7 +17,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -64,8 +64,8 @@ public void shouldSendCommand() { } private JsonEnvelope buildEnvelope() { - final JsonObject payload = Json.createObjectBuilder() - .add("prisonCourtRegisterDocumentRequest", Json.createObjectBuilder().build()) + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("prisonCourtRegisterDocumentRequest", JsonObjects.createObjectBuilder().build()) .build(); final Metadata metadata = Envelope diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApiTest.java index b508f302b..43b2bfb2a 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReApplyMediaReportingRestrictionOnCaseCommandApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.containsString; import static org.mockito.ArgumentCaptor.forClass; import static org.mockito.Mockito.times; @@ -21,7 +21,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.MatcherAssert; @@ -65,7 +65,7 @@ public class ReApplyMediaReportingRestrictionOnCaseCommandApiTest { public void testHandleReApplyMediaReportingRestrictionOnCase() { final UUID caseId1 = randomUUID(); final UUID caseId2 = randomUUID(); - final JsonObject commandPayload = Json.createObjectBuilder() + final JsonObject commandPayload = JsonObjects.createObjectBuilder() .add("caseIds", createArrayBuilder() .add(caseId1.toString()) .add(caseId2.toString()) diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApiTest.java index 69e1b7496..dfc230a26 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForApplicationApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -29,7 +29,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -312,7 +312,7 @@ public void shouldRejectReceiveRepresentationOrderWhenApplicationNotFound() thro public void shouldThrowBadRequestExceptionRecordRepresentationOrderForApplicationWithoutOffences() { final UUID applicationId = randomUUID(); final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", applicationId.toString()) .add("subjectId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForDefendantApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForDefendantApiTest.java index c54e5bf74..89d839596 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForDefendantApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ReceiveRepresentationOrderForDefendantApiTest.java @@ -20,7 +20,7 @@ import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -61,13 +61,13 @@ public class ReceiveRepresentationOrderForDefendantApiTest { @Test public void shouldReceiveRepresentationOrderForDefendantAPI() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("prosecutionCaseId", randomUUID().toString()) .add("defendantId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) .build()); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); when(organisationService.getAssociatedOrganisation(any(), any(), any())).thenReturn(jsonObjectPayload); receiveRepresentationOrderForDefendantApi.handle(envelope); verify(sender, times(1)).send(envelopeArgumentCaptor.capture()); @@ -80,13 +80,13 @@ public void shouldReceiveRepresentationOrderForDefendantAPI() { @Test public void shouldReceiveRepresentationOrderForDefendantAPIWithNoAssociation() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("prosecutionCaseId", randomUUID().toString()) .add("defendantId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) .build()); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisation(any(), any(), any())).thenReturn(jsonObjectPayload); receiveRepresentationOrderForDefendantApi.handle(envelope); verify(sender, times(1)).send(envelopeArgumentCaptor.capture()); @@ -98,7 +98,7 @@ public void shouldReceiveRepresentationOrderForDefendantAPIWithNoAssociation() { @Test public void shouldThrowBadRequestIfOffenceIdIsNotValidUUID() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .add("offenceId", "invalid-uuid") .build()); @@ -110,7 +110,7 @@ public void shouldThrowBadRequestIfOffenceIdIsNotValidUUID() { @Test public void shouldThrowBadRequestIfOffenceIdIsnull() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .build()); @@ -121,7 +121,7 @@ public void shouldThrowBadRequestIfOffenceIdIsnull() { @Test public void shouldThrowBadRequestIfDefendantIdIsNotValidUUID() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", "invalid-uuid") .add("offenceId", randomUUID().toString()) .build()); @@ -133,7 +133,7 @@ public void shouldThrowBadRequestIfDefendantIdIsNotValidUUID() { @Test public void shouldThrowBadRequestIfDefendantIdIsNull() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("offenceId", randomUUID().toString()) .build()); @@ -144,7 +144,7 @@ public void shouldThrowBadRequestIfDefendantIdIsNull() { @Test public void shouldThrowBadRequestIfCasedIsNull() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("offenceId", randomUUID().toString()) .add("defendantId", randomUUID().toString()) .build()); @@ -156,7 +156,7 @@ public void shouldThrowBadRequestIfCasedIsNull() { @Test public void shouldThrowBadRequestIfProsecutionCaseIdIsNotValidUUID() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) .add("prosecutionCaseId", "invalid-uuid") diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApiTest.java index 4b08d0acd..b858787ec 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RecordLAAReferenceApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -33,7 +33,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -93,7 +93,7 @@ void setup() { @Test public void shouldRecordLAAReferenceForOffence() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.handler.record-laareference-for-offence", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .add("defendantId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) @@ -108,7 +108,7 @@ public void shouldRecordLAAReferenceForOffence() { @Test public void shouldThrowBadRequestIfOffenceIdIsNotValidUUIDForCase() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .add("offenceId", "invalid-uuid") .build()); @@ -120,7 +120,7 @@ public void shouldThrowBadRequestIfOffenceIdIsNotValidUUIDForCase() { @Test public void shouldThrowBadRequestIfOffenceIdIsnullForCase() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .build()); @@ -131,7 +131,7 @@ public void shouldThrowBadRequestIfOffenceIdIsnullForCase() { @Test public void shouldThrowBadRequestIfDefendantIdIsNotValidUUIDForCase() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", "invalid-uuid") .add("offenceId", randomUUID().toString()) .build()); @@ -143,7 +143,7 @@ public void shouldThrowBadRequestIfDefendantIdIsNotValidUUIDForCase() { @Test public void shouldThrowBadRequestIfDefendantIdIsNullForCase() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("offenceId", randomUUID().toString()) .build()); @@ -154,7 +154,7 @@ public void shouldThrowBadRequestIfDefendantIdIsNullForCase() { @Test public void shouldThrowBadRequestIfCasedIsNullForCase() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("offenceId", randomUUID().toString()) .add("defendantId", randomUUID().toString()) .build()); @@ -166,7 +166,7 @@ public void shouldThrowBadRequestIfCasedIsNullForCase() { @Test public void shouldThrowBadRequestIfProsecutionCaseIdIsNotValidUUIDForCase() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-defendant", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) .add("prosecutionCaseId", "invalid-uuid") @@ -184,7 +184,7 @@ public void shouldRecordLAAReferenceForApplication() { final UUID childApplicationId1 = randomUUID(); final UUID childApplicationId2 = randomUUID(); final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.handler.record-laareference-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", parentApplicationId.toString()) .add("subjectId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) @@ -222,7 +222,7 @@ public void shouldRecordLAAReferenceForApplication() { @Test public void shouldThrowBadRequestIfApplicationIdIsNullForApplication() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("subjectId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) .build()); @@ -234,7 +234,7 @@ public void shouldThrowBadRequestIfApplicationIdIsNullForApplication() { @Test public void shouldThrowBadRequestIfApplicationIdIsNotValidUUIDForApplication() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", "invalid-uuid") .add("subjectId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) @@ -247,7 +247,7 @@ public void shouldThrowBadRequestIfApplicationIdIsNotValidUUIDForApplication() { @Test public void shouldThrowBadRequestIfSubjectIdIsNullForApplication() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) .build()); @@ -259,7 +259,7 @@ public void shouldThrowBadRequestIfSubjectIdIsNullForApplication() { @Test public void shouldThrowBadRequestIfSubjectIdIsNotValidUUIDForApplication() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .add("subjectId", "invalid-uuid") .add("offenceId", randomUUID().toString()) @@ -272,7 +272,7 @@ public void shouldThrowBadRequestIfSubjectIdIsNotValidUUIDForApplication() { @Test public void shouldThrowBadRequestIfOffenceIdIsNullForApplication() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .add("subjectId", randomUUID().toString()) .build()); @@ -284,7 +284,7 @@ public void shouldThrowBadRequestIfOffenceIdIsNullForApplication() { @Test public void shouldThrowBadRequestIfOffenceIdIsNotValidUUIDForApplication() { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.receive-representationorder-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .add("subjectId", randomUUID().toString()) .add("offenceId", "invalid-uuid") @@ -298,7 +298,7 @@ public void shouldThrowBadRequestIfOffenceIdIsNotValidUUIDForApplication() { public void shouldUpdateLAAReferenceAsApplicationHasNoOffencesAndIsNotChildApplication() throws Exception { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.record-laareference-for-application-on-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .build()); final JsonObject payload = CommandClientTestBase.readJson("json/progression-query-application-without-offences.json", JsonObject.class); @@ -316,7 +316,7 @@ public void shouldUpdateLAAReferenceAsApplicationHasOOffencesAndHasChildApplicat final UUID childApplicationId2 = randomUUID(); final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.record-laareference-for-application-on-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", parentApplicationId.toString()) .build()); final JsonObject payload = CommandClientTestBase.readJson("json/progression-query-application-without-offences.json", JsonObject.class); @@ -355,7 +355,7 @@ public void shouldUpdateLAAReferenceAsApplicationHasOOffencesAndHasChildApplicat public void shouldRejectUpdatingLAAReferenceWhenApplicationHasOffences() throws Exception { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.record-laareference-for-application-on-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .build()); final JsonObject payload = CommandClientTestBase.readJson("json/progression-query-application-with-offences.json", JsonObject.class); @@ -366,7 +366,7 @@ public void shouldRejectUpdatingLAAReferenceWhenApplicationHasOffences() throws @Test public void shouldRejectUpdatingLAAReferenceWhenApplicationIsChildApplication() throws Exception { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.record-laareference-for-application-on-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .build()); final JsonObject payload = CommandClientTestBase.readJson("json/progression-query-child-application.json", JsonObject.class); @@ -378,7 +378,7 @@ public void shouldRejectUpdatingLAAReferenceWhenApplicationIsChildApplication() public void shouldRejectUpdatingLAAReferenceWhenApplicationNotFound() throws Exception { final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.record-laareference-for-application-on-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", randomUUID().toString()) .build()); when(progressionQueryService.getCourtApplicationById(any(),any())).thenReturn(Optional.empty()); @@ -389,7 +389,7 @@ public void shouldRejectUpdatingLAAReferenceWhenApplicationNotFound() throws Exc public void shouldThrowBadRequestExceptionRecordLAAReferenceForApplication() { final UUID applicationId = randomUUID(); final Metadata metadata = CommandClientTestBase.metadataFor("progression.command.handler.record-laareference-for-application", randomUUID().toString()); - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, Json.createObjectBuilder() + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, JsonObjects.createObjectBuilder() .add("applicationId", applicationId.toString()) .add("subjectId", randomUUID().toString()) .add("offenceId", randomUUID().toString()) diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesApiTest.java index 8d9f090f0..5b615779b 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveDeletedHearingChildEntriesByBdfCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveDeletedHearingChildEntriesByBdfCommandApiTest.java index 1f60821ca..c631129f9 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveDeletedHearingChildEntriesByBdfCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/RemoveDeletedHearingChildEntriesByBdfCommandApiTest.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.justice.services.messaging.spi.DefaultEnvelope; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -34,7 +34,7 @@ public class RemoveDeletedHearingChildEntriesByBdfCommandApiTest { public void shouldRaiseCommandToRemoveDeletedHearingChildEntriesBdf() throws Exception { final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( metadataWithDefaults().withName("progression.command.remove-deleted-hearing-child-entries-bdf"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .build() ); @@ -46,7 +46,7 @@ public void shouldRaiseCommandToRemoveDeletedHearingChildEntriesBdf() throws Exc public void shouldRaiseCommandToRemoveDuplicateApplications() throws Exception { final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( metadataWithDefaults().withName("progression.command.handler.remove-duplicate-application-bdf"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .build() ); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPiTest.java index 6de6d6402..3a9fd4e4a 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResendLaaCaseOutcomeAPiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentCaptor.forClass; @@ -18,7 +18,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.Matchers; @@ -43,7 +43,7 @@ public void testHandleResendLaaCaseOutcome() { final UUID caseId1 = randomUUID(); final UUID caseId2 = randomUUID(); - final JsonObject commandPayload = Json.createObjectBuilder() + final JsonObject commandPayload = JsonObjects.createObjectBuilder() .add("caseIds", createArrayBuilder() .add(caseId1.toString()) .add(caseId2.toString()) diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResultHearingByBdfCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResultHearingByBdfCommandApiTest.java index 4c7d6bcf4..9b1438d12 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResultHearingByBdfCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ResultHearingByBdfCommandApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ShareCourtDocumentCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ShareCourtDocumentCommandApiTest.java index e6e952317..c2dd78852 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ShareCourtDocumentCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/ShareCourtDocumentCommandApiTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.command; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UnlinkCasesApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UnlinkCasesApiTest.java index 6de95bfd5..1ee134916 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UnlinkCasesApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UnlinkCasesApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCivilFeesApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCivilFeesApiTest.java index 034692889..1577f017d 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCivilFeesApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCivilFeesApiTest.java @@ -13,7 +13,7 @@ import uk.gov.justice.services.messaging.spi.DefaultEnvelope; import uk.gov.justice.services.messaging.spi.DefaultJsonEnvelopeProvider; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -39,9 +39,9 @@ public class UpdateCivilFeesApiTest { @Test public void shouldAddCivilFee() { //Given - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", "cca197ad-2a4c-4cb2-acf9-d4c5e114e3d1") - .add("civilFees", Json.createArrayBuilder().add(Json.createObjectBuilder() + .add("civilFees", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("feeType", "Initial") .add("feeStatus", "Outstanding") .add("paymentReference", "REF001") diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCourtDocumentApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCourtDocumentApiTest.java index 3bc7f4765..ca68f3942 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCourtDocumentApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCourtDocumentApiTest.java @@ -19,7 +19,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -80,7 +80,7 @@ public void shouldUpdateDocument() { } private JsonEnvelope buildEnvelope() { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final Metadata metadata = Envelope .metadataBuilder() diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCpsProsecutorApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCpsProsecutorApiTest.java index f00fc947d..daf7e6192 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCpsProsecutorApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateCpsProsecutorApiTest.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -62,7 +62,7 @@ public void handleUpdateCpsProsecutorDetails() { } private JsonEnvelope buildEnvelope() { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final Metadata metadata = Envelope .metadataBuilder() diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantCommandApiTest.java index 725682562..7b23fd4de 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantCommandApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantListingStatusCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantListingStatusCommandApiTest.java index 7a0611213..e58dadeb8 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantListingStatusCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateDefendantListingStatusCommandApiTest.java @@ -19,7 +19,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -79,7 +79,7 @@ public void shouldUpdateDefendantListingStatus() { } private JsonEnvelope buildEnvelope() { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final Metadata metadata = Envelope .metadataBuilder() diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearchTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearchTest.java index fd00a5d6a..88cd222a5 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearchTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UpdateLaaHearingInUnifiedSearchTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentCaptor.forClass; @@ -18,7 +18,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.Matchers; @@ -42,7 +42,7 @@ public class UpdateLaaHearingInUnifiedSearchTest { public void testHandleUpdateLaaHearingDetailsUnifiedSearch() { final UUID hearingId1 = randomUUID(); final UUID hearingId2 = randomUUID(); - final JsonObject commandPayload = Json.createObjectBuilder() + final JsonObject commandPayload = JsonObjects.createObjectBuilder() .add("hearingIds", createArrayBuilder() .add(hearingId1.toString()) .add(hearingId2.toString()) diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UploadCourtDocumentApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UploadCourtDocumentApiTest.java index 849e2f5d5..089568ec8 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UploadCourtDocumentApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/UploadCourtDocumentApiTest.java @@ -15,7 +15,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; @@ -57,7 +57,7 @@ public void shouldUpdateOffences() { @Test public void shouldUploadMaterial() { - when(command.payloadAsJsonObject()).thenReturn(Json.createObjectBuilder().build()); + when(command.payloadAsJsonObject()).thenReturn(JsonObjects.createObjectBuilder().build()); when(userDetailsLoader.isPermitted(any(), any())).thenReturn(true); when(command.metadata()).thenReturn(CommandClientTestBase.metadataFor("progression.command.upload-court-document", UUID.randomUUID().toString())); uploadCourtDocumentApi.handleUploadForDefence(command); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoaderTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoaderTest.java index 5f90838f1..5f3f932eb 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoaderTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/api/UserDetailsLoaderTest.java @@ -2,7 +2,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/cotr/CotrCommandApiTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/cotr/CotrCommandApiTest.java index ca9a4ea52..b9aed66c7 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/cotr/CotrCommandApiTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/cotr/CotrCommandApiTest.java @@ -2,8 +2,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -32,7 +32,7 @@ import java.time.LocalDate; import java.util.Arrays; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -300,8 +300,8 @@ private JsonObject getServeCotrRequestPayload() { } private Envelope getAssociatedDefendantsEnvelope(final Metadata metadata, final String defendant1, final String defendant2){ - final JsonObject jsonObjectPayload = Json.createObjectBuilder() - .add(DEFENDANT_IDS, Json.createArrayBuilder() + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder() + .add(DEFENDANT_IDS, JsonObjects.createArrayBuilder() .add(defendant1) .add(defendant2) ).build(); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/OrganisationServiceTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/OrganisationServiceTest.java index 48dddb074..df5112059 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/OrganisationServiceTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/OrganisationServiceTest.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -54,8 +54,8 @@ public void shouldReturnOrganisationDetails() { @Test public void shouldReturnEmptyOrganisationDetails() { - final JsonObject jsonObjectPayload = Json.createObjectBuilder() - .add("association", Json.createObjectBuilder()) + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder() + .add("association", JsonObjects.createObjectBuilder()) .build(); final Metadata metadata = CommandClientTestBase.metadataFor(DEFENCE_ASSOCIATION_QUERY, randomUUID().toString()); final Envelope envelope = Envelope.envelopeFrom(metadata, jsonObjectPayload); @@ -69,8 +69,8 @@ public void shouldReturnEmptyOrganisationDetails() { @Test public void shouldReturnDefendantIdsWhenDefenceIsAssociatedWithDefendants() { - final JsonObject jsonObjectPayload = Json.createObjectBuilder() - .add("defendantIds", Json.createArrayBuilder() + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder() + .add("defendantIds", JsonObjects.createArrayBuilder() .add(randomUUID().toString()) .add(randomUUID().toString()) ).build(); @@ -87,8 +87,8 @@ public void shouldReturnDefendantIdsWhenDefenceIsAssociatedWithDefendants() { @Test public void shouldReturnEmptyDefendantIdsWhenDefenceIsNotAssociatedWithDefendants() { - final JsonObject jsonObjectPayload = Json.createObjectBuilder() - .add("defendantIds", Json.createArrayBuilder()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder() + .add("defendantIds", JsonObjects.createArrayBuilder()).build(); final Metadata metadata = CommandClientTestBase.metadataFor(DEFENCE_ASSOCIATED_DEFENDANTS_QUERY, randomUUID().toString()); final Envelope envelope = Envelope.envelopeFrom(metadata, jsonObjectPayload); diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryServiceTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryServiceTest.java index b53bc14a1..ececbeda0 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryServiceTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/ProsecutionCaseQueryServiceTest.java @@ -2,7 +2,7 @@ -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryServiceTest.java b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryServiceTest.java index 46740ba73..fe26e95db 100644 --- a/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryServiceTest.java +++ b/progression-command/progression-command-api/src/test/java/uk/gov/moj/cpp/progression/command/service/UserGroupQueryServiceTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.command.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-command/progression-command-handler/pom.xml b/progression-command/progression-command-handler/pom.xml index 272d46106..6533afbc9 100644 --- a/progression-command/progression-command-handler/pom.xml +++ b/progression-command/progression-command-handler/pom.xml @@ -210,6 +210,18 @@ + + uk.gov.moj.cpp.progression + progression-domain-message + ${project.version} + raml + + + * + * + + + diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupService.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupService.java index d95461c86..21df61807 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupService.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupService.java @@ -5,7 +5,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; @@ -24,7 +24,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -104,7 +104,7 @@ protected JsonObject getUserGroupsDetailsForUser(final Envelope envelope) { protected Envelope getOrganisationForLaaContractNumber(final Envelope envelope, final String laaContractNumber) { - final JsonObject orgDetailsJsonEnvelope = Json.createObjectBuilder().add(LAA_CONTRACT_NUMBER, laaContractNumber).build(); + final JsonObject orgDetailsJsonEnvelope = JsonObjects.createObjectBuilder().add(LAA_CONTRACT_NUMBER, laaContractNumber).build(); return requester.requestAsAdmin(envelopeFrom( metadataFrom(envelope.metadata()).withName("usersgroups.get-organisation-details-by-laaContractNumber"), @@ -115,7 +115,7 @@ protected Envelope getOrganisationForLaaContractNumber(final Envelop protected JsonObject getOrganisationForOrganisationId(final Envelope envelope, final String organisationId) { - final JsonObject orgDetailsJsonEnvelope = Json.createObjectBuilder().add(ORGANISATION_ID, organisationId).build(); + final JsonObject orgDetailsJsonEnvelope = JsonObjects.createObjectBuilder().add(ORGANISATION_ID, organisationId).build(); final Envelope jsonResultEnvelope = requester.requestAsAdmin(envelopeFrom( metadataFrom(envelope.metadata()).withName("usersgroups.get-organisation-details"), diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandler.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandler.java index fe23633ef..f6424c6e3 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandler.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandler.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.handler; import static java.util.Objects.isNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.moj.cpp.progression.domain.helper.CourtRegisterHelper.getCourtRegisterStreamId; diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandler.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandler.java index df021a3a4..babcf8346 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandler.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandler.java @@ -2,7 +2,7 @@ import static java.util.Objects.nonNull; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.enveloper.Enveloper.toEnvelopeWithMetadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderForApplicationHandler.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderForApplicationHandler.java index 042c0ce42..2c8d06942 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderForApplicationHandler.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderForApplicationHandler.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.handler; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.toEnvelopeWithMetadataFrom; import static uk.gov.moj.cpp.progression.application.ApplicationCaseDefendantOrganisation.applicationCaseDefendantOrganisation; diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantCriteria.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantCriteria.java index 60abc9f90..cb60c6ab4 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantCriteria.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantCriteria.java @@ -12,7 +12,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObjectBuilder; @@ -336,7 +336,7 @@ private String convertFromCjsToSpiStandardPncId(final String pncId) { } private JsonObjectBuilder getDefaultCriteriaBuilder() { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add(PAGE_SIZE, DEFAULT_PAGE_SIZE) .add(PROCEEDINGS_CONCLUDED, DEFAULT_PROCEEDINGS_CONCLUDED) .add(COURT_ORDER_VALIDITY_DATE, LocalDate.now().toString()) diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelper.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelper.java index 06a2cb051..830976dcc 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelper.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelper.java @@ -16,7 +16,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -50,7 +50,7 @@ public class MatchedDefendantHelper { ListToJsonArrayConverter listToJsonArrayConverter; public String transformToPartialMatchDefendantPayload(final Defendant defendant, final ProsecutionCase prosecutionCase, final List casesList ) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add(DEFENDANT_ID, defendant.getId().toString()); addToJsonObjectNullSafe(jsonObjectBuilder,MASTER_DEFENDANT_ID, defendant.getMasterDefendantId()); addToJsonObjectNullSafe(jsonObjectBuilder,PROSECUTION_CASE_ID, prosecutionCase.getId()); @@ -72,7 +72,7 @@ public String transformToPartialMatchDefendantPayload(final Defendant defendant addAddress(defendant, jsonObjectBuilder); jsonObjectBuilder.add(DEFENDANTS_MATCHED_COUNT, casesList.size()); - final JsonArrayBuilder jsonDefendantsMatchedBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonDefendantsMatchedBuilder = JsonObjects.createArrayBuilder(); casesList.stream() .forEach(cases -> { final JsonArray jsonArray = listToJsonArrayConverter.convert(cases.getDefendants()); @@ -85,7 +85,7 @@ public String transformToPartialMatchDefendantPayload(final Defendant defendant private void addAddress(final Defendant defendant, final JsonObjectBuilder jsonObjectBuilder) { if (nonNull(defendant.getPersonDefendant().getPersonDetails().getAddress())) { - final JsonObjectBuilder addressJsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder addressJsonObjectBuilder = JsonObjects.createObjectBuilder(); final Address address = defendant.getPersonDefendant().getPersonDetails().getAddress(); addToJsonObjectNullSafe(addressJsonObjectBuilder, ADDRESS_LINE_1, address.getAddress1()); addToJsonObjectNullSafe(addressJsonObjectBuilder, ADDRESS_LINE_2, address.getAddress2()); @@ -102,7 +102,7 @@ private void transformToDefendantsMatched(final JsonArray defendantsArray, fina defendantsArray.stream() .map(j -> (JsonObject) j) .forEach(jsonObject -> { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObject.forEach(jsonObjectBuilder::add); jsonObjectBuilder.add(PROSECUTION_CASE_ID, prosecutionCaseId); jsonObjectBuilder.add(CASE_REFERENCE, caseReference); diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataService.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataService.java index 4d904c0a0..82d2c1cca 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataService.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataService.java @@ -13,7 +13,7 @@ import javax.json.JsonObject; import java.util.Optional; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; public class LegalStatusReferenceDataService { diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/MatchedDefendantLoadService.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/MatchedDefendantLoadService.java index 4f57196ee..4e8c4d53e 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/MatchedDefendantLoadService.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/MatchedDefendantLoadService.java @@ -32,7 +32,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -116,7 +116,7 @@ private List callUnifiedSearchQuery(final Envelope envelope, JsonObjec Integer totalResult = 0; final List casesList = new ArrayList<>(); while (true) { - final JsonObjectBuilder criteriaBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder criteriaBuilder = JsonObjects.createObjectBuilder(); criteria.forEach(criteriaBuilder::add); criteriaBuilder.add(START_FROM, page); diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/OrganisationService.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/OrganisationService.java index 74ea71a14..f57cfcdfb 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/OrganisationService.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/OrganisationService.java @@ -7,7 +7,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; @@ -26,7 +26,7 @@ public class OrganisationService { public JsonObject getAssociatedOrganisation(final Envelope envelope, final String defendantId) { - final JsonObject getUserGroupsForUserRequest = Json.createObjectBuilder().add("defendantId", defendantId).build(); + final JsonObject getUserGroupsForUserRequest = JsonObjects.createObjectBuilder().add("defendantId", defendantId).build(); final Envelope requestEnvelope = Enveloper.envelop(getUserGroupsForUserRequest) .withName(DEFENCE_ASSOCIATION_QUERY).withMetadataFrom(envelope); final JsonEnvelope response = requester.request(requestEnvelope); @@ -35,7 +35,7 @@ public JsonObject getAssociatedOrganisation(final Envelope envelope, final St public JsonObject getAssociatedOrganisationForApplication(final Envelope envelope, final String defendantId) { - final JsonObject getUserGroupsForUserRequest = Json.createObjectBuilder().add("defendantId", defendantId).build(); + final JsonObject getUserGroupsForUserRequest = JsonObjects.createObjectBuilder().add("defendantId", defendantId).build(); final Envelope requestEnvelope = Enveloper.envelop(getUserGroupsForUserRequest) .withName(DEFENCE_ASSOCIATION_ORGANISATION_QUERY).withMetadataFrom(envelope); final Envelope response = requester.requestAsAdmin(requestEnvelope, JsonObject.class); diff --git a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryService.java b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryService.java index 746181c94..751f9b329 100644 --- a/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryService.java +++ b/progression-command/progression-command-handler/src/main/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryService.java @@ -2,7 +2,7 @@ import static java.util.Arrays.asList; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/AddDocumentWithProsecutionCaseIdHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/AddDocumentWithProsecutionCaseIdHandlerTest.java index b0736b902..3ae2b7eeb 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/AddDocumentWithProsecutionCaseIdHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/AddDocumentWithProsecutionCaseIdHandlerTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; @@ -48,7 +48,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -165,7 +165,7 @@ private JsonObject buildCourtDocumentDocumentType() { } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } private CourtDocument buildCourtDocument() { diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesHandlerTest.java index 4417f6a53..1dd7d1b47 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/RemoveCaseFromGroupCasesHandlerTest.java @@ -4,7 +4,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupServiceTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupServiceTest.java index 569727978..f6c95978b 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupServiceTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/command/handler/service/UsersGroupServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.command.handler.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -65,7 +65,7 @@ public void shouldReturnOrganisationDetails() { //Given final UUID userId = randomUUID(); final UUID organisationId = randomUUID(); - JsonObject responseJsonObject = Json.createObjectBuilder().add("organisationId",organisationId.toString()).build(); + JsonObject responseJsonObject = JsonObjects.createObjectBuilder().add("organisationId",organisationId.toString()).build(); final JsonEnvelope query = JsonEnvelopeBuilder.envelope().with(getMetadataBuilder(userId)).withPayloadOf(userId.toString(), "userId").build(); when(requester.requestAsAdmin(any(JsonEnvelope.class), any())).thenAnswer(invocationOnMock -> { @@ -232,13 +232,13 @@ private MetadataBuilder getUserGroupDetailsMetadataBuilder(final UUID userId) { } private JsonObject getHMCTSGroups() { - final JsonObject payload = Json.createObjectBuilder() - .add("groups", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("groups", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("groupId", "7e2f143e-d619-40b3-8611-8015f3a18957") .add("groupName", "Listing Officers") ) - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("groupId", "8c5327b6-354e-4574-9558-b13fce8c055a") .add("groupName", "Court Clerks") ) @@ -247,8 +247,8 @@ private JsonObject getHMCTSGroups() { } private JsonObject getNoGroups() { - final JsonObject payload = Json.createObjectBuilder() - .add("groups", Json.createArrayBuilder()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("groups", JsonObjects.createArrayBuilder()).build(); return payload; } diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCaseNoteHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCaseNoteHandlerTest.java index cce4d1137..4c4c38e5b 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCaseNoteHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCaseNoteHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.handler; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCasesToHearingBdfHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCasesToHearingBdfHandlerTest.java index 564017f3c..5f9704147 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCasesToHearingBdfHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCasesToHearingBdfHandlerTest.java @@ -1,15 +1,15 @@ package uk.gov.moj.cpp.progression.handler; 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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; 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.Envelope.envelopeFrom; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static uk.gov.justice.services.test.utils.core.helper.EventStreamMockHelper.verifyAppendAndGetArgumentFrom; import uk.gov.justice.core.courts.CourtApplication; @@ -38,6 +38,7 @@ import uk.gov.moj.cpp.progression.aggregate.HearingAggregate; import uk.gov.moj.cpp.progression.service.ProsecutionCaseQueryService; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -400,7 +401,6 @@ private Hearing getHearing(final UUID hearingId) { return hearing; } - private Optional createProsecutionCase(final UUID caseId, final List>> defendants) { ProsecutionCase prosecutionCase = ProsecutionCase.prosecutionCase() .withId(caseId) diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddConvictingCourtCommandHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddConvictingCourtCommandHandlerTest.java index 9960a6dfc..5cdd27ed4 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddConvictingCourtCommandHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddConvictingCourtCommandHandlerTest.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -193,7 +193,7 @@ private List prepareReferenceDataOffencesJsonObject(final UUID offen .replace("OFFENCE_ID", offenceId.toString()) .replace("OFFENCE_CODE", offenceCode) .replace("LEGISLATION", legislation); - final JsonReader jsonReader = Json.createReader(new StringReader(referenceDataOffenceJsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(referenceDataOffenceJsonString)); return jsonReader.readObject().getJsonArray("offences").getValuesAs(JsonObject.class); } diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCourtDocumentHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCourtDocumentHandlerTest.java index 35ac36930..caaab2bec 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCourtDocumentHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddCourtDocumentHandlerTest.java @@ -3,8 +3,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; @@ -71,7 +71,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonValue; @@ -182,7 +182,7 @@ public void shouldProcessCommand() throws Exception { .build(); final EventStream eventStream = mock(EventStream.class); - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType","HMCTS") .add("organisationName", "Bodgit and Scarper LLP") @@ -193,7 +193,7 @@ public void shouldProcessCommand() throws Exception { .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); @@ -253,7 +253,7 @@ public void shouldProcessCommandV2() throws Exception { .withName("progression.command.add-court-document-v2") .withId(randomUUID()) .build(); - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType","HMCTS") .add("organisationName", "Bodgit and Scarper LLP") @@ -264,7 +264,7 @@ public void shouldProcessCommandV2() throws Exception { .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); @@ -345,7 +345,7 @@ public void shouldNotPassIsUnbundledDocumentFlagToProcessorWhenFlagNotExist() th } private void isCpsCaseHandleWith(Boolean isCpsCase) throws Exception{ - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType","HMCTS") .add("organisationName", "Bodgit and Scarper LLP") @@ -356,7 +356,7 @@ private void isCpsCaseHandleWith(Boolean isCpsCase) throws Exception{ .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); @@ -394,7 +394,7 @@ private void isCpsCaseHandleWith(Boolean isCpsCase) throws Exception{ } private void isUnbundledDocumentHandleWith(final Boolean isUnbundledDocument) throws Exception{ - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType","HMCTS") .add("organisationName", "Bodgit and Scarper LLP") @@ -405,7 +405,7 @@ private void isUnbundledDocumentHandleWith(final Boolean isUnbundledDocument) th .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); @@ -483,6 +483,6 @@ private JsonObject buildCourtDocumentWithoutDocumentType() { } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } } \ No newline at end of file diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddDefendantsToCourtProceedingsHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddDefendantsToCourtProceedingsHandlerTest.java index b0c01f286..b7546cfe2 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddDefendantsToCourtProceedingsHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/AddDefendantsToCourtProceedingsHandlerTest.java @@ -74,7 +74,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import uk.gov.moj.cpp.progression.service.ReferenceDataOffenceService; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -316,7 +316,7 @@ private List prepareReferenceDataOffencesJsonObject(final UUID offen .replace("OFFENCE_ID", offenceId.toString()) .replace("OFFENCE_CODE", offenceCode) .replace("LEGISLATION", legislation); - final JsonReader jsonReader = Json.createReader(new StringReader(referenceDataOffenceJsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(referenceDataOffenceJsonString)); final List referencedataOffencesJsonObject = jsonReader.readObject().getJsonArray("offences").getValuesAs(JsonObject.class); diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtApplicationHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtApplicationHandlerTest.java index 9167d08fb..6493f0e5d 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtApplicationHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtApplicationHandlerTest.java @@ -8,7 +8,7 @@ import static java.util.Optional.of; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandlerTest.java index 797dfdcbb..5126e83da 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CourtRegisterHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; @@ -63,7 +63,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -152,12 +152,12 @@ public void shouldHandleGenerateRequest() throws EventStreamException { final ZonedDateTime registerDate = ZonedDateTime.parse("2024-10-24T22:23:12.414Z"); final JsonEnvelope queryEnvelope = mock(JsonEnvelope.class); final CourtRegisterDocumentRequest courtRegisterDocumentRequest = getCourtRegisterDocumentRequest(courtCentreId, registerDate); - final JsonArray jsonValues = Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonArray jsonValues = JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", registerDate.toLocalDate().toString()) .add("payload", objectToJsonObjectConverter.convert(courtRegisterDocumentRequest).toString()) .build()).build(); - final JsonObject jsonObject = Json.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); when(queryEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); when(requester.request(any(Envelope.class))).thenReturn(queryEnvelope); @@ -176,19 +176,19 @@ public void shouldHandleGenerateRequestWhenMultipleCourtCentreRequestsInDifferen final CourtRegisterDocumentRequest courtRegisterDocumentRequest1 = getCourtRegisterDocumentRequest(courtCentreId, registerDate1); final CourtRegisterDocumentRequest courtRegisterDocumentRequest2 = getCourtRegisterDocumentRequest(courtCentreId, registerDate2); - final JsonArray jsonValues = Json.createArrayBuilder() - .add(Json.createObjectBuilder() + final JsonArray jsonValues = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", registerDate1.toLocalDate().toString()) .add("payload", objectToJsonObjectConverter.convert(courtRegisterDocumentRequest1).toString()) .build()) - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", registerDate2.toLocalDate().toString()) .add("payload", objectToJsonObjectConverter.convert(courtRegisterDocumentRequest2).toString()) .build()) .build(); - final JsonObject jsonObject = Json.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); final JsonEnvelope queryEnvelope = mock(JsonEnvelope.class); when(queryEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); @@ -217,19 +217,19 @@ public void shouldHandleGenerateRequestWhenMultipleCourtCentreRequestsInSameRegi final CourtRegisterDocumentRequest courtRegisterDocumentRequest1 = getCourtRegisterDocumentRequest(courtCentreId, registerDate); final CourtRegisterDocumentRequest courtRegisterDocumentRequest2 = getCourtRegisterDocumentRequest(courtCentreId, registerDate); - final JsonArray jsonValues = Json.createArrayBuilder() - .add(Json.createObjectBuilder() + final JsonArray jsonValues = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", registerDate.toLocalDate().toString()) .add("payload", objectToJsonObjectConverter.convert(courtRegisterDocumentRequest1).toString()) .build()) - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", registerDate.toLocalDate().toString()) .add("payload", objectToJsonObjectConverter.convert(courtRegisterDocumentRequest2).toString()) .build()) .build(); - final JsonObject jsonObject = Json.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); final JsonEnvelope queryEnvelope = mock(JsonEnvelope.class); when(queryEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); @@ -290,12 +290,12 @@ public void shouldHandleGenerateCourtRegisterByDateRequest() throws EventStreamE final ZonedDateTime registerDate = ZonedDateTime.parse("2024-10-24T22:23:12.414Z"); final JsonEnvelope queryEnvelope = mock(JsonEnvelope.class); final CourtRegisterDocumentRequest courtRegisterDocumentRequest = getCourtRegisterDocumentRequest(courtCentreId, registerDate); - final JsonArray jsonValues = Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonArray jsonValues = JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", registerDate.toLocalDate().toString()) .add("payload", objectToJsonObjectConverter.convert(courtRegisterDocumentRequest).toString()) .build()).build(); - final JsonObject jsonObject = Json.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("courtRegisterDocumentRequests", jsonValues).build(); when(queryEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); when(requester.request(any(Envelope.class))).thenReturn(queryEnvelope); diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateCourtDocumentHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateCourtDocumentHandlerTest.java index 5ef54c9c6..88a8088f4 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateCourtDocumentHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/CreateCourtDocumentHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.notNullValue; @@ -41,7 +41,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -139,9 +139,9 @@ private CourtDocument buildCourtDocument() { } private static JsonObject buildDocumentTypeDataWithRBAC() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("courtDocumentTypeRBAC", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("uploadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer").build()).build()) .add("readUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()) .add("downloadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()).build()) @@ -150,7 +150,7 @@ private static JsonObject buildDocumentTypeDataWithRBAC() { } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/DefenceOrganisationHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/DefenceOrganisationHandlerTest.java index a5e420fd7..48bb5239d 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/DefenceOrganisationHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/DefenceOrganisationHandlerTest.java @@ -2,8 +2,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandlerTest.java index d110aac19..2136958c6 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/HearingResultsCommandHandlerTest.java @@ -3,8 +3,8 @@ import static java.util.Collections.singletonList; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ListNewHearingHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ListNewHearingHandlerTest.java index 7056ee068..c29129bef 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ListNewHearingHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ListNewHearingHandlerTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/MaterialStatusHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/MaterialStatusHandlerTest.java index 8fd70a762..5c52115c5 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/MaterialStatusHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/MaterialStatusHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.handler; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NotificationHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NotificationHandlerTest.java index d45c7f6d6..a38b68466 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NotificationHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NotificationHandlerTest.java @@ -7,8 +7,8 @@ import static java.util.Objects.nonNull; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NowNotificationGeneratedHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NowNotificationGeneratedHandlerTest.java index a4f44ea24..41ccc09ba 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NowNotificationGeneratedHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/NowNotificationGeneratedHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/OnlinePleasAllocationHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/OnlinePleasAllocationHandlerTest.java index ef3caf0dd..31f293dd1 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/OnlinePleasAllocationHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/OnlinePleasAllocationHandlerTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.singletonMap; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerForApplicationTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerForApplicationTest.java index 416a62138..da47db360 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerForApplicationTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerForApplicationTest.java @@ -62,7 +62,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -208,7 +208,7 @@ void shouldProcessCommandWhenOrganisationIsNotSetupAndNoAssociatedOrgExpectNoAss when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); final ReceiveRepresentationOrderForApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrder(STATUS_CODE, APPLICATION_ID, SUBJECT_ID, OFFENCE_ID); @@ -238,7 +238,7 @@ void shouldProcessCommandForApplicationWhenOrganisationIsNotSetupAndNoAssociated when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); final ReceiveRepresentationOrderForApplicationOnApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrderOnApplication(STATUS_CODE, application.getId()); @@ -265,7 +265,7 @@ void shouldProcessCommandWhenOffenceAttachedAndUpdatedWithLAAReferenceEvent() th when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); final ReceiveRepresentationOrderForApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrder(STATUS_CODE, APPLICATION_ID, SUBJECT_ID, OFFENCE_ID); @@ -308,7 +308,7 @@ void shouldProcessCommandForApplicationWhenApplicationAttachedAndUpdatedWithLAAR when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); final ReceiveRepresentationOrderForApplicationOnApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrderOnApplication(STATUS_CODE, application.getId()); @@ -352,7 +352,7 @@ void shouldProcessCommandWhenOffenceAttachedAndUpdatedWithLAAReferenceEventTwice when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); final ReceiveRepresentationOrderForApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrder(STATUS_CODE, APPLICATION_ID, SUBJECT_ID, OFFENCE_ID); @@ -382,7 +382,7 @@ void shouldProcessCommand_whenOrganisationIsSetupAndAssociated_expectAssociation final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final UUID organisationId = randomUUID(); @@ -410,7 +410,7 @@ void shouldProcessCommand_whenOrganisationIsSetupAndAssociated_expectDisassociat final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final UUID organisationId = randomUUID(); @@ -434,7 +434,7 @@ void shouldProcessCommand_whenOrganisationIsSetupAndAssociated_isNotAlreadyAssoc final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final UUID organisationId = randomUUID(); @@ -460,7 +460,7 @@ void shouldProcessCommand_whenOrganisationIsSetupAndAssociated_isAlreadyAssociat when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); final UUID organisationId = randomUUID(); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", organisationId.toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", organisationId.toString()).build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final ReceiveRepresentationOrderForApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrder(STATUS_CODE, APPLICATION_ID, SUBJECT_ID, OFFENCE_ID); @@ -484,7 +484,7 @@ void shouldProcessCommand_whenOrganisationIsSetupAndAssociated_expectApplication final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final UUID organisationId = randomUUID(); @@ -521,7 +521,7 @@ void shouldProcessCommand_whenOrganisationIsSetupAndAssociated_expectOneEventApp final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final UUID organisationId = randomUUID(); @@ -563,7 +563,7 @@ void shouldTestDefenceOrganisationAssociated_Event_whenOrganisationIsSetupAndAss final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); ReceiveRepresentationOrderForApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrder(STATUS_CODE, APPLICATION_ID, SUBJECT_ID, OFFENCE_ID); @@ -592,7 +592,7 @@ void shouldTestDefenceOrganisationAssociated_Event_whenDefenceHasMultiOffence_ex final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); ReceiveRepresentationOrderForApplication receiveRepresentationOrderForApplication = payloadForReceiveRepresentationOrder(STATUS_CODE, APPLICATION_ID, SUBJECT_ID, OFFENCE_ID); @@ -622,7 +622,7 @@ void shouldProcessCommand_whenSubjectIdNotFound_expectBothDefenceOrganisationAnd final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final UUID organisationId = randomUUID(); @@ -648,7 +648,7 @@ void shouldProcessCommand_whenOffenceIdNotFound_expectBothDefenceOrganisationAnd final ApplicationAggregate applicationAggregate = new ApplicationAggregate(); when(eventSource.getStreamById(any())).thenReturn(eventStream); when(aggregateService.get(eventStream, ApplicationAggregate.class)).thenReturn(applicationAggregate); - final JsonObject jsonObjectPayload = Json.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().add("organisationId", randomUUID().toString()).build(); when(organisationService.getAssociatedOrganisationForApplication(any(), any())).thenReturn(jsonObjectPayload); applicationAggregate.createCourtApplication(courtApplication, null); final UUID organisationId = randomUUID(); @@ -667,7 +667,7 @@ void shouldProcessCommand_whenOffenceIdNotFound_expectBothDefenceOrganisationAnd } private static JsonObject getLegalStatus(final UUID statusId, final String statusDescription, final String status) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("id", statusId.toString()) .add("statusDescription", statusDescription) .add("defendantLevelStatus", status) diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerTest.java index c22d0e717..9398178e3 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/ReceiveRepresentationOrderHandlerTest.java @@ -68,7 +68,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -479,7 +479,7 @@ private JsonObject getEventAsJsonObjectFromStreamInGivenTimes(int times, String private static JsonObject getLegalStatus() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("id", LEGAL_STATUS_ID.toString()) .add("statusDescription", "description") .add("defendantLevelStatus", "Granted") @@ -488,19 +488,19 @@ private static JsonObject getLegalStatus() { private static JsonObject getAssociationWithOutAnyOrganisation() { - return Json.createObjectBuilder() - .add(ASSOCIATION, Json.createObjectBuilder()) + return JsonObjects.createObjectBuilder() + .add(ASSOCIATION, JsonObjects.createObjectBuilder()) .build(); } private static JsonObject getAssociationWithMatchingOrganisation(final String organisationId) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(ORGANISATION_ID, organisationId) .build(); } private static JsonObject getAssociationWithoutMatchingOrganisation() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(ORGANISATION_ID, randomUUID().toString()) .add(REPRESENTATION_TYPE, RepresentationType.REPRESENTATION_ORDER.toString()) .build(); diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToApplicationHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToApplicationHandlerTest.java index ee8701932..1f2c29da7 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToApplicationHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToApplicationHandlerTest.java @@ -52,8 +52,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToOffenceHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToOffenceHandlerTest.java index a199d911c..25d4dc365 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToOffenceHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/RecordLAAReferenceToOffenceHandlerTest.java @@ -2,8 +2,8 @@ import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/StagingEnforcementResponseHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/StagingEnforcementResponseHandlerTest.java index 5964448c3..ade3074ff 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/StagingEnforcementResponseHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/StagingEnforcementResponseHandlerTest.java @@ -17,13 +17,13 @@ import uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory; import uk.gov.moj.cpp.progression.aggregate.MaterialAggregate; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import java.util.Optional; import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -77,9 +77,9 @@ public void shouldApplyEnforcementAcknowledgement() throws EventStreamException when(eventSource.getStreamById(materialId)).thenReturn(eventStream); final String accountNumber = "1234"; - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("originator", "courts") - .add("acknowledgement", Json.createObjectBuilder().add("accountNumber", accountNumber) + .add("acknowledgement", JsonObjects.createObjectBuilder().add("accountNumber", accountNumber) .build()) .add("requestId", requestId.toString()) .add("materialId", materialId.toString()).build(); @@ -100,9 +100,9 @@ public void shouldEnforcementAcknowledgementError() throws EventStreamException when(eventSource.getStreamById(materialId)).thenReturn(eventStream); final String errorCode = "ERR1234"; final String errorMessage = "post code is invalid"; - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("originator", "courts") - .add("acknowledgement", Json.createObjectBuilder().add("errorCode", errorCode) + .add("acknowledgement", JsonObjects.createObjectBuilder().add("errorCode", errorCode) .add("errorMessage", errorMessage) .build()) .add("requestId", requestId.toString()) diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationLaaReferenceToHearingHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationLaaReferenceToHearingHandlerTest.java index d1efa5159..ea5a444fb 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationLaaReferenceToHearingHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationLaaReferenceToHearingHandlerTest.java @@ -62,8 +62,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationRepOrderForHearingHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationRepOrderForHearingHandlerTest.java index fb0431220..744723bfd 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationRepOrderForHearingHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateApplicationRepOrderForHearingHandlerTest.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCourtDocumentHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCourtDocumentHandlerTest.java index 70f962312..240edfbaf 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCourtDocumentHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCourtDocumentHandlerTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.is; @@ -53,7 +53,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -93,10 +93,10 @@ public class UpdateCourtDocumentHandlerTest { private CourtDocumentAggregate aggregate; private static JsonObject buildDocumentTypeDataWithRBAC(final String documentCategory) { - return Json.createObjectBuilder().add("section", "charges") + return JsonObjects.createObjectBuilder().add("section", "charges") .add("documentCategory", documentCategory) .add("courtDocumentTypeRBAC", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("uploadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer").build()).build()) .add("readUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()) .add("downloadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()).build()) @@ -105,7 +105,7 @@ private static JsonObject buildDocumentTypeDataWithRBAC(final String documentCat } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } @Test diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCpsProsecutorHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCpsProsecutorHandlerTest.java index dab664a61..302235cf4 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCpsProsecutorHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateCpsProsecutorHandlerTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.emptyList; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateOffencesHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateOffencesHandlerTest.java index badabd2c2..c886c9f9d 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateOffencesHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/UpdateOffencesHandlerTest.java @@ -71,7 +71,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -524,7 +524,7 @@ private List prepareReferenceDataOffencesJsonObject(final UUID offen .replace("OFFENCE_ID", offenceId.toString()) .replace("OFFENCE_CODE", offenceCode) .replace("LEGISLATION", legislation); - final JsonReader jsonReader = Json.createReader(new StringReader(referenceDataOffenceJsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(referenceDataOffenceJsonString)); final List referencedataOffencesJsonObject = jsonReader.readObject().getJsonArray("offences").getValuesAs(JsonObject.class); diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/cotr/CotrCommandHandlerTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/cotr/CotrCommandHandlerTest.java index 86e3c1f42..10c40385f 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/cotr/CotrCommandHandlerTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/cotr/CotrCommandHandlerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.handler.cotr; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/courts/document/DocumentTypeAccessConverterTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/courts/document/DocumentTypeAccessConverterTest.java index 8f30251d1..54761da92 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/courts/document/DocumentTypeAccessConverterTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/handler/courts/document/DocumentTypeAccessConverterTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.handler.courts.document; import static java.util.UUID.fromString; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelperTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelperTest.java index 676fc9c5e..12a3382a1 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelperTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/helper/MatchedDefendantHelperTest.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -174,7 +174,7 @@ public void shouldNotAddMiddleNameToDefendantName_whenMiddleNameNonExists() { @Test public void shouldAddToJsonObjectNullSafe() { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); final String stringValue = null; matchedDefendantHelper.addToJsonObjectNullSafe(builder, "key", stringValue); diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataServiceTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataServiceTest.java index 2a0c3eab6..2adc5a327 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataServiceTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/LegalStatusReferenceDataServiceTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryServiceTest.java b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryServiceTest.java index f92853e36..28e15f7d2 100644 --- a/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryServiceTest.java +++ b/progression-command/progression-command-handler/src/test/java/uk/gov/moj/cpp/progression/service/ProsecutionCaseQueryServiceTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregate.java b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregate.java index 5dd59ae5f..6591d9765 100644 --- a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregate.java +++ b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregate.java @@ -301,7 +301,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -2624,7 +2624,7 @@ private void addToJsonObjectNullSafe(final JsonObjectBuilder jsonObjectBuilder, } private String transformToPartialMatchDefendantPayload(final uk.gov.justice.core.courts.Defendant defendant, final UUID prosecutionCaseId, final List casesList) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add("defendantId", defendant.getId().toString()); jsonObjectBuilder.add("masterDefendantId", defendant.getMasterDefendantId().toString()); jsonObjectBuilder.add("prosecutionCaseId", prosecutionCaseId.toString()); @@ -2644,7 +2644,7 @@ private String transformToPartialMatchDefendantPayload(final uk.gov.justice.core } jsonObjectBuilder.add("defendantsMatchedCount", casesList.size()); - final JsonArrayBuilder jsonDefendantsMatchedBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonDefendantsMatchedBuilder = JsonObjects.createArrayBuilder(); casesList.forEach(cases -> convertToJsonArray(jsonDefendantsMatchedBuilder, cases, cases.getDefendants())); jsonObjectBuilder.add("defendantsMatched", jsonDefendantsMatchedBuilder.build()); return jsonObjectBuilder.build().toString(); @@ -2656,7 +2656,7 @@ private JsonArrayBuilder convertToJsonArray(final JsonArrayBuilder jsonArrayBuil return; } - final JsonObjectBuilder defendantJsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder defendantJsonObjectBuilder = JsonObjects.createObjectBuilder(); defendantJsonObjectBuilder.add("defendantId", defendant.getDefendantId()); addToJsonObjectNullSafe(defendantJsonObjectBuilder, "masterDefendantId", defendant.getMasterDefendantId()); defendantJsonObjectBuilder.add("courtProceedingsInitiated", ZONE_DATETIME_FORMATTER.format(defendant.getCourtProceedingsInitiated())); @@ -2677,7 +2677,7 @@ private JsonArrayBuilder convertToJsonArray(final JsonArrayBuilder jsonArrayBuil } private void addAddress(final Address address, final JsonObjectBuilder jsonObjectBuilder) { - final JsonObjectBuilder addressJsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder addressJsonObjectBuilder = JsonObjects.createObjectBuilder(); addToJsonObjectNullSafe(addressJsonObjectBuilder, "addressLine1", address.getAddress1()); addToJsonObjectNullSafe(addressJsonObjectBuilder, "addressLine2", address.getAddress2()); addToJsonObjectNullSafe(addressJsonObjectBuilder, "addressLine3", address.getAddress3()); diff --git a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ProgressionEventFactory.java b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ProgressionEventFactory.java index 2d4435b8a..85266df71 100644 --- a/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ProgressionEventFactory.java +++ b/progression-domain/progression-domain-aggregate/src/main/java/uk/gov/moj/cpp/progression/aggregate/ProgressionEventFactory.java @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.progression.aggregate; +import uk.gov.justice.services.messaging.JsonObjects; + import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.progression.domain.event.CaseAddedToCrownCourt; diff --git a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregateTest.java b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregateTest.java index 658c6c2a0..fb5c321a8 100644 --- a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregateTest.java +++ b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CaseAggregateTest.java @@ -9,8 +9,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -71,6 +71,7 @@ import uk.gov.justice.core.courts.CaseDefendantUpdatedWithDriverNumber; import uk.gov.justice.core.courts.CaseEjected; import uk.gov.justice.core.courts.CaseEjectedViaBdf; +import uk.gov.justice.core.courts.CaseInactiveBdf; import uk.gov.justice.core.courts.HearingDay; import uk.gov.justice.core.courts.ReplayedDefendantsAddedToCourtProceedings; import uk.gov.justice.core.courts.ReportingRestriction; @@ -161,19 +162,20 @@ import uk.gov.justice.core.courts.ProsecutionCaseSubject; import uk.gov.justice.core.courts.ProsecutionCasesToRemove; import uk.gov.justice.core.courts.ReapplyMiReportingRestrictions; - -import uk.gov.justice.progression.courts.HearingMarkedAsDuplicateForCase; +import uk.gov.justice.core.courts.ReferralReason; +import uk.gov.justice.core.courts.ReportingRestriction; +import uk.gov.justice.progression.courts.CaseInsertedBdf; +import uk.gov.justice.progression.courts.CaseRetentionLengthCalculated; import uk.gov.justice.progression.courts.CaseStatusUpdatedBdf; +import uk.gov.justice.progression.courts.CustodyTimeLimitExtended; import uk.gov.justice.progression.courts.DefendantLegalaidStatusUpdatedV2; -import uk.gov.justice.progression.courts.CaseRetentionLengthCalculated; -import uk.gov.justice.progression.courts.HearingEventLogsDocumentCreated; +import uk.gov.justice.progression.courts.DefendantsAndListingHearingRequestsStored; import uk.gov.justice.progression.courts.HearingDeletedForProsecutionCase; +import uk.gov.justice.progression.courts.HearingEventLogsDocumentCreated; +import uk.gov.justice.progression.courts.HearingMarkedAsDuplicateForCase; import uk.gov.justice.progression.courts.HearingRemovedForProsecutionCase; -import uk.gov.justice.progression.courts.DefendantsAndListingHearingRequestsStored; -import uk.gov.justice.progression.courts.CustodyTimeLimitExtended; -import uk.gov.justice.progression.courts.RelatedCaseRequestedForAdhocHearing; -import uk.gov.justice.progression.courts.CaseInsertedBdf; import uk.gov.justice.progression.courts.OffencesForDefendantChanged; +import uk.gov.justice.progression.courts.RelatedCaseRequestedForAdhocHearing; import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; import uk.gov.justice.services.messaging.JsonEnvelope; @@ -235,8 +237,7 @@ import uk.gov.moj.cpp.progression.plea.json.schemas.PleadOnlinePcqVisited; import uk.gov.moj.cpp.progression.plea.json.schemas.PleasAllocationDetails; - -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import java.io.StringReader; @@ -256,8 +257,9 @@ import java.util.UUID; import java.util.stream.Stream; - - +import uk.gov.justice.services.messaging.JsonObjects; +import javax.json.JsonObject; +import javax.json.JsonReader; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; @@ -1445,17 +1447,17 @@ private void createDefendant(final UUID defendantId) { private void createCompleteSendingSheetEnvelope() { when(this.envelope.payloadAsJsonObject()).thenReturn(this.jsonObj); - when(this.jsonObj.getJsonObject("hearing")).thenReturn(Json.createObjectBuilder() + when(this.jsonObj.getJsonObject("hearing")).thenReturn(JsonObjects.createObjectBuilder() .add("courtCentreName", COURT_CENTRE_NAME) .add("courtCentreId", COURT_CENTRE_ID).add("type", HEARING_TYPE) .add("sendingCommittalDate", SENDING_COMMITTAL_DATE).add("caseId", CASE_ID) .add("caseUrn", CASE_URN) - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", DEFENDANT_ID) .add("personId", DEFENDANT_PERSON_ID) .add("firstName", DEFENDANT_FIRST_NAME).add("lastName", DEFENDANT_LAST_NAME) .add("nationality", DEFENDANT_NATIONALITY).add("gender", DEFENDANT_GENDER) - .add("address", Json.createObjectBuilder() + .add("address", JsonObjects.createObjectBuilder() .add("address1", DEFENDANT_ADDRESS_1) .add("address2", DEFENDANT_ADDRESS_2) .add("address3", DEFENDANT_ADDRESS_3) @@ -1465,14 +1467,14 @@ private void createCompleteSendingSheetEnvelope() { .add("bailStatus", BAIL_STATUS) .add("custodyTimeLimitDate", CUSTODY_TIME_LIMIT_DATE) .add("defenceOrganisation", DEFENCE_ORGANISATION) - .add("interpreter", Json.createObjectBuilder() + .add("interpreter", JsonObjects.createObjectBuilder() .add("needed", INTERPRETER_NEEDED) .add("language", INTERPRETER_LANGUAGE).build()) - .add("offences", Json.createArrayBuilder().add(Json + .add("offences", JsonObjects.createArrayBuilder().add(JsonObjects .createObjectBuilder() .add("id", OFFENCE_ID) .add("offenceCode", OFFENCE_CODE) - .add("indicatedPlea", Json.createObjectBuilder().add("id", INDICATED_PLEA_ID).add("value", INDICATED_PLEA_VALUE).add("allocationDecision", ALLOCATION_DECISION).build()) + .add("indicatedPlea", JsonObjects.createObjectBuilder().add("id", INDICATED_PLEA_ID).add("value", INDICATED_PLEA_VALUE).add("allocationDecision", ALLOCATION_DECISION).build()) .add("section", SECTION) .add("wording", WORDING) .add("reason", REASON) @@ -2048,404 +2050,6 @@ public void shouldLAAReferenceUpdatedForOffence_whenOneOfTheOffenceIsWithDrawn_e assertThat(((OffencesForDefendantChanged) object2).getUpdatedOffences().get(0).getOffences().get(0).getDvlaOffenceCode(), is("BA76004")); } - @Test - public void shouldPreserveIsYouthAndExistingDefendantAttributes_whenOffencesUpdated() { - final UUID caseId = randomUUID(); - final UUID defendantId = randomUUID(); - final UUID offenceId = randomUUID(); - - final PersonDefendant originalPersonDefendant = personDefendant() - .withPersonDetails(uk.gov.justice.core.courts.Person.person() - .withFirstName("Jane") - .withLastName("Doe") - .build()) - .build(); - - final Defendant originalDefendant = defendant() - .withId(defendantId) - .withMasterDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withPersonDefendant(originalPersonDefendant) - .withProsecutionAuthorityReference("AUTH-REF-1") - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final ProsecutionCase initialCase = prosecutionCase() - .withId(caseId) - .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier() - .withProsecutionAuthorityReference("AUTH-REF-1") - .build()) - .withDefendants(singletonList(originalDefendant)) - .build(); - - caseAggregate.apply(new ProsecutionCaseCreated(initialCase, null)); - - final DefendantUpdate update = DefendantUpdate.defendantUpdate() - .withId(defendantId) - .withProsecutionCaseId(caseId) - .withIsYouth(true) - .build(); - caseAggregate.apply(ProsecutionCaseDefendantUpdated.prosecutionCaseDefendantUpdated() - .withDefendant(update) - .build()); - - final LaaReference laaReference = generateRecordLAAReferenceForOffence("G2", GRANTED.getDescription()); - final List eventStream = caseAggregate.recordLAAReferenceForOffence(caseId, defendantId, offenceId, laaReference).toList(); - caseAggregate.apply(eventStream); - - @SuppressWarnings("unchecked") - final Map updatedMap = ReflectionUtil.getValueOfField(this.caseAggregate, "defendantsMap", Map.class); - final Defendant updatedDefendant = updatedMap.get(defendantId); - - assertThat(updatedDefendant, notNullValue()); - assertThat(updatedDefendant.getIsYouth(), is(true)); - assertThat(updatedDefendant.getProsecutionAuthorityReference(), is("AUTH-REF-1")); - assertThat(updatedDefendant.getPersonDefendant(), notNullValue()); - assertThat(updatedDefendant.getPersonDefendant().getPersonDetails().getFirstName(), is("Jane")); - - final ProsecutionCase prosecutionCaseInAggregate = ReflectionUtil.getValueOfField(this.caseAggregate, "prosecutionCase", ProsecutionCase.class); - final Optional prosecutionCaseDefendant = prosecutionCaseInAggregate.getDefendants().stream() - .filter(defendantItem -> defendantItem.getId().equals(defendantId)) - .findFirst(); - - assertThat(prosecutionCaseDefendant.isPresent(), is(true)); - assertThat(prosecutionCaseDefendant.get().getIsYouth(), is(true)); - assertThat(prosecutionCaseDefendant.get().getProsecutionAuthorityReference(), is("AUTH-REF-1")); - assertThat(prosecutionCaseDefendant.get().getPersonDefendant(), notNullValue()); - assertThat(prosecutionCaseDefendant.get().getPersonDefendant().getPersonDetails().getFirstName(), is("Jane")); - } - - @Test - public void shouldApplyFallbacksWhenLatestDefendantMissingFields_onOffencesUpdated() { - final UUID caseId = randomUUID(); - final UUID defendantId = randomUUID(); - final UUID offenceId = randomUUID(); - - final PersonDefendant fallbackPersonDefendant = personDefendant() - .withBailStatus(uk.gov.justice.core.courts.BailStatus.bailStatus().withCode("B").build()) - .build(); - - final Defendant fallbackDefendant = defendant() - .withId(defendantId) - .withMasterDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withIsYouth(true) - .withProsecutionAuthorityReference("AUTH-REF-1") - .withPersonDefendant(fallbackPersonDefendant) - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final ProsecutionCase pCase = prosecutionCase() - .withId(caseId) - .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier() - .withProsecutionAuthorityReference("AUTH-REF-1") - .build()) - .withDefendants(singletonList(fallbackDefendant)) - .build(); - - caseAggregate.apply(new ProsecutionCaseCreated(pCase, null)); - - final Defendant latestDefendant = defendant() - .withId(defendantId) - .withProsecutionCaseId(caseId) - .withMasterDefendantId(defendantId) - .withIsYouth(null) - .withProsecutionAuthorityReference(null) - .withPersonDefendant(null) - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final Map defendantsMap = new HashMap<>(); - defendantsMap.put(defendantId, latestDefendant); - setField(caseAggregate, "defendantsMap", defendantsMap); - - final Map custodialMap = new HashMap<>(); - custodialMap.put(defendantId, uk.gov.moj.cpp.progression.events.CustodialEstablishment.custodialEstablishment() - .withId(randomUUID()) - .withName("HMP Test") - .withCustody("Prison") - .build()); - setField(caseAggregate, "defendantCustodialEstablishmentMap", custodialMap); - - final DefendantCaseOffences defendantCaseOffences = DefendantCaseOffences.defendantCaseOffences() - .withDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withOffences(singletonList(offence().withId(offenceId).build())) - .withLegalAidStatus(GRANTED.getDescription()) - .build(); - - caseAggregate.apply(ProsecutionCaseOffencesUpdated.prosecutionCaseOffencesUpdated() - .withDefendantCaseOffences(defendantCaseOffences) - .build()); - - @SuppressWarnings("unchecked") - final Map updatedMap = ReflectionUtil.getValueOfField(this.caseAggregate, "defendantsMap", Map.class); - final Defendant updatedDefendant = updatedMap.get(defendantId); - - assertThat(updatedDefendant, notNullValue()); - assertThat(updatedDefendant.getIsYouth(), is(true)); - assertThat(updatedDefendant.getProsecutionAuthorityReference(), is("AUTH-REF-1")); - assertThat(updatedDefendant.getPersonDefendant(), notNullValue()); - assertThat(updatedDefendant.getPersonDefendant().getBailStatus().getCode(), is("B")); - assertThat(updatedDefendant.getPersonDefendant().getCustodialEstablishment(), notNullValue()); - - final ProsecutionCase prosecutionCaseInAggregate = ReflectionUtil.getValueOfField(this.caseAggregate, "prosecutionCase", ProsecutionCase.class); - final Defendant prosecutionCaseDefendant = prosecutionCaseInAggregate.getDefendants().stream() - .filter(defendantItem -> defendantItem.getId().equals(defendantId)) - .findFirst() - .orElse(null); - - assertThat(prosecutionCaseDefendant, notNullValue()); - assertThat(prosecutionCaseDefendant.getIsYouth(), is(true)); - assertThat(prosecutionCaseDefendant.getProsecutionAuthorityReference(), is("AUTH-REF-1")); - assertThat(prosecutionCaseDefendant.getPersonDefendant(), notNullValue()); - } - - @Test - public void shouldPreferLatestDefendantFields_whenPresent_onOffencesUpdated() { - final UUID caseId = randomUUID(); - final UUID defendantId = randomUUID(); - final UUID offenceId = randomUUID(); - - final PersonDefendant fallbackPersonDefendant = personDefendant() - .withBailStatus(uk.gov.justice.core.courts.BailStatus.bailStatus().withCode("F").build()) - .build(); - - final Defendant fallbackDefendant = defendant() - .withId(defendantId) - .withMasterDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withIsYouth(false) - .withProsecutionAuthorityReference("FALLBACK-REF") - .withPersonDefendant(fallbackPersonDefendant) - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final ProsecutionCase pCase = prosecutionCase() - .withId(caseId) - .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier() - .withProsecutionAuthorityReference("FALLBACK-REF") - .build()) - .withDefendants(singletonList(fallbackDefendant)) - .build(); - - caseAggregate.apply(new ProsecutionCaseCreated(pCase, null)); - - final PersonDefendant latestPersonDefendant = personDefendant() - .withBailStatus(uk.gov.justice.core.courts.BailStatus.bailStatus().withCode("L").build()) - .build(); - - final Defendant latestDefendant = defendant() - .withId(defendantId) - .withProsecutionCaseId(caseId) - .withMasterDefendantId(defendantId) - .withIsYouth(true) - .withProsecutionAuthorityReference("LATEST-REF") - .withPersonDefendant(latestPersonDefendant) - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final Map defendantsMap = new HashMap<>(); - defendantsMap.put(defendantId, latestDefendant); - setField(caseAggregate, "defendantsMap", defendantsMap); - - final Map custodialMap = new HashMap<>(); - custodialMap.put(defendantId, uk.gov.moj.cpp.progression.events.CustodialEstablishment.custodialEstablishment() - .withId(randomUUID()) - .withName("HMP Latest") - .withCustody("Prison") - .build()); - setField(caseAggregate, "defendantCustodialEstablishmentMap", custodialMap); - - final DefendantCaseOffences defendantCaseOffences = DefendantCaseOffences.defendantCaseOffences() - .withDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withOffences(singletonList(offence().withId(offenceId).build())) - .withLegalAidStatus(GRANTED.getDescription()) - .build(); - - caseAggregate.apply(ProsecutionCaseOffencesUpdated.prosecutionCaseOffencesUpdated() - .withDefendantCaseOffences(defendantCaseOffences) - .build()); - - @SuppressWarnings("unchecked") - final Map updatedMap = ReflectionUtil.getValueOfField(this.caseAggregate, "defendantsMap", Map.class); - final Defendant updatedDefendant = updatedMap.get(defendantId); - - assertThat(updatedDefendant, notNullValue()); - assertThat(updatedDefendant.getIsYouth(), is(true)); - assertThat(updatedDefendant.getProsecutionAuthorityReference(), is("LATEST-REF")); - assertThat(updatedDefendant.getPersonDefendant().getBailStatus().getCode(), is("L")); - } - - @Test - public void shouldApplyAllFallbackFields_whenLatestDefendantMissing_onOffencesUpdated() { - final UUID caseId = randomUUID(); - final UUID defendantId = randomUUID(); - final UUID offenceId = randomUUID(); - - final List associatedPersons = singletonList( - uk.gov.justice.core.courts.AssociatedPerson.associatedPerson() - .withPerson(uk.gov.justice.core.courts.Person.person().withFirstName("Alex").build()) - .build() - ); - - final AssociatedDefenceOrganisation associatedDefenceOrganisation = AssociatedDefenceOrganisation.associatedDefenceOrganisation() - .withIsAssociatedByLAA(false) - .build(); - - - - final LegalEntityDefendant lEntityDefendant = LegalEntityDefendant.legalEntityDefendant() - .withOrganisation(Organisation.organisation().withName("Org").build()) - .build(); - - - final PersonDefendant fallbackPersonDefendant = personDefendant() - .withBailStatus(uk.gov.justice.core.courts.BailStatus.bailStatus().withCode("B").build()) - .build(); - - final Defendant fallbackDefendant = defendant() - .withId(defendantId) - .withMasterDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withNumberOfPreviousConvictionsCited(3) - .withProsecutionAuthorityReference("AUTH-REF-1") - .withWitnessStatement("witness") - .withWitnessStatementWelsh("witness-welsh") - .withMitigation("mitigation") - .withMitigationWelsh("mitigation-welsh") - .withAssociatedPersons(associatedPersons) - .withPersonDefendant(fallbackPersonDefendant) - .withLegalEntityDefendant(lEntityDefendant) - .withPncId("PNC-1") - .withAliases(singletonList(uk.gov.justice.core.courts.DefendantAlias.defendantAlias().withFirstName("alias-1").build())) - .withIsYouth(true) - .withAssociatedDefenceOrganisation(associatedDefenceOrganisation) - .withCroNumber("CRO-1") - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final ProsecutionCase pCase = prosecutionCase() - .withId(caseId) - .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier() - .withProsecutionAuthorityReference("AUTH-REF-1") - .build()) - .withDefendants(singletonList(fallbackDefendant)) - .build(); - - caseAggregate.apply(new ProsecutionCaseCreated(pCase, null)); - - final Defendant latestDefendant = defendant() - .withId(defendantId) - .withProsecutionCaseId(caseId) - .withMasterDefendantId(defendantId) - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final Map defendantsMap = new HashMap<>(); - defendantsMap.put(defendantId, latestDefendant); - setField(caseAggregate, "defendantsMap", defendantsMap); - - final Map custodialMap = new HashMap<>(); - custodialMap.put(defendantId, uk.gov.moj.cpp.progression.events.CustodialEstablishment.custodialEstablishment() - .withId(randomUUID()) - .withName("HMP Test") - .withCustody("Prison") - .build()); - setField(caseAggregate, "defendantCustodialEstablishmentMap", custodialMap); - - final DefendantCaseOffences defendantCaseOffences = DefendantCaseOffences.defendantCaseOffences() - .withDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withOffences(singletonList(offence().withId(offenceId).build())) - .withLegalAidStatus(GRANTED.getDescription()) - .build(); - - caseAggregate.apply(ProsecutionCaseOffencesUpdated.prosecutionCaseOffencesUpdated() - .withDefendantCaseOffences(defendantCaseOffences) - .build()); - - @SuppressWarnings("unchecked") - final Map updatedMap = ReflectionUtil.getValueOfField(this.caseAggregate, "defendantsMap", Map.class); - final Defendant updatedDefendant = updatedMap.get(defendantId); - - assertThat(updatedDefendant, notNullValue()); - assertThat(updatedDefendant.getIsYouth(), is(true)); - assertThat(updatedDefendant.getProsecutionAuthorityReference(), is("AUTH-REF-1")); - assertThat(updatedDefendant.getWitnessStatement(), is("witness")); - assertThat(updatedDefendant.getMitigationWelsh(), is("mitigation-welsh")); - assertThat(updatedDefendant.getAssociatedPersons(), is(associatedPersons)); - assertThat(updatedDefendant.getLegalEntityDefendant(), is(lEntityDefendant)); - assertThat(updatedDefendant.getPncId(), is("PNC-1")); - assertThat(updatedDefendant.getAliases().get(0).getFirstName(), is("alias-1")); - assertThat(updatedDefendant.getAssociatedDefenceOrganisation(), is(associatedDefenceOrganisation)); - assertThat(updatedDefendant.getCroNumber(), is("CRO-1")); - assertThat(updatedDefendant.getPersonDefendant(), notNullValue()); - assertThat(updatedDefendant.getPersonDefendant().getCustodialEstablishment(), notNullValue()); - } - - @Test - public void shouldSkipCustodialPersonUpdate_whenNoPersonDefendant_onOffencesUpdated() { - final UUID caseId = randomUUID(); - final UUID defendantId = randomUUID(); - final UUID offenceId = randomUUID(); - - final Defendant fallbackDefendant = defendant() - .withId(defendantId) - .withMasterDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final ProsecutionCase pCase = prosecutionCase() - .withId(caseId) - .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier() - .withProsecutionAuthorityReference("AUTH-REF-1") - .build()) - .withDefendants(singletonList(fallbackDefendant)) - .build(); - - caseAggregate.apply(new ProsecutionCaseCreated(pCase, null)); - - final Defendant latestDefendant = defendant() - .withId(defendantId) - .withProsecutionCaseId(caseId) - .withMasterDefendantId(defendantId) - .withOffences(singletonList(offence().withId(offenceId).build())) - .build(); - - final Map defendantsMap = new HashMap<>(); - defendantsMap.put(defendantId, latestDefendant); - setField(caseAggregate, "defendantsMap", defendantsMap); - - final Map custodialMap = new HashMap<>(); - custodialMap.put(defendantId, uk.gov.moj.cpp.progression.events.CustodialEstablishment.custodialEstablishment() - .withId(randomUUID()) - .withName("HMP Test") - .withCustody("Prison") - .build()); - setField(caseAggregate, "defendantCustodialEstablishmentMap", custodialMap); - - final DefendantCaseOffences defendantCaseOffences = DefendantCaseOffences.defendantCaseOffences() - .withDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withOffences(singletonList(offence().withId(offenceId).build())) - .withLegalAidStatus(GRANTED.getDescription()) - .build(); - - caseAggregate.apply(ProsecutionCaseOffencesUpdated.prosecutionCaseOffencesUpdated() - .withDefendantCaseOffences(defendantCaseOffences) - .build()); - - @SuppressWarnings("unchecked") - final Map updatedMap = ReflectionUtil.getValueOfField(this.caseAggregate, "defendantsMap", Map.class); - final Defendant updatedDefendant = updatedMap.get(defendantId); - - assertThat(updatedDefendant, notNullValue()); - assertThat(updatedDefendant.getPersonDefendant(), is(nullValue())); - } - @Test public void shouldCheckYouthFlagForDefendantAndReportingRestrictionsForYouthForAllOffencesWhenDefendantAddedForCourtProceeding() { final UUID caseId = UUID.randomUUID(); @@ -3041,7 +2645,7 @@ public void shouldGenereateHearingEventLogForApplication() { public void shouldNotCalculateAndRecordCaseRetentionWhenJurisdictionIsNotCrown() { final UUID caseId = randomUUID(); final UUID hearingId = randomUUID(); - final Defendant defendant1 = defendant() + final Defendant defendant = defendant() .withId(randomUUID()) .withProceedingsConcluded(true) .withOffences( @@ -3056,7 +2660,7 @@ public void shouldNotCalculateAndRecordCaseRetentionWhenJurisdictionIsNotCrown() final ProsecutionCase prosecutionCase = prosecutionCase() .withId(caseId) .withCaseStatus(SJP_REFERRAL.getDescription()) - .withDefendants(singletonList(defendant1)) + .withDefendants(singletonList(defendant)) .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier().withCaseURN(URN).build()) .build(); @@ -7674,7 +7278,7 @@ private List prepareReferenceDataOffencesJsonObject(final UUID offen .replace("OFFENCE_ID", offenceId.toString()) .replace("OFFENCE_CODE", offenceCode) .replace("LEGISLATION", legislation); - final JsonReader jsonReader = Json.createReader(new StringReader(referenceDataOffenceJsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(referenceDataOffenceJsonString)); final List referencedataOffencesJsonObject = jsonReader.readObject().getJsonArray("offences").getValuesAs(JsonObject.class); @@ -8261,76 +7865,6 @@ public void shouldSetCorrectDefendantOffencesWhenRaisingRelatedCaseRequestedForA } - @Test - public void shouldMergeDefendantAttributes_whenRaisingRelatedCaseRequestedForAdhocHearingEvent() { - final UUID caseId = randomUUID(); - final UUID defendantId = randomUUID(); - final UUID offenceId = randomUUID(); - - final PersonDefendant fallbackPersonDefendant = personDefendant() - .withPersonDetails(uk.gov.justice.core.courts.Person.person() - .withFirstName("Jane") - .build()) - .build(); - - final Defendant fallbackDefendant = defendant() - .withId(defendantId) - .withMasterDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withIsYouth(false) - .withProsecutionAuthorityReference("FALLBACK") - .withPersonDefendant(fallbackPersonDefendant) - .build(); - - final ProsecutionCase prosecutionCase = prosecutionCase() - .withId(caseId) - .withProsecutionCaseIdentifier(ProsecutionCaseIdentifier.prosecutionCaseIdentifier() - .withProsecutionAuthorityReference("FALLBACK") - .build()) - .withDefendants(singletonList(fallbackDefendant)) - .build(); - - caseAggregate.apply(new ProsecutionCaseCreated(prosecutionCase, null)); - - final Defendant latestDefendant = defendant() - .withId(defendantId) - .withMasterDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withIsYouth(true) - .withProsecutionAuthorityReference("LATEST") - .withPersonDefendant(null) - .build(); - - final Map defendantsMap = new HashMap<>(); - defendantsMap.put(defendantId, latestDefendant); - setField(caseAggregate, "defendantsMap", defendantsMap); - - final Map> defendantCaseOffences = new HashMap<>(); - defendantCaseOffences.put(defendantId, singletonList(offence().withId(offenceId).build())); - setField(caseAggregate, "defendantCaseOffences", defendantCaseOffences); - - final CourtHearingRequest courtHearingRequest = CourtHearingRequest.courtHearingRequest() - .withListDefendantRequests(singletonList(ListDefendantRequest.listDefendantRequest() - .withDefendantId(defendantId) - .withProsecutionCaseId(caseId) - .withDefendantOffences(singletonList(offenceId)) - .build())) - .build(); - - final Stream objectStream = caseAggregate.extendCaseToExistingHearingForAdhocHearing(courtHearingRequest, true); - final Optional relatedCaseRequestedForAdhocHearing = objectStream - .filter(s -> s instanceof RelatedCaseRequestedForAdhocHearing) - .map(RelatedCaseRequestedForAdhocHearing.class::cast) - .findFirst(); - - assertThat(relatedCaseRequestedForAdhocHearing.isPresent(), is(true)); - final Defendant mergedDefendant = relatedCaseRequestedForAdhocHearing.get().getProsecutionCase().getDefendants().get(0); - assertThat(mergedDefendant.getIsYouth(), is(true)); - assertThat(mergedDefendant.getProsecutionAuthorityReference(), is("LATEST")); - assertThat(mergedDefendant.getPersonDefendant(), notNullValue()); - assertThat(mergedDefendant.getPersonDefendant().getPersonDetails().getFirstName(), is("Jane")); - } - @Test public void shouldRequestAndRemovedCustodialEstablishmentForDefendant() { final UUID caseId = randomUUID(); diff --git a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CourtDocumentAggregateTest.java b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CourtDocumentAggregateTest.java index 16b28e136..c3f716a36 100644 --- a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CourtDocumentAggregateTest.java +++ b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/aggregate/CourtDocumentAggregateTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -468,7 +468,7 @@ public void documentReviewRequiredAddedToCourtDocumentIfUserInHMCTSGroup(){ final String section = "abc"; final Boolean isCpsCase = true; final Boolean isUnbundledDocument = true; - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType","LEGAL_ORGANISATION") .add("organisationName", "Bodgit and Scarper LLP") @@ -479,7 +479,7 @@ public void documentReviewRequiredAddedToCourtDocumentIfUserInHMCTSGroup(){ .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); @@ -496,7 +496,7 @@ public void documentReviewRequiredNotAddedToCourtDocumentIfUserNotInHMCTSGroup() final String section = "abc"; final Boolean isCpsCase = true; final Boolean isUnbundledDocument = true; - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType","HMCTS") .add("organisationName", "Bodgit and Scarper LLP") @@ -507,7 +507,7 @@ public void documentReviewRequiredNotAddedToCourtDocumentIfUserNotInHMCTSGroup() .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); @@ -524,7 +524,7 @@ public void documentReviewRequiredNotAddedToCourtDocumentIfUserHasEmptyOrganisat final String section = "abc"; final Boolean isCpsCase = true; final Boolean isUnbundledDocument = true; - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType","") .add("organisationName", "Bodgit and Scarper LLP") @@ -535,7 +535,7 @@ public void documentReviewRequiredNotAddedToCourtDocumentIfUserHasEmptyOrganisat .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); @@ -552,7 +552,7 @@ public void documentReviewRequiredNotAddedToCourtDocumentIfUserHasNullOrganisati final String section = "abc"; final Boolean isCpsCase = true; final Boolean isUnbundledDocument = true; - final JsonObject userOrganisationDetails = Json.createObjectBuilder() + final JsonObject userOrganisationDetails = JsonObjects.createObjectBuilder() .add("organisationId","1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType",JsonObject.NULL) .add("organisationName", "Bodgit and Scarper LLP") @@ -563,7 +563,7 @@ public void documentReviewRequiredNotAddedToCourtDocumentIfUserHasNullOrganisati .add("addressPostcode","SE14 2AB") .add("phoneNumber","080012345678") .add("email","joe@example.com") - .add("laaContractNumbers",Json.createArrayBuilder() + .add("laaContractNumbers",JsonObjects.createArrayBuilder() .add("LAA3482374WER") .add("LAA3482374WEM")).build(); diff --git a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/ProgressionEventFactoryTest.java b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/ProgressionEventFactoryTest.java index 00612abbb..eeff505de 100644 --- a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/ProgressionEventFactoryTest.java +++ b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/ProgressionEventFactoryTest.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -115,7 +115,7 @@ public void testCreatePsrForDefendantsRequest() { when(envelope.payloadAsJsonObject().getString(any())).thenReturn(CASE_ID); when(this.jsonObj.getJsonArray(Mockito.eq("defendants"))) .thenReturn( - Json.createArrayBuilder() + JsonObjects.createArrayBuilder() .add(createDefendantJsonWithIsPsrRequested(true)) .add(createDefendantJsonWithIsPsrRequested(false)) .build()); @@ -135,7 +135,7 @@ private static String randomUUID() { } private JsonObject createDefendantJsonWithIsPsrRequested(final Boolean isPsrRequested) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("defendantId", UUID.randomUUID().toString()) .add("psrIsRequested", isPsrRequested).build(); } diff --git a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/utils/DefendantHelperTest.java b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/utils/DefendantHelperTest.java index a4273793a..19d3d4f55 100644 --- a/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/utils/DefendantHelperTest.java +++ b/progression-domain/progression-domain-aggregate/src/test/java/uk/gov/moj/cpp/progression/domain/aggregate/utils/DefendantHelperTest.java @@ -46,7 +46,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.NullAndEmptySource; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class DefendantHelperTest { @@ -126,7 +126,7 @@ public void setUp() throws Exception { public void shouldUpdateOrderIndex() { final Offence offenceOne = createOffence(randomUUID(), "first"); final ArrayList jsonObjects = new ArrayList<>(); - final JsonObject jsonObjectOffence = Json.createObjectBuilder().add("maxPenalty", "Indicated").add("cjsOffenceCode", "first").build(); + final JsonObject jsonObjectOffence = JsonObjects.createObjectBuilder().add("maxPenalty", "Indicated").add("cjsOffenceCode", "first").build(); jsonObjects.add(jsonObjectOffence); final Optional> refDataOffences = Optional.of(jsonObjects); Offence offence = DefendantHelper.updateOrderIndexAndExparteValue(offenceOne, 100, refDataOffences, false); @@ -138,7 +138,7 @@ public void shouldUpdateOrderIndex() { public void shouldUpdateOrderIndexForCivilOffence() { final Offence offenceOne = createOffence(randomUUID(), "first"); final ArrayList jsonObjects = new ArrayList<>(); - final JsonObject jsonObjectOffence = Json.createObjectBuilder() + final JsonObject jsonObjectOffence = JsonObjects.createObjectBuilder() .add("maxPenalty", "Indicated") .add("cjsOffenceCode", "first") .add("exParte", true) diff --git a/progression-domain/progression-domain-common/pom.xml b/progression-domain/progression-domain-common/pom.xml index 223459f0d..1d768550b 100644 --- a/progression-domain/progression-domain-common/pom.xml +++ b/progression-domain/progression-domain-common/pom.xml @@ -31,5 +31,9 @@ org.apache.commons commons-lang3 + + uk.gov.justice.utils + utilities-core + diff --git a/progression-domain/progression-domain-common/src/main/java/uk/gov/moj/cpp/progression/domain/helper/JsonHelper.java b/progression-domain/progression-domain-common/src/main/java/uk/gov/moj/cpp/progression/domain/helper/JsonHelper.java index 96b93a5d1..b6bbef63f 100644 --- a/progression-domain/progression-domain-common/src/main/java/uk/gov/moj/cpp/progression/domain/helper/JsonHelper.java +++ b/progression-domain/progression-domain-common/src/main/java/uk/gov/moj/cpp/progression/domain/helper/JsonHelper.java @@ -2,7 +2,7 @@ import java.util.Map; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -14,7 +14,7 @@ private JsonHelper() { } public static JsonObject removeProperty(final JsonObject origin, final String key){ - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()){ if (!entry.getKey().equals(key)){ builder.add(entry.getKey(), entry.getValue()); @@ -30,7 +30,7 @@ public static JsonObject addProperty(final JsonObject origin, final String key, } public static JsonObjectBuilder createBuilder(final JsonObject origin) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()){ builder.add(entry.getKey(), entry.getValue()); } @@ -38,7 +38,7 @@ public static JsonObjectBuilder createBuilder(final JsonObject origin) { } public static JsonObject addProperty(final JsonObject origin, final String key, final boolean value){ - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()){ builder.add(entry.getKey(), entry.getValue()); } @@ -47,7 +47,7 @@ public static JsonObject addProperty(final JsonObject origin, final String key, } public static JsonObject addProperty(final JsonObject origin, final String key, final JsonObject value){ - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()){ builder.add(entry.getKey(), entry.getValue()); } @@ -56,7 +56,7 @@ public static JsonObject addProperty(final JsonObject origin, final String key, } public static JsonObject addProperty(final JsonObject origin, final String key, final JsonArray value){ - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()){ builder.add(entry.getKey(), entry.getValue()); } @@ -65,7 +65,7 @@ public static JsonObject addProperty(final JsonObject origin, final String key, } public static JsonObject renameProperty(final JsonObject origin, final String key, final String newName){ - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()){ if (!entry.getKey().equals(key)){ builder.add(entry.getKey(), entry.getValue()); diff --git a/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/CourtApplicationVerificationHelper.java b/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/CourtApplicationVerificationHelper.java index b36f9affd..73db1f6bd 100644 --- a/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/CourtApplicationVerificationHelper.java +++ b/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/CourtApplicationVerificationHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.indexer.jolt.verificationHelpers; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/JsonHelper.java b/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/JsonHelper.java index 61fb6bee9..051e0e23b 100644 --- a/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/JsonHelper.java +++ b/progression-event/progression-event-indexer/src/test/java/uk/gov/moj/cpp/indexer/jolt/verificationHelpers/JsonHelper.java @@ -2,7 +2,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/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListener.java index 6e73d3933..319c0e5ce 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListener.java @@ -2,7 +2,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; import static uk.gov.moj.cpp.application.event.listener.ApplicationHelper.getPersistedCourtApplication; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListener.java index 6d0854b4e..49e866d26 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListener.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.justice.services.core.annotation.Component.EVENT_LISTENER; import uk.gov.justice.core.courts.DefendantCotrServed; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ConvictionDateEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ConvictionDateEventListener.java index 1c0b7735c..7f84db2f8 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ConvictionDateEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ConvictionDateEventListener.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -141,7 +141,7 @@ private void updateDefendantOffences(UUID offenceIdToBeUpdated, Defendant defend } private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtFeeForCivilApplicationUpdatedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtFeeForCivilApplicationUpdatedEventListener.java index 8bea56f43..992d7b9ee 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtFeeForCivilApplicationUpdatedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtFeeForCivilApplicationUpdatedEventListener.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.prosecutioncase.event.listener; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER; import uk.gov.justice.core.courts.CourtFeeForCivilApplicationUpdated; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CustodyTimeLimitEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CustodyTimeLimitEventListener.java index de3e6f8b5..fd4e16ff1 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CustodyTimeLimitEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CustodyTimeLimitEventListener.java @@ -33,7 +33,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -185,7 +185,7 @@ private void stopCTLClock(final List offenceIds, final Defendant defendant } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListener.java index 515ee392c..e135fad58 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListener.java @@ -19,7 +19,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -110,7 +110,7 @@ private ProsecutionCaseEntity getProsecutionCaseEntity(final ProsecutionCase pro private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListener.java index b787d0413..1bb288e78 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListener.java @@ -27,7 +27,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -93,7 +93,7 @@ private void updateDefendantForCase(UUID defendantId, AssociatedDefenceOrganisat } private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListener.java index bd982ceed..8a16e336b 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListener.java @@ -30,7 +30,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -114,7 +114,7 @@ private void updateDefendantForCase(UUID defendantId, AssociatedDefenceOrganisat } private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListener.java index 4483e3253..7d4632754 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListener.java @@ -36,7 +36,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -283,7 +283,7 @@ private void setDefendantsMasterDefendantIdOnCase(final UUID prosecutionCaseId, } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedEventListener.java index 140d682df..cb178a204 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedEventListener.java @@ -9,7 +9,7 @@ import java.io.StringReader; import java.util.Comparator; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import uk.gov.justice.core.courts.Hearing; import uk.gov.justice.core.courts.HearingOffencesUpdatedV2; @@ -121,7 +121,7 @@ public void processHearingRemoveDuplicateApplicationBdfEvent(final Envelope createHearingDaysToBeReplaced(final List he } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListener.java index 6229c8102..089445dd1 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListener.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import javax.persistence.NoResultException; @@ -126,7 +126,7 @@ private void removeUnallocatedHearing(HearingExtended hearingExtended, List listingMap, final Hear } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListener.java index 9817ae5a6..7dace6a36 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListener.java @@ -48,7 +48,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -75,7 +75,7 @@ public class HearingResultEventListener { private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListener.java index 5178b3076..577ff2ead 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListener.java @@ -28,7 +28,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -165,7 +165,7 @@ private Offence getUpdatedOffence(final Offence dBOffence, final HearingAddMissi } private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingTrialVacatedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingTrialVacatedEventListener.java index 43d52a45e..741a0ebf1 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingTrialVacatedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingTrialVacatedEventListener.java @@ -18,7 +18,7 @@ import java.util.Objects; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -72,7 +72,7 @@ public void handleHearingTrialVacatedEvent(final JsonEnvelope event) { } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingUpdatedForPartialAllocationEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingUpdatedForPartialAllocationEventListener.java index 6e09db551..9e500fa3b 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingUpdatedForPartialAllocationEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingUpdatedForPartialAllocationEventListener.java @@ -24,7 +24,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import javax.persistence.NoResultException; @@ -117,7 +117,7 @@ private void removeFromCaseDefendantHearingMappingTable(final UUID hearingId, fi } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/OnlinePleaListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/OnlinePleaListener.java index 52b7fbac9..8b7b5699a 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/OnlinePleaListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/OnlinePleaListener.java @@ -34,7 +34,7 @@ import uk.gov.moj.cpp.prosecutioncase.persistence.repository.ResultListOpaNoticeRepository; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import java.io.StringReader; @@ -287,7 +287,7 @@ protected LocalDate convertToLocalDate(final String value) { private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantUpdatedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantUpdatedEventListener.java index 9aacc272d..6fab609ac 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantUpdatedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantUpdatedEventListener.java @@ -50,7 +50,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -77,7 +77,7 @@ public class ProsecutionCaseDefendantUpdatedEventListener { private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListener.java index d4873c418..08dcfae56 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListener.java @@ -18,7 +18,7 @@ import java.util.List; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -74,7 +74,7 @@ private ProsecutionCaseEntity getProsecutionCaseEntity(final ProsecutionCase pro private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseOffencesUpdatedEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseOffencesUpdatedEventListener.java index 477cd8fe7..d6f8b95b5 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseOffencesUpdatedEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseOffencesUpdatedEventListener.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -243,7 +243,7 @@ private ProsecutionCaseEntity getProsecutionCaseEntity(final ProsecutionCase pro private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateProsecutionCaseCpsProsecutorEventListener.java b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateProsecutionCaseCpsProsecutorEventListener.java index ba7a9b839..7b88c0589 100644 --- a/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateProsecutionCaseCpsProsecutorEventListener.java +++ b/progression-event/progression-event-listener/src/main/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateProsecutionCaseCpsProsecutorEventListener.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonReader; import uk.gov.justice.core.courts.CaseCpsProsecutorUpdated; @@ -99,7 +99,7 @@ public void handleUpdateCaseCpsProsecutor(final JsonEnvelope event) { } private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListenerTest.java index 60af52cd6..7dd1dda26 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationOffencesUpdatedEventListenerTest.java @@ -2,7 +2,7 @@ import java.time.LocalDate; import java.util.Arrays; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -49,7 +49,7 @@ import uk.gov.moj.cpp.prosecutioncase.persistence.repository.ProsecutionCaseRepository; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -223,7 +223,7 @@ void testUpdateApplicationLaaReferenceForHearing() { final LaaReference laaReference = LaaReference.laaReference().withApplicationReference("applicationReference") .withStatusCode("statusCode").withStatusDescription("description").build(); final JsonObject updatedJsonObject = mock(JsonObject.class); - final JsonObject hearingJsonObject = Json.createObjectBuilder().build(); + final JsonObject hearingJsonObject = JsonObjects.createObjectBuilder().build(); final ApplicationLaaReferenceUpdatedForHearing applicationLaaReferenceUpdatedForHearing = ApplicationLaaReferenceUpdatedForHearing.applicationLaaReferenceUpdatedForHearing() .withHearingId(hearingId) @@ -265,7 +265,7 @@ void testUpdateApplicationLaaReferenceForHearingWhenOffenceIdIsNull() { final LaaReference laaReference = LaaReference.laaReference().withApplicationReference("applicationReference") .withStatusCode("statusCode").withStatusDescription("description").build(); final JsonObject updatedJsonObject = mock(JsonObject.class); - final JsonObject hearingJsonObject = Json.createObjectBuilder().build(); + final JsonObject hearingJsonObject = JsonObjects.createObjectBuilder().build(); final ApplicationLaaReferenceUpdatedForHearing applicationLaaReferenceUpdatedForHearing = ApplicationLaaReferenceUpdatedForHearing.applicationLaaReferenceUpdatedForHearing() .withHearingId(hearingId) diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderOffencesUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderOffencesUpdatedEventListenerTest.java index b53d4d98b..0853a0dde 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderOffencesUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderOffencesUpdatedEventListenerTest.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderUpdatedForHearingListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderUpdatedForHearingListenerTest.java index d0df364c2..10da547e8 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderUpdatedForHearingListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/ApplicationRepOrderUpdatedForHearingListenerTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.application.event.listener; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationEventListenerTest.java index 4e32719d8..40b8b9ea4 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationEventListenerTest.java @@ -3,8 +3,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationSubjectCustodialInformationUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationSubjectCustodialInformationUpdatedEventListenerTest.java index c513a937b..42e8c819e 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationSubjectCustodialInformationUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/application/event/listener/CourtApplicationSubjectCustodialInformationUpdatedEventListenerTest.java @@ -30,7 +30,7 @@ import java.util.UUID; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListenerTest.java index afde6943c..11b7a8f28 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/cotr/event/listener/CotrEventsListenerTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.cotr.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; @@ -55,7 +55,7 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -305,8 +305,8 @@ public void shouldTestUpdateProsecutionCotr_certifyThatTheProsecutionIsTrialRead } private JsonObject getJsonObject() { - return Json.createObjectBuilder() - .add("prosecutionQuestions",Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() + .add("prosecutionQuestions",JsonObjects.createObjectBuilder() .add(FURTHER_PROSECUTION_INFORMATION_PROVIDED_AFTER_CERTIFICATION, FURTHER_PROSECUTION_INFORMATION_PROVIDED_AFTER_CERTIFICATION) .build() ) diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowNotificationGeneratedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowNotificationGeneratedEventListenerTest.java index 7cddcb5d9..139135daf 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowNotificationGeneratedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowNotificationGeneratedEventListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.nows.event.listener; import static java.util.Arrays.asList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.verify; @@ -24,7 +24,7 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -92,7 +92,7 @@ public void shouldSaveNowNotificationGenerated() { final ArgumentCaptor courtDocumentsSavedCaptor = ArgumentCaptor.forClass(CourtDocumentEntity.class); verify(this.courtDocumentRepository).save(courtDocumentsSavedCaptor.capture()); final CourtDocumentEntity savedEntity = courtDocumentsSavedCaptor.getValue(); - final JsonObject jsonPayload = Json.createReader(new StringReader(savedEntity.getPayload())).readObject(); + final JsonObject jsonPayload = JsonObjects.createReader(new StringReader(savedEntity.getPayload())).readObject(); final CourtDocument courtDocumentSaved = jsonObjectToObjectConverter.convert(jsonPayload, CourtDocument.class); assertThat(courtDocumentSaved.getCourtDocumentId(), is(originalCourtDocument.getCourtDocumentId())); assertThat(courtDocumentSaved.getMaterials().size(), is(originalCourtDocument.getMaterials().size())); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowsRequestedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowsRequestedEventListenerTest.java index de61824c0..11812713f 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowsRequestedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/nows/event/listener/NowsRequestedEventListenerTest.java @@ -32,7 +32,7 @@ import java.io.StringReader; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -109,7 +109,7 @@ public void shouldSaveNowsMaterialStatusUpdated() { final ArgumentCaptor courtDocumentsSavedCaptor = ArgumentCaptor.forClass(CourtDocumentEntity.class); verify(this.repository).save(courtDocumentsSavedCaptor.capture()); final CourtDocumentEntity savedEntity = courtDocumentsSavedCaptor.getValue(); - final JsonObject jsonPayload = Json.createReader(new StringReader(savedEntity.getPayload())).readObject(); + final JsonObject jsonPayload = JsonObjects.createReader(new StringReader(savedEntity.getPayload())).readObject(); final CourtDocument courtDocumentSaved = jsonObjectToObjectConverter.convert(jsonPayload, CourtDocument.class); assertThat(courtDocumentSaved.getCourtDocumentId(), is(originalCourtDocument.getCourtDocumentId())); assertThat(courtDocumentSaved.getMaterials().size(), is(originalCourtDocument.getMaterials().size())); @@ -142,7 +142,7 @@ public void shouldSaveNowDocumentRequested() { final ArgumentCaptor nowDocumentRequestedCaptor = ArgumentCaptor.forClass(NowDocumentRequestEntity.class); verify(this.nowDocumentRequestRepository).save(nowDocumentRequestedCaptor.capture()); final NowDocumentRequestEntity savedNowDocumentRequestEntity = nowDocumentRequestedCaptor.getValue(); - final JsonObject jsonPayload = Json.createReader(new StringReader(savedNowDocumentRequestEntity.getPayload())).readObject(); + final JsonObject jsonPayload = JsonObjects.createReader(new StringReader(savedNowDocumentRequestEntity.getPayload())).readObject(); final NowDocumentRequest nowDocumentRequestSaved = jsonObjectToObjectConverter.convert(jsonPayload, NowDocumentRequest.class); assertThat(savedNowDocumentRequestEntity.getMaterialId(), is(materialId)); @@ -176,7 +176,7 @@ public void shouldSaveNowDocumentRequestToBeAcknowledged() { final ArgumentCaptor nowDocumentRequestedCaptor = ArgumentCaptor.forClass(NowDocumentRequestEntity.class); verify(this.nowDocumentRequestRepository).save(nowDocumentRequestedCaptor.capture()); final NowDocumentRequestEntity savedNowDocumentRequestEntity = nowDocumentRequestedCaptor.getValue(); - final JsonObject jsonPayload = Json.createReader(new StringReader(savedNowDocumentRequestEntity.getPayload())).readObject(); + final JsonObject jsonPayload = JsonObjects.createReader(new StringReader(savedNowDocumentRequestEntity.getPayload())).readObject(); final NowDocumentRequest nowDocumentRequestSaved = jsonObjectToObjectConverter.convert(jsonPayload, NowDocumentRequest.class); assertThat(savedNowDocumentRequestEntity.getMaterialId(), is(materialId)); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/progression/event/listener/OffencesForDefendantUpdatedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/progression/event/listener/OffencesForDefendantUpdatedListenerTest.java index d828c8977..bdb5bf6ac 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/progression/event/listener/OffencesForDefendantUpdatedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/progression/event/listener/OffencesForDefendantUpdatedListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; @@ -25,7 +25,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -152,13 +152,13 @@ private JsonEnvelope getJsonEnvelope(final UUID defendantId, final UUID id1, fin final JsonObject pleaJson = createObjectBuilder().add("id", id1.toString()).add("pleaDate","2010-08-01").add("value","GUILTY").build(); final JsonObject jsonObject1 = createObjectBuilder().add("id", id1.toString()).add("startDate", "2010-08-01").add("endDate", "2011-08-01").add("offenceCode", "H8198").add("offencePlea", pleaJson).add("section", "Section 51").add("orderIndex",1).add("count",1).build(); final JsonObject jsonObject2 = createObjectBuilder().add("id", id2.toString()).add("wording", word2).add("startDate", "2010-08-01").add("endDate", "2011-08-01").add("offenceCode", "H8198").add("offencePlea", pleaJson).add("section", "Section 51").add("orderIndex",2).add("count",1).build(); - return EnvelopeFactory.createEnvelope("name", Json.createObjectBuilder().add("caseId", defendantId.toString()).add("defendantId", defendantId.toString()).add("offences", Json.createArrayBuilder().add(jsonObject1).add(jsonObject2).build()).build()); + return EnvelopeFactory.createEnvelope("name", JsonObjects.createObjectBuilder().add("caseId", defendantId.toString()).add("defendantId", defendantId.toString()).add("offences", JsonObjects.createArrayBuilder().add(jsonObject1).add(jsonObject2).build()).build()); } private JsonEnvelope getJsonEnvelopeForDelete(final UUID defendantId, final UUID id1, final String word1) { final JsonObject pleaJson = createObjectBuilder().add("id", id1.toString()).add("pleaDate","2010-08-01").add("value","GUILTY").build(); final JsonObject jsonObject1 = createObjectBuilder().add("id", id1.toString()).add("startDate", "2010-08-01").add("endDate", "2011-08-01").add("offenceCode", "H8198").add("offencePlea", pleaJson).add("section", "Section 51").add("orderIndex",1).add("count",1).build(); - return EnvelopeFactory.createEnvelope("name", Json.createObjectBuilder().add("caseId", defendantId.toString()).add("defendantId", defendantId.toString()).add("offences", Json.createArrayBuilder().add(jsonObject1)).build()); + return EnvelopeFactory.createEnvelope("name", JsonObjects.createObjectBuilder().add("caseId", defendantId.toString()).add("defendantId", defendantId.toString()).add("offences", JsonObjects.createArrayBuilder().add(jsonObject1)).build()); } } diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/CourtFeeForCivilApplicationUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/CourtFeeForCivilApplicationUpdatedEventListenerTest.java index e49ffc5fc..20757075b 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/CourtFeeForCivilApplicationUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/CourtFeeForCivilApplicationUpdatedEventListenerTest.java @@ -1,10 +1,8 @@ package uk.gov.moj.cpp.prosecution.event.listener; -import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -18,6 +16,7 @@ import uk.gov.justice.core.courts.BoxHearingRequest; import uk.gov.justice.core.courts.CourtApplication; import uk.gov.justice.core.courts.CourtApplicationParty; +import uk.gov.justice.core.courts.CourtApplicationPayment; import uk.gov.justice.core.courts.CourtApplicationType; import uk.gov.justice.core.courts.CourtFeeForCivilApplicationUpdated; import uk.gov.justice.core.courts.CourtHearingRequest; @@ -43,6 +42,7 @@ import javax.json.JsonObject; import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -53,9 +53,9 @@ import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) -class CourtFeeForCivilApplicationUpdatedEventListenerTest { +public class CourtFeeForCivilApplicationUpdatedEventListenerTest { - final static private UUID APPLICATION_ID = randomUUID(); + final static private UUID APPLICATION_ID = UUID.randomUUID(); final static private String APPLICATION_ARN = new StringGenerator().next(); final static private String APPLICANT_FIRST_NAME = new StringGenerator().next(); final static private String APPLICANT_LAST_NAME = new StringGenerator().next(); @@ -84,13 +84,13 @@ class CourtFeeForCivilApplicationUpdatedEventListenerTest { private InitiateCourtApplicationRepository initiateCourtApplicationRepository; @BeforeEach - void setup() { + public void setup() { setField(this.jsonObjectToObjectConverter, "objectMapper", new ObjectMapperProducer().objectMapper()); setField(this.objectToJsonObjectConverter, "mapper", new ObjectMapperProducer().objectMapper()); } @Test - void shouldEditCivilApplicationFees() { + public void shouldEditCivilApplicationFees() { final CourtFeeForCivilApplicationUpdated courtFeeForCivilApplicationUpdated = CourtFeeForCivilApplicationUpdated.courtFeeForCivilApplicationUpdated() .withApplicationId(APPLICATION_ID) .withCourtApplicationPayment(courtApplicationPayment() @@ -103,7 +103,7 @@ void shouldEditCivilApplicationFees() { final CourtApplication courtApplication = getCourtApplication(); final CourtApplicationEntity courtApplicationEntity = new CourtApplicationEntity(); - courtApplicationEntity.setAssignedUserId(randomUUID()); + courtApplicationEntity.setAssignedUserId(UUID.randomUUID()); courtApplicationEntity.setApplicationId(APPLICATION_ID); final JsonObject courtApplicationJson = createObjectBuilder().build(); courtApplicationEntity.setPayload(objectToJsonObjectConverter.convert(courtFeeForCivilApplicationUpdated).toString()); @@ -149,7 +149,7 @@ void shouldEditCivilApplicationFees() { @Test - void shouldEditOlderStructureCivilApplicationFees() { + public void shouldEditOlderStructureCivilApplicationFees() { final CourtFeeForCivilApplicationUpdated courtFeeForCivilApplicationUpdated = CourtFeeForCivilApplicationUpdated.courtFeeForCivilApplicationUpdated() .withApplicationId(APPLICATION_ID) .withCourtApplicationPayment(courtApplicationPayment() @@ -169,7 +169,7 @@ void shouldEditOlderStructureCivilApplicationFees() { .build()) .build(); final CourtApplicationEntity courtApplicationEntity = new CourtApplicationEntity(); - courtApplicationEntity.setAssignedUserId(randomUUID()); + courtApplicationEntity.setAssignedUserId(UUID.randomUUID()); courtApplicationEntity.setApplicationId(APPLICATION_ID); final JsonObject courtApplicationJson = createObjectBuilder().build(); courtApplicationEntity.setPayload(objectToJsonObjectConverter.convert(courtFeeForCivilApplicationUpdated).toString()); @@ -213,76 +213,6 @@ void shouldEditOlderStructureCivilApplicationFees() { assertTrue(courtApplicationPayment1.containsKey("contestedFeeStatus")); } - - @Test - void shouldProcessOlderStructureCivilApplicationFeesDuringCatchUp() { - final CourtFeeForCivilApplicationUpdated courtFeeForCivilApplicationUpdated = CourtFeeForCivilApplicationUpdated.courtFeeForCivilApplicationUpdated() - .withApplicationId(APPLICATION_ID) - .withCourtApplicationPayment(courtApplicationPayment() - .withIsFeeExempt(true) - .withIsFeePaid(true) - .withIsFeeUndertakingAttached(true) - .withPaymentReference("Updated Contested fee status") - .build()) - .build(); - - final CourtApplication courtApplicationWithOldFeeStructure = courtApplication() - .withValuesFrom(getCourtApplication()) - .withCourtApplicationPayment(courtApplicationPayment() - .withIsFeeExempt(true) - .withIsFeePaid(true) - .withIsFeeUndertakingAttached(true) - .build()) - .build(); - final CourtApplicationEntity courtApplicationEntity = new CourtApplicationEntity(); - courtApplicationEntity.setAssignedUserId(randomUUID()); - courtApplicationEntity.setApplicationId(APPLICATION_ID); - final JsonObject courtApplicationJson = createObjectBuilder().build(); - courtApplicationEntity.setPayload(objectToJsonObjectConverter.convert(courtFeeForCivilApplicationUpdated).toString()); - - final InitiateCourtApplicationProceedings initiateCourtApplicationProceedings = getInitiateCourtApplicationProceedings(courtApplicationWithOldFeeStructure); - final InitiateCourtApplicationEntity initiateCourtApplicationEntity = new InitiateCourtApplicationEntity(); - initiateCourtApplicationEntity.setApplicationId(APPLICATION_ID); - final JsonObject initiateCourtApplicationJson = objectToJsonObjectConverter.convert(initiateCourtApplicationProceedings); - createObjectBuilder().build(); - initiateCourtApplicationEntity.setPayload("{}"); - - when(stringToJsonObjectConverter.convert(courtApplicationEntity.getPayload())).thenReturn(courtApplicationJson); - when(courtApplicationRepository.findByApplicationId(any())).thenReturn(courtApplicationEntity); - when(stringToJsonObjectConverter.convert(initiateCourtApplicationEntity.getPayload())).thenReturn(initiateCourtApplicationJson); - when(initiateCourtApplicationRepository.findBy(any())).thenReturn(initiateCourtApplicationEntity); - - listener.processEvent(envelopeFrom(metadataWithRandomUUID("progression.event.court-fee-for-civil-application-updated"), - objectToJsonObjectConverter.convert(courtFeeForCivilApplicationUpdated))); - - final ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(CourtApplicationEntity.class); - verify(this.courtApplicationRepository).save(argumentCaptor.capture()); - final CourtApplicationEntity savedEntity = argumentCaptor.getValue(); - - assertThat(savedEntity.getApplicationId(), is(APPLICATION_ID)); - JsonObject courtApplicationResponse = stringToJsonObjectConverter.convert(savedEntity.getPayload()); - assertTrue(courtApplicationResponse.containsKey(COURT_APPLICATION_PAYMENT)); - final JsonObject courtApplicationPayment = courtApplicationResponse.getJsonObject(COURT_APPLICATION_PAYMENT); - assertFalse(courtApplicationPayment.containsKey("feeStatus")); - assertFalse(courtApplicationPayment.containsKey("contestedFeeStatus")); - - final ArgumentCaptor argCaptor = ArgumentCaptor.forClass(InitiateCourtApplicationEntity.class); - verify(this.initiateCourtApplicationRepository).save(argCaptor.capture()); - final InitiateCourtApplicationEntity initiateCourtApplicationEntity1 = argCaptor.getValue(); - - assertThat(initiateCourtApplicationEntity1.getApplicationId(), is(APPLICATION_ID)); - JsonObject initiateCourtApplicationResponse = stringToJsonObjectConverter.convert(initiateCourtApplicationEntity1.getPayload()); - JsonObject courtApplicationObj = initiateCourtApplicationResponse.getJsonObject("courtApplication"); - assertTrue(courtApplicationObj.containsKey(COURT_APPLICATION_PAYMENT)); - final JsonObject courtApplicationPayment1 = courtApplicationObj.getJsonObject(COURT_APPLICATION_PAYMENT); - assertFalse(courtApplicationPayment1.containsKey("feeStatus")); - assertFalse(courtApplicationPayment1.containsKey("contestedFeeStatus")); - assertTrue(courtApplicationPayment1.containsKey("paymentReference")); - assertTrue(courtApplicationPayment1.containsKey("isFeeExempt")); - assertTrue(courtApplicationPayment1.containsKey("isFeePaid")); - assertTrue(courtApplicationPayment1.containsKey("isFeeUndertakingAttached")); - } - private static CourtApplication getCourtApplication() { return courtApplication() .withId(APPLICATION_ID) diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionDefendantUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionDefendantUpdatedEventListenerTest.java index e063bb1ae..3a59762bd 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionDefendantUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionDefendantUpdatedEventListenerTest.java @@ -62,7 +62,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -159,9 +159,9 @@ public void shouldHandleProsecutionCaseDefendantUpdatedEvent() throws Exception .thenReturn(prosecutionCaseDefendantUpdated); when(defendant.getId()).thenReturn(randomUUID()); when(prosecutionCaseDefendantUpdated.getDefendant()).thenReturn(defendant); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()).build()) .build()) .build()).build(); @@ -209,9 +209,9 @@ public void shouldUpdateMatchedRespondents() { when(jsonObjectToObjectConverter.convert(payload, ProsecutionCaseDefendantUpdated.class)).thenReturn(prosecutionCaseDefendantUpdated); when(defendant.getId()).thenReturn(randomUUID()); when(prosecutionCaseDefendantUpdated.getDefendant()).thenReturn(defendantUpdate); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()).build()) .build()) .build()).build(); @@ -259,9 +259,9 @@ public void shouldUpdateDefendantButRetainOriginalValuesThatAreNotPassedFromUI() when(defendant.getId()).thenReturn(defendantId); when(prosecutionCaseDefendantUpdated.getDefendant()).thenReturn(defendantUpdate); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()).build()) .build()) .build()).build(); @@ -323,9 +323,9 @@ public void shouldUpdateDefendantWithoutExistingAssociatedPeopleButRetainOrigina when(jsonObjectToObjectConverter.convert(payload, ProsecutionCaseDefendantUpdated.class)).thenReturn(prosecutionCaseDefendantUpdated); when(defendant.getId()).thenReturn(defendantId); when(prosecutionCaseDefendantUpdated.getDefendant()).thenReturn(defendantUpdate); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()).build()) .build()) .build()).build(); @@ -390,9 +390,9 @@ public void shouldUpdateDefendantWithoutExistingPersonEthnicityWithNewValue() { when(jsonObjectToObjectConverter.convert(payload, ProsecutionCaseDefendantUpdated.class)).thenReturn(prosecutionCaseDefendantUpdated); when(defendant.getId()).thenReturn(defendantId); when(prosecutionCaseDefendantUpdated.getDefendant()).thenReturn(defendantUpdate); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()).build()) .build()) .build()).build(); @@ -450,9 +450,9 @@ public void shouldHandleProsecutionCaseUpdatedEvent() throws Exception { when(hearingResultedCaseUpdated.getProsecutionCase()).thenReturn(prosecutionCase); when(prosecutionCase.getDefendants()).thenReturn(defsList); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()).build()) .build()) .build()).build(); @@ -506,9 +506,9 @@ public void shouldHandleDefendantWithLegalAid_ProsecutionCaseUpdatedEvent() thro when(hearingResultedCaseUpdated.getProsecutionCase()).thenReturn(prosecutionCase); when(prosecutionCase.getDefendants()).thenReturn(eventPayloadDefendantList); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", def1.toString()).build()) .build()) .build()).build(); @@ -576,9 +576,9 @@ public void shouldHandleDefendantOffencesWithLegalAid_ProsecutionCaseUpdatedEven when(hearingResultedCaseUpdated.getProsecutionCase()).thenReturn(prosecutionCase); when(prosecutionCase.getDefendants()).thenReturn(payloadDefendantsWithPendingStatusLegalAid); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", def1.toString()).build()) .build()) .build()).build(); @@ -652,7 +652,7 @@ public void shouldProcessHearingDefendantUpdated() { final LocalDate updatedDoB = LocalDate.of(2005, 12, 27); final DefendantUpdate defendantUpdate = prepareDefendantUpdate(randomUUID(), updatedDoB, defendantId); - final JsonObject jsonObject = Json.createObjectBuilder().build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().build(); final Defendant defendant1 = prepareDefendantWithAssociatedPerson(defendantId, masterDefendantId, prosecutionCaseId, selfDefinedEthnicityId, observedEthnicityId); final List defendants =new ArrayList<>(); defendants.add(defendant1); @@ -693,7 +693,7 @@ public void shouldNotProcessHearingDefendantUpdatedWhenProsecutionCasesIsNull() final LocalDate updatedDoB = LocalDate.of(2005, 12, 27); final DefendantUpdate defendantUpdate = prepareDefendantUpdate(randomUUID(), updatedDoB, defendantId); - final JsonObject jsonObject = Json.createObjectBuilder().build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().build(); final Defendant defendant1 = prepareDefendantWithAssociatedPerson(defendantId, masterDefendantId, prosecutionCaseId, selfDefinedEthnicityId, observedEthnicityId); final List defendants =new ArrayList<>(); defendants.add(defendant1); @@ -727,7 +727,7 @@ public void shouldNotProcessHearingDefendantUpdatedWhenTheseIsNoHearing() { final LocalDate updatedDoB = LocalDate.of(2005, 12, 27); final DefendantUpdate defendantUpdate = prepareDefendantUpdate(randomUUID(), updatedDoB, defendantId); - final JsonObject jsonObject = Json.createObjectBuilder().build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().build(); final Defendant defendant1 = prepareDefendantWithAssociatedPerson(defendantId, masterDefendantId, prosecutionCaseId, selfDefinedEthnicityId, observedEthnicityId); final List defendants =new ArrayList<>(); defendants.add(defendant1); @@ -785,7 +785,7 @@ private List getDefendantWithLegalAid(final UUID defendantId1, final private JsonObject jsonFromString(final String jsonObjectStr) { JsonObject object; - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { object = jsonReader.readObject(); } @@ -959,12 +959,12 @@ private DefendantUpdate prepareDefendantUpdateForAssociatedPerson(final UUID sel } private JsonObject prepareUpdatedProsecutionCase() { - return Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()) - .add("personDefendant", Json.createObjectBuilder() - .add("personDetails", Json.createObjectBuilder() + .add("personDefendant", JsonObjects.createObjectBuilder() + .add("personDetails", JsonObjects.createObjectBuilder() .add("occupation", "Plumber") .add("occupationCode", "PL01") .add("firstName", "newFirstName") diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionOffencesUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionOffencesUpdatedEventListenerTest.java index ce657c0e3..87c616030 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionOffencesUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecution/event/listener/ProsecutionOffencesUpdatedEventListenerTest.java @@ -3,8 +3,8 @@ import static java.time.LocalDate.now; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ApplicationHearingToInActiveProsecutionCaseListingStatusChangedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ApplicationHearingToInActiveProsecutionCaseListingStatusChangedEventListenerTest.java index 34e2edfe7..3c2eb876d 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ApplicationHearingToInActiveProsecutionCaseListingStatusChangedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ApplicationHearingToInActiveProsecutionCaseListingStatusChangedEventListenerTest.java @@ -22,7 +22,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; @@ -110,7 +110,7 @@ public void shouldHandleApplicationHearingForInactiveCaseListingStatusChanged_He final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(hearingId); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.SENT_FOR_LISTING); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CaseGroupInfoUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CaseGroupInfoUpdatedEventListenerTest.java index e8d6ebda1..20ddd42d8 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CaseGroupInfoUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CaseGroupInfoUpdatedEventListenerTest.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -122,7 +122,7 @@ private CaseGroupInfoUpdated getEvent(final UUID groupId, final UUID caseId, fin } private static JsonObject jsonFromString(String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtDocumentEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtDocumentEventListenerTest.java index 53376de89..9b994f858 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtDocumentEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/CourtDocumentEventListenerTest.java @@ -4,8 +4,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -55,7 +55,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -158,7 +158,7 @@ private static JsonObject buildDocumentCategoryJsonObject() { .add("materials", createObjectBuilder().add("id", "5e1cc18c-76dc-47dd-99c1-d6f87385edf1")) .add("containsFinancialMeans", true) .add("courtDocumentTypeRBAC", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("uploadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer").build()).build()) .add("readUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()) .add("downloadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()).build()) @@ -529,6 +529,6 @@ public void shouldProcessCourtDocumentPrinted() { } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } } diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListenerTest.java index 7ed87a733..e9a5189cf 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceAssociationLockedListenerTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -72,9 +72,9 @@ public void handleDefendantAssociationLock () { .withId(prosecutionCaseId) .withDefendants(getDefendants(defendantId, prosecutionCaseId, lockedByRepOrder)) .build(); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendantId.toString()).build()) .build()) .build()).build(); @@ -108,7 +108,7 @@ private List getDefendants(final UUID defendantId, final UUID prosecu private JsonObject jsonFromString(final String jsonObjectStr) { JsonObject object; - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { object = jsonReader.readObject(); } @@ -118,7 +118,7 @@ private JsonObject jsonFromString(final String jsonObjectStr) { private static JsonObject createPayloadForDefendantDefenceAssociationLocked() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(DEFENDANT_ID, defendantId.toString()) .add(PROSECUTION_CASE_ID, prosecutionCaseId.toString()) .add(LOCKED_BY_REP_ORDER, lockedByRepOrder) diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListenerTest.java index 16593117a..baab56058 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationChangedListenerTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -127,9 +127,9 @@ public void shouldHandleDefendantDefenceOrganisationChanged() { .build(); when(defendantDefenceOrganisationChanged.getAssociatedDefenceOrganisation()).thenReturn(associatedDefenceOrganisation); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendantId.toString()).build()) .build()) .build()).build(); @@ -217,9 +217,9 @@ public void shouldHandleDefendantDefenceOrganisationChangedForApplication() { .build(); when(defendantDefenceOrganisationChanged.getAssociatedDefenceOrganisation()).thenReturn(associatedDefenceOrganisation); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendantId.toString()).build()) .build()) .build()).build(); @@ -284,7 +284,7 @@ private List getDefendants(final UUID prosecutionCaseId, final UUID d private JsonObject jsonFromString(final String jsonObjectStr) { JsonObject object; - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { object = jsonReader.readObject(); } diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListenerTest.java index beec6bf5e..f164dc7ab 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantDefenceOrganisationSavedListenerTest.java @@ -36,7 +36,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -133,9 +133,9 @@ public void shouldHandleDefendantDefenceOrganisationSaved() throws Exception { - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendantId.toString()).build()) .build()) .build()).build(); @@ -206,7 +206,7 @@ private List getDefendants(final UUID defendantId, final UUID prosecu private JsonObject jsonFromString(final String jsonObjectStr) { JsonObject object; - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { object = jsonReader.readObject(); } diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantLAAAssociatedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantLAAAssociatedListenerTest.java index ed734432b..63b0aa392 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantLAAAssociatedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantLAAAssociatedListenerTest.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -61,7 +61,7 @@ public void shouldHandleDefendantLAAAssociationSaved() { } private static JsonObject createPayloadForDefendantLAAAssociation() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(DEFENDANT_ID, defendantId.toString()) .add(LAA_CONTRACT_NUMBER, laaContractNumber) .add(IS_ASSOCIATED_BY_LAA, isAssociatedByLAA) diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListenerTest.java index 7d2147ed6..6014d3352 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantMatchingEventListenerTest.java @@ -40,7 +40,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -695,7 +695,7 @@ private List createDefendants(final UUID matchedDefendantId) { } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantRequestEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantRequestEventListenerTest.java index c571f4d3b..97947d9dc 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantRequestEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantRequestEventListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecutioncase.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static 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/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantsAddedToCourtProceedingsListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantsAddedToCourtProceedingsListenerTest.java index eacb1e651..baa26920e 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantsAddedToCourtProceedingsListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/DefendantsAddedToCourtProceedingsListenerTest.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; @@ -112,9 +112,9 @@ public void shouldHandleProsecutionCaseDefendantUpdatedEvent() throws Exception when(defendantsAddedToCourtProceedings.getDefendants()).thenReturn(Collections.singletonList(defendant)); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendant.getId().toString()) .add("prosecutionCaseId", defendant.getProsecutionCaseId().toString()).build()) .build()) diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/FinancialMeansListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/FinancialMeansListenerTest.java index c55d06f70..caf32788b 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/FinancialMeansListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/FinancialMeansListenerTest.java @@ -2,8 +2,8 @@ import static com.google.common.collect.Lists.newArrayList; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasItems; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingApplicationLinkCreatedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingApplicationLinkCreatedListenerTest.java index 97c5223c7..5cda5c5ff 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingApplicationLinkCreatedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingApplicationLinkCreatedListenerTest.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -302,7 +302,7 @@ public void shouldRemoveNowsSpecificJudicialResultsBeforeSaving() { .build(); final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(HEARING_ID); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); final JsonObject payload = objectToJsonObjectConverter.convert(hearingApplicationLinkCreated); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedCaseUpdatedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedCaseUpdatedEventListenerTest.java index 9e5b9f772..2402c9312 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedCaseUpdatedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingConfirmedCaseUpdatedEventListenerTest.java @@ -33,7 +33,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -180,7 +180,7 @@ public void shouldNotUpdate() throws Exception { } private JsonObject getPayload(final ProsecutionCase prosecutionCase) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCase)) .add("caseStatus", SJP_REFERRAL.getDescription()) .build(); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingDaysWithoutCourtCentreCorrectedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingDaysWithoutCourtCentreCorrectedEventListenerTest.java index 6e409e1bd..692d2e645 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingDaysWithoutCourtCentreCorrectedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingDaysWithoutCourtCentreCorrectedEventListenerTest.java @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -103,7 +103,7 @@ public void shouldCorrectHearingDaysWithoutCourtCentre() { } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; @@ -111,8 +111,8 @@ private static JsonObject jsonFromString(final String jsonObjectStr) { private JsonObject getPayload(final HearingDaysWithoutCourtCentreCorrected hearingDaysWithoutCourtCentreCorrected) { - return Json.createObjectBuilder() - .add("hearingDays", Json.createArrayBuilder().add(objectToJsonObjectConverter.convert(hearingDaysWithoutCourtCentreCorrected.getHearingDays().get(0))).build()) + return JsonObjects.createObjectBuilder() + .add("hearingDays", JsonObjects.createArrayBuilder().add(objectToJsonObjectConverter.convert(hearingDaysWithoutCourtCentreCorrected.getHearingDays().get(0))).build()) .add("id", hearingDaysWithoutCourtCentreCorrected.getId().toString()) .build(); } diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListenerTest.java index 4c31f152d..249ab405d 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingExtendedEventListenerTest.java @@ -2,14 +2,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.UUID.randomUUID; +import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.core.courts.Defendant; import uk.gov.justice.core.courts.Hearing; @@ -20,65 +18,60 @@ import uk.gov.justice.core.courts.ProsecutionCase; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; -import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; -import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory; import uk.gov.moj.cpp.application.event.listener.CourtApplicationEventListenerTest; import uk.gov.moj.cpp.prosecutioncase.persistence.entity.CaseDefendantHearingEntity; +import uk.gov.moj.cpp.prosecutioncase.persistence.entity.CaseDefendantHearingKey; import uk.gov.moj.cpp.prosecutioncase.persistence.entity.HearingEntity; import uk.gov.moj.cpp.prosecutioncase.persistence.repository.CaseDefendantHearingRepository; import uk.gov.moj.cpp.prosecutioncase.persistence.repository.HearingRepository; import java.io.IOException; import java.io.InputStream; +import java.io.StringReader; import java.io.StringWriter; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.UUID; -import com.fasterxml.jackson.databind.ObjectMapper; +import uk.gov.justice.services.messaging.JsonObjects; +import javax.json.JsonObject; +import javax.json.JsonReader; + import org.apache.commons.io.IOUtils; 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 HearingExtendedEventListenerTest { - @Spy - private final ObjectMapper objectMapper = new ObjectMapperProducer().objectMapper(); - @Mock private HearingRepository hearingRepository; @Mock CaseDefendantHearingRepository caseDefendantHearingRepository; - @Spy - private JsonObjectToObjectConverter jsonObjectToObjectConverter = new JsonObjectToObjectConverter(objectMapper); - @Spy - private ObjectToJsonObjectConverter objectToJsonObjectConverter = new ObjectToJsonObjectConverter(objectMapper); - - private final StringToJsonObjectConverter stringToJsonObjectConverter = new StringToJsonObjectConverter(); - @InjectMocks private HearingExtendedEventListener hearingExtendedEventListener; - - @Captor - private ArgumentCaptor hearingArgumentCaptor; - + @Mock + private JsonObjectToObjectConverter jsonObjectToObjectConverter; + @Mock + private ObjectToJsonObjectConverter objectToJsonObjectConverter; + @Mock + private JsonEnvelope jsonEnvelope; + @Mock + private JsonObject jsonObject; + @Mock + private Hearing hearing; private UUID hearingId; private UUID prosecutionCaseId; private UUID defendantId; private String hearingPayload; + private String hearingPayloadWithSameCaseWithDifferentDefendant; @BeforeEach @@ -87,6 +80,7 @@ public void setup() throws IOException { prosecutionCaseId = randomUUID(); defendantId = randomUUID(); hearingPayload = createPayload("/json/hearingDataProsecutionCase.json"); + hearingPayloadWithSameCaseWithDifferentDefendant = createPayload("/json/hearingDataWithSameCaseWithDifferentDefendant.json"); } @Test @@ -95,299 +89,39 @@ public void shouldCallRemoveForHearingExtendedForCase() { final UUID extendedFromHearingId = randomUUID(); final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, prosecutionCaseId, defendantId, false, false); final HearingEntity hearingEntity = createHearingEntity(); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity()); + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingExtended).thenReturn(hearing); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, times(1)).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, prosecutionCaseId, defendantId); verify(caseDefendantHearingRepository, times(1)).remove(any()); verify(caseDefendantHearingRepository, times(1)).save(any()); } - @Test - void shouldAddNewDefendantWhenHearingExtended() { - final UUID case1Id = randomUUID(); - final UUID def1ForCase1Id = randomUUID(); - final UUID def2ForCase1Id = randomUUID(); - final UUID case2Id = randomUUID(); - final UUID def1ForCase2Id = randomUUID(); - - final Hearing dbHearing = createHearing(hearingId, Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID()))), - case2Id, asList(Map.of(def1ForCase2Id, asList(randomUUID(), randomUUID()))) - )); - - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); - - - final UUID extendedFromHearingId = randomUUID(); - final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, - Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID()))), - case2Id, asList(Map.of(def1ForCase2Id, asList(randomUUID(), randomUUID())))), - Map.of(case1Id, asList(Map.of(def2ForCase1Id, asList(randomUUID(), randomUUID())))) , false, false); - - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); - - when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); - - verify(hearingRepository, times(1)).findBy(hearingId); - verify(hearingRepository).save(hearingArgumentCaptor.capture()); - - final Hearing savedHearing = jsonObjectToObjectConverter.convert(stringToJsonObjectConverter.convert(hearingArgumentCaptor.getValue().getPayload()), Hearing.class); - - assertThat(savedHearing.getProsecutionCases().size(), is(2)); - final ProsecutionCase case1 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case1Id)).findFirst().get(); - final ProsecutionCase case2 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case2Id)).findFirst().get(); - final Defendant def1_1 = case1.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase1Id)).findFirst().get(); - final Defendant def1_2 = case1.getDefendants().stream().filter(def -> def.getId().equals(def2ForCase1Id)).findFirst().get(); - final Defendant def2_1 = case2.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase2Id)).findFirst().get(); - - assertThat(case1.getDefendants().size(), is(2)); - assertThat(def1_1.getOffences().size(), is(4)); - assertThat(def1_2.getOffences().size(), is(2)); - assertThat(case2.getDefendants().size(), is(1)); - assertThat(def2_1.getOffences().size(), is(4)); - } - - @Test - void shouldAddNewCaseWhenHearingExtended() { - final UUID case1Id = randomUUID(); - final UUID def1ForCase1Id = randomUUID(); - final UUID def2ForCase1Id = randomUUID(); - final UUID case2Id = randomUUID(); - final UUID def1ForCase2Id = randomUUID(); - final UUID case3Id = randomUUID(); - final UUID def1ForCase3Id = randomUUID(); - - final Hearing dbHearing = createHearing(hearingId, Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID()))), - case2Id, asList(Map.of(def1ForCase2Id, asList(randomUUID(), randomUUID()))) - )); - - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); - - - final UUID extendedFromHearingId = randomUUID(); - final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, - Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID()))), - case2Id, asList(Map.of(def1ForCase2Id, asList(randomUUID(), randomUUID())))), - Map.of(case1Id, asList(Map.of(def2ForCase1Id, asList(randomUUID(), randomUUID()))), - case3Id, asList(Map.of(def1ForCase3Id, asList(randomUUID(), randomUUID())))) , false, false); - - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); - - when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); - - verify(hearingRepository, times(1)).findBy(hearingId); - verify(hearingRepository).save(hearingArgumentCaptor.capture()); - - final Hearing savedHearing = jsonObjectToObjectConverter.convert(stringToJsonObjectConverter.convert(hearingArgumentCaptor.getValue().getPayload()), Hearing.class); - - assertThat(savedHearing.getProsecutionCases().size(), is(3)); - final ProsecutionCase case1 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case1Id)).findFirst().get(); - final ProsecutionCase case2 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case2Id)).findFirst().get(); - final ProsecutionCase case3 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case3Id)).findFirst().get(); - final Defendant def1_1 = case1.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase1Id)).findFirst().get(); - final Defendant def1_2 = case1.getDefendants().stream().filter(def -> def.getId().equals(def2ForCase1Id)).findFirst().get(); - final Defendant def2_1 = case2.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase2Id)).findFirst().get(); - final Defendant def3_1 = case3.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase3Id)).findFirst().get(); - - assertThat(case1.getDefendants().size(), is(2)); - assertThat(def1_1.getOffences().size(), is(4)); - assertThat(def1_2.getOffences().size(), is(2)); - assertThat(case2.getDefendants().size(), is(1)); - assertThat(def2_1.getOffences().size(), is(4)); - assertThat(case3.getDefendants().size(), is(1)); - assertThat(def3_1.getOffences().size(), is(2)); - } - - - @Test - void shouldKeepCaseIfTheCaseIsNotInRequestWhenHearingExtended() { - final UUID case1Id = randomUUID(); - final UUID def1ForCase1Id = randomUUID(); - final UUID def2ForCase1Id = randomUUID(); - final UUID case2Id = randomUUID(); - final UUID def1ForCase2Id = randomUUID(); - final UUID case3Id = randomUUID(); - final UUID def1ForCase3Id = randomUUID(); - - final Hearing dbHearing = createHearing(hearingId, Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID()))), - case2Id, asList(Map.of(def1ForCase2Id, asList(randomUUID(), randomUUID()))) - )); - - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); - - - final UUID extendedFromHearingId = randomUUID(); - final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, - Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID())))), - Map.of(case1Id, asList(Map.of(def2ForCase1Id, asList(randomUUID(), randomUUID()))), - case3Id, asList(Map.of(def1ForCase3Id, asList(randomUUID(), randomUUID())))) , false, false); - - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); - - when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); - - verify(hearingRepository, times(1)).findBy(hearingId); - verify(hearingRepository).save(hearingArgumentCaptor.capture()); - - final Hearing savedHearing = jsonObjectToObjectConverter.convert(stringToJsonObjectConverter.convert(hearingArgumentCaptor.getValue().getPayload()), Hearing.class); - - assertThat(savedHearing.getProsecutionCases().size(), is(3)); - final ProsecutionCase case1 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case1Id)).findFirst().get(); - final ProsecutionCase case2 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case2Id)).findFirst().get(); - final ProsecutionCase case3 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case3Id)).findFirst().get(); - final Defendant def1_1 = case1.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase1Id)).findFirst().get(); - final Defendant def1_2 = case1.getDefendants().stream().filter(def -> def.getId().equals(def2ForCase1Id)).findFirst().get(); - final Defendant def2_1 = case2.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase2Id)).findFirst().get(); - final Defendant def3_1 = case3.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase3Id)).findFirst().get(); - - assertThat(case1.getDefendants().size(), is(2)); - assertThat(def1_1.getOffences().size(), is(4)); - assertThat(def1_2.getOffences().size(), is(2)); - assertThat(case2.getDefendants().size(), is(1)); - assertThat(def2_1.getOffences().size(), is(2)); - assertThat(case3.getDefendants().size(), is(1)); - assertThat(def3_1.getOffences().size(), is(2)); } - - @Test - void shouldKeepDefendantIfTheDefendantIsNotInRequestWhenHearingExtended() { - final UUID case1Id = randomUUID(); - final UUID def1ForCase1Id = randomUUID(); - final UUID def2ForCase1Id = randomUUID(); - final UUID case2Id = randomUUID(); - final UUID def1ForCase2Id = randomUUID(); - final UUID case3Id = randomUUID(); - final UUID def1ForCase3Id = randomUUID(); - - final Hearing dbHearing = createHearing(hearingId, Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID())), Map.of(def2ForCase1Id, asList(randomUUID(), randomUUID()))), - case2Id, asList(Map.of(def1ForCase2Id, asList(randomUUID(), randomUUID()))) - )); - - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); - - - final UUID extendedFromHearingId = randomUUID(); - final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, - Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(randomUUID(), randomUUID())))), - Map.of(case3Id, asList(Map.of(def1ForCase3Id, asList(randomUUID(), randomUUID())))) , false, false); - - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); - - when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); - - verify(hearingRepository, times(1)).findBy(hearingId); - verify(hearingRepository).save(hearingArgumentCaptor.capture()); - - final Hearing savedHearing = jsonObjectToObjectConverter.convert(stringToJsonObjectConverter.convert(hearingArgumentCaptor.getValue().getPayload()), Hearing.class); - - assertThat(savedHearing.getProsecutionCases().size(), is(3)); - final ProsecutionCase case1 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case1Id)).findFirst().get(); - final ProsecutionCase case2 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case2Id)).findFirst().get(); - final ProsecutionCase case3 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case3Id)).findFirst().get(); - final Defendant def1_1 = case1.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase1Id)).findFirst().get(); - final Defendant def1_2 = case1.getDefendants().stream().filter(def -> def.getId().equals(def2ForCase1Id)).findFirst().get(); - final Defendant def2_1 = case2.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase2Id)).findFirst().get(); - final Defendant def3_1 = case3.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase3Id)).findFirst().get(); - - assertThat(case1.getDefendants().size(), is(2)); - assertThat(def1_1.getOffences().size(), is(4)); - assertThat(def1_2.getOffences().size(), is(2)); - assertThat(case2.getDefendants().size(), is(1)); - assertThat(def2_1.getOffences().size(), is(2)); - assertThat(case3.getDefendants().size(), is(1)); - assertThat(def3_1.getOffences().size(), is(2)); - } - - @Test - void shouldKeepOffenceIfTheOffenceIsNotInRequestWhenHearingExtended() { - final UUID case1Id = randomUUID(); - final UUID def1ForCase1Id = randomUUID(); - final UUID off1ForDef1ForCase1Id = randomUUID(); - final UUID off2ForDef1ForCase1Id = randomUUID(); - final UUID off3ForDef1ForCase1Id = randomUUID(); - final UUID off4ForDef1ForCase1Id = randomUUID(); - final UUID def2ForCase1Id = randomUUID(); - final UUID case2Id = randomUUID(); - final UUID def1ForCase2Id = randomUUID(); - final UUID case3Id = randomUUID(); - final UUID def1ForCase3Id = randomUUID(); - - final Hearing dbHearing = createHearing(hearingId, Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(off1ForDef1ForCase1Id,off2ForDef1ForCase1Id)), Map.of(def2ForCase1Id, asList(randomUUID(), randomUUID()))), - case2Id, asList(Map.of(def1ForCase2Id, asList(randomUUID(), randomUUID()))) - )); - - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); - - - final UUID extendedFromHearingId = randomUUID(); - final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, - Map.of(case1Id, asList(Map.of(def1ForCase1Id, asList(off1ForDef1ForCase1Id, off1ForDef1ForCase1Id)))), - Map.of(case3Id, asList(Map.of(def1ForCase3Id, asList(randomUUID(), randomUUID()))),case1Id, asList(Map.of(def1ForCase1Id, asList(off3ForDef1ForCase1Id,off4ForDef1ForCase1Id)))) , false, false); - - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); - - when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); - - verify(hearingRepository, times(1)).findBy(hearingId); - verify(hearingRepository).save(hearingArgumentCaptor.capture()); - - final Hearing savedHearing = jsonObjectToObjectConverter.convert(stringToJsonObjectConverter.convert(hearingArgumentCaptor.getValue().getPayload()), Hearing.class); - - assertThat(savedHearing.getProsecutionCases().size(), is(3)); - final ProsecutionCase case1 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case1Id)).findFirst().get(); - final ProsecutionCase case2 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case2Id)).findFirst().get(); - final ProsecutionCase case3 = savedHearing.getProsecutionCases().stream().filter(pc -> pc.getId().equals(case3Id)).findFirst().get(); - final Defendant def1_1 = case1.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase1Id)).findFirst().get(); - final Defendant def1_2 = case1.getDefendants().stream().filter(def -> def.getId().equals(def2ForCase1Id)).findFirst().get(); - final Defendant def2_1 = case2.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase2Id)).findFirst().get(); - final Defendant def3_1 = case3.getDefendants().stream().filter(def -> def.getId().equals(def1ForCase3Id)).findFirst().get(); - - assertThat(case1.getDefendants().size(), is(2)); - assertThat(def1_1.getOffences().size(), is(4)); - assertThat(def1_1.getOffences().stream().anyMatch(off -> off.getId().equals(off1ForDef1ForCase1Id)), is(true)); - assertThat(def1_1.getOffences().stream().anyMatch(off -> off.getId().equals(off2ForDef1ForCase1Id)), is(true)); - assertThat(def1_1.getOffences().stream().anyMatch(off -> off.getId().equals(off3ForDef1ForCase1Id)), is(true)); - assertThat(def1_1.getOffences().stream().anyMatch(off -> off.getId().equals(off4ForDef1ForCase1Id)), is(true)); - assertThat(def1_2.getOffences().size(), is(2)); - assertThat(case2.getDefendants().size(), is(1)); - assertThat(def2_1.getOffences().size(), is(2)); - assertThat(case3.getDefendants().size(), is(1)); - assertThat(def3_1.getOffences().size(), is(2)); - } - @Test public void shouldNotCallRemoveForHearingExtendedForCaseIsAdjournedIsTrue() { final UUID extendedFromHearingId = randomUUID(); HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, prosecutionCaseId, defendantId, true, false); final HearingEntity hearingEntity = createHearingEntity(); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity()); + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingExtended).thenReturn(hearing); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, never()).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, prosecutionCaseId, defendantId); verify(caseDefendantHearingRepository, never()).remove(any(CaseDefendantHearingEntity.class)); verify(caseDefendantHearingRepository, times(1)).save(any(CaseDefendantHearingEntity.class)); @@ -399,14 +133,17 @@ public void shouldNotCallRemoveForHearingExtendedForCaseIsPartiallyAllocatedIsTr final UUID extendedFromHearingId = randomUUID(); HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, prosecutionCaseId, defendantId, false, true); final HearingEntity hearingEntity = createHearingEntity(); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity()); + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingExtended).thenReturn(hearing); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, never()).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, prosecutionCaseId, defendantId); verify(caseDefendantHearingRepository, never()).remove(any(CaseDefendantHearingEntity.class)); verify(caseDefendantHearingRepository, times(1)).save(any(CaseDefendantHearingEntity.class)); @@ -418,15 +155,17 @@ public void shouldNotCallRemoveForHearingExtendedForCaseIsAdjournedAndIsPartiall final UUID extendedFromHearingId = randomUUID(); HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, prosecutionCaseId, defendantId, true, true); final HearingEntity hearingEntity = createHearingEntity(); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity()); + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingExtended).thenReturn(hearing); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); - + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, never()).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, prosecutionCaseId, defendantId); verify(caseDefendantHearingRepository, never()).remove(any(CaseDefendantHearingEntity.class)); verify(caseDefendantHearingRepository, times(1)).save(any(CaseDefendantHearingEntity.class)); @@ -438,14 +177,17 @@ public void shouldNotCallRemoveForHearingExtendedForCaseIsPartiallyAllocatedIsNu final UUID extendedFromHearingId = randomUUID(); HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, prosecutionCaseId, defendantId, false, null); final HearingEntity hearingEntity = createHearingEntity(); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity()); + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingExtended).thenReturn(hearing); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, never()).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, prosecutionCaseId, defendantId); verify(caseDefendantHearingRepository, never()).remove(any(CaseDefendantHearingEntity.class)); verify(caseDefendantHearingRepository, times(1)).save(any(CaseDefendantHearingEntity.class)); @@ -457,14 +199,17 @@ public void shouldNotCallRemoveForHearingExtendedForCaseIsAdjournedIsNull() { final UUID extendedFromHearingId = randomUUID(); HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, prosecutionCaseId, defendantId, null, false); final HearingEntity hearingEntity = createHearingEntity(); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity()); + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingExtended).thenReturn(hearing); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, never()).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, prosecutionCaseId, defendantId); verify(caseDefendantHearingRepository, never()).remove(any(CaseDefendantHearingEntity.class)); verify(caseDefendantHearingRepository, times(1)).save(any(CaseDefendantHearingEntity.class)); @@ -477,6 +222,9 @@ public void shouldHandleHearingExtendedForCaseWithAddedOffencesInSameDefendantAn final UUID extendedFromHearingId = randomUUID(); final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, caseId, defendantId, false, false); + final HearingEntity hearingEntity = createHearingEntity(hearingPayloadWithSameCaseWithDifferentDefendant); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity(hearingPayloadWithSameCaseWithDifferentDefendant)); final Hearing dbHearing = Hearing.hearing() .withProsecutionCases(asList( @@ -487,16 +235,17 @@ public void shouldHandleHearingExtendedForCaseWithAddedOffencesInSameDefendantAn .build())) .build())).build(); - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(jsonObject, HearingExtended.class)).thenReturn(hearingExtended); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when(jsonObjectToObjectConverter.convert(jsonFromString(hearingEntity.getPayload()), Hearing.class)).thenReturn(dbHearing); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, times(1)).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, caseId, defendantId); verify(caseDefendantHearingRepository, times(1)).remove(any()); verify(caseDefendantHearingRepository, times(1)).save(any()); @@ -510,6 +259,9 @@ public void shouldHandleHearingExtendedForCaseWithAddedDefendantsInSameDefendant final UUID extendedFromHearingId = randomUUID(); final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, caseId, defendantId2, false, false); + final HearingEntity hearingEntity = createHearingEntity(hearingPayloadWithSameCaseWithDifferentDefendant); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity(hearingPayloadWithSameCaseWithDifferentDefendant)); final Hearing dbHearing = Hearing.hearing() .withProsecutionCases(asList( @@ -521,14 +273,16 @@ public void shouldHandleHearingExtendedForCaseWithAddedDefendantsInSameDefendant .build())).build(); - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); + + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(jsonObject, HearingExtended.class)).thenReturn(hearingExtended); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when(jsonObjectToObjectConverter.convert(jsonFromString(hearingEntity.getPayload()), Hearing.class)).thenReturn(dbHearing); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, times(1)).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, caseId, defendantId2); verify(caseDefendantHearingRepository, times(1)).remove(any()); verify(caseDefendantHearingRepository, times(1)).save(any()); @@ -541,6 +295,9 @@ public void shouldHandleHearingExtendedForCaseWithAddedDefendantsInDifferentCase final UUID defendantId2 = randomUUID(); final UUID extendedFromHearingId = randomUUID(); final HearingExtended hearingExtended = createHearingExtended(hearingId, extendedFromHearingId, prosecutionCaseId, defendantId, false, false); + final HearingEntity hearingEntity = createHearingEntity(hearingPayloadWithSameCaseWithDifferentDefendant); + final List caseDefendantHearingEntityList = new ArrayList<>(); + caseDefendantHearingEntityList.add(createCaseDefendantHearingEntity(hearingPayloadWithSameCaseWithDifferentDefendant)); final Hearing dbHearing = Hearing.hearing() .withProsecutionCases(asList( @@ -551,15 +308,17 @@ public void shouldHandleHearingExtendedForCaseWithAddedDefendantsInDifferentCase .build())) .build())).build(); - final HearingEntity hearingEntity = createHearingEntity(objectToJsonObjectConverter.convert(dbHearing).toString()); + + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); + when(jsonObjectToObjectConverter.convert(jsonObject, HearingExtended.class)).thenReturn(hearingExtended); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonEnvelope jsonEnvelope = envelopeFrom( - MetadataBuilderFactory.metadataWithRandomUUID("progression.event.hearing-extended"), - objectToJsonObjectConverter.convert(hearingExtended)); + when(jsonObjectToObjectConverter.convert(jsonFromString(hearingEntity.getPayload()), Hearing.class)).thenReturn(dbHearing); + when( objectToJsonObjectConverter.convert(any())).thenReturn(jsonObject); hearingExtendedEventListener.hearingExtendedForCase(jsonEnvelope); verify(hearingRepository, times(1)).findBy(hearingId); + verify(jsonObjectToObjectConverter, times(1)).convert(jsonObject, HearingExtended.class); verify(caseDefendantHearingRepository, times(1)).findByHearingIdAndCaseIdAndDefendantId(extendedFromHearingId, prosecutionCaseId, defendantId); verify(caseDefendantHearingRepository, times(1)).remove(any()); verify(caseDefendantHearingRepository, times(1)).save(any()); @@ -609,88 +368,44 @@ private HearingExtended createHearingExtended(final UUID hearingId, final UUID e .withProsecutionCases(prosecutionCaseList) .build(); - return HearingExtended.hearingExtended() + final HearingExtended hearingExtended = HearingExtended.hearingExtended() .withHearingRequest(hearingListingNeeds) .withExtendedHearingFrom(extendedFromHearingId) .withIsAdjourned(isAdjourned) .withIsPartiallyAllocated(isPartiallyAllocated) .build(); + + return hearingExtended; } private String createPayload(final String payloadPath) throws IOException { final StringWriter writer = new StringWriter(); - final InputStream inputStream = CourtApplicationEventListenerTest.class.getResourceAsStream(payloadPath); + InputStream inputStream = CourtApplicationEventListenerTest.class.getResourceAsStream(payloadPath); IOUtils.copy(inputStream, writer, UTF_8); inputStream.close(); return writer.toString(); } - private Hearing createHearing(final UUID hearingId, final Map>>> cases){ - return Hearing.hearing() - .withId(hearingId) - .withProsecutionCases(cases.entrySet().stream().map(pCase -> ProsecutionCase.prosecutionCase() - .withId(pCase.getKey()) - .withDefendants(pCase.getValue().stream().flatMap(v -> v.entrySet().stream()) - .map(defendant ->Defendant.defendant() - .withId(defendant.getKey()) - .withOffences( defendant.getValue().stream().map(off -> Offence.offence() - .withId(off) - .build()).toList()) - .withProsecutionCaseId(pCase.getKey()) - .build()) - .toList()) - .build()) - .toList()) - .build(); + private CaseDefendantHearingEntity createCaseDefendantHearingEntity() { + final CaseDefendantHearingKey caseDefendantHearingKey = new CaseDefendantHearingKey(); + final CaseDefendantHearingEntity caseDefendantHearingEntity = new CaseDefendantHearingEntity(); + caseDefendantHearingEntity.setHearing(createHearingEntity()); + caseDefendantHearingEntity.setId(caseDefendantHearingKey); + return caseDefendantHearingEntity; } - private HearingExtended createHearingExtended(final UUID hearingId, final UUID extendedFromHearingId, final Map>>> cases, - final Map>>> newCases, - final Boolean isAdjourned, final Boolean isPartiallyAllocated) { - - final List caseList = new ArrayList<>(); - cases.entrySet().stream().map(pCase -> ProsecutionCase.prosecutionCase() - .withId(pCase.getKey()) - .withDefendants(pCase.getValue().stream().flatMap(v -> v.entrySet().stream()) - .map(defendant ->Defendant.defendant() - .withId(defendant.getKey()) - .withOffences( defendant.getValue().stream().map(off -> Offence.offence() - .withId(off) - .build()).toList()) - .withProsecutionCaseId(pCase.getKey()) - .build()) - .toList()) - .build()) - .forEach(caseList::add); - - newCases.entrySet().stream().map(pCase -> ProsecutionCase.prosecutionCase() - .withId(pCase.getKey()) - .withDefendants(pCase.getValue().stream().flatMap(v -> v.entrySet().stream()) - .map(defendant ->Defendant.defendant() - .withId(defendant.getKey()) - .withOffences( defendant.getValue().stream().map(off -> Offence.offence() - .withId(off) - .build()).toList()) - .withProsecutionCaseId(pCase.getKey()) - .build()) - .toList()) - .build()) - .forEach(caseList::add); - - final HearingListingNeeds hearingListingNeeds = HearingListingNeeds.hearingListingNeeds() - .withId(hearingId) - .withProsecutionCases(caseList) - .build(); - - return HearingExtended.hearingExtended() - .withHearingRequest(hearingListingNeeds) - .withExtendedHearingFrom(extendedFromHearingId) - .withIsAdjourned(isAdjourned) - .withIsPartiallyAllocated(isPartiallyAllocated) - .build(); + private CaseDefendantHearingEntity createCaseDefendantHearingEntity(final String hearingPayload) { + final CaseDefendantHearingKey caseDefendantHearingKey = new CaseDefendantHearingKey(); + final CaseDefendantHearingEntity caseDefendantHearingEntity = new CaseDefendantHearingEntity(); + caseDefendantHearingEntity.setHearing(createHearingEntity(hearingPayload)); + caseDefendantHearingEntity.setId(caseDefendantHearingKey); + return caseDefendantHearingEntity; } - private List asList(T... a) { - return new ArrayList<>(java.util.Arrays.asList(a)); + private static JsonObject jsonFromString(final String jsonObjectStr) { + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); + final JsonObject object = jsonReader.readObject(); + jsonReader.close(); + return object; } } diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListenerTest.java index ed5816868..de706d5f0 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultEventListenerTest.java @@ -63,7 +63,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -2499,7 +2499,7 @@ private JudicialResult getJudicialResultWithAmendment(final UUID judicialResultI private JsonObject jsonFromString(final String jsonObjectStr) { JsonObject object; - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { object = jsonReader.readObject(); } diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListenerTest.java index ffce13d42..3fa237933 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/HearingResultedEventListenerTest.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -134,7 +134,7 @@ private HearingEntity createHearingEntity() throws IOException { private JsonObject jsonFromString(final String jsonObjectStr) { JsonObject object; - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { object = jsonReader.readObject(); } return object; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/NotificationListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/NotificationListenerTest.java index 816f2ed4b..348e4c702 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/NotificationListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/NotificationListenerTest.java @@ -2,7 +2,7 @@ import static java.time.temporal.ChronoUnit.MILLIS; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantHearingResultUpdatedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantHearingResultUpdatedListenerTest.java index 4866077b5..8a9c13c6b 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantHearingResultUpdatedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantHearingResultUpdatedListenerTest.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -83,17 +83,17 @@ public void setUp() { public void shouldHandleProsecutionCaseDefendantHearingResultEvent() throws Exception { final HearingResultLineEntity hearingResultLineEntity = new HearingResultLineEntity(); - hearingResultLineEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingResultLineEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingResultLineEntity.setId(hearingResultLineId); final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(hearingId); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); hearingEntity.addResultLine(hearingResultLineEntity); when(envelope.payloadAsJsonObject()).thenReturn(payload); - when(objectToJsonObjectConverter.convert(any())).thenReturn(Json.createObjectBuilder().build()); + when(objectToJsonObjectConverter.convert(any())).thenReturn(JsonObjects.createObjectBuilder().build()); when(jsonObjectToObjectConverter.convert(payload, ProsecutionCaseDefendantHearingResultUpdated.class)).thenReturn(ProsecutionCaseDefendantHearingResultUpdated.prosecutionCaseDefendantHearingResultUpdated().withHearingId(hearingId).withSharedResultLines(Arrays.asList(SharedResultLine.sharedResultLine().withId(UUID.randomUUID()).build())).build()); when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantListingStatusChangedEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantListingStatusChangedEventListenerTest.java index eb4435a0d..2711c1a24 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantListingStatusChangedEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseDefendantListingStatusChangedEventListenerTest.java @@ -45,7 +45,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -112,7 +112,7 @@ public void shouldHandleProsecutionCaseDefendantHearingResultEvent() throws Exce final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(hearingId); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); final MatchDefendantCaseHearingEntity matchDefendantCaseHearingEntity = getMatchDefendantCaseHearingEntity(); @@ -164,7 +164,7 @@ public void processV2ShouldHandleProsecutionCaseDefendantHearingResultEvent() th final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(hearingId); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); final MatchDefendantCaseHearingEntity matchDefendantCaseHearingEntity = getMatchDefendantCaseHearingEntity(); @@ -613,7 +613,7 @@ public void processV2ShouldHandleProsecutionCaseDefendantHearingResultEvent1() t final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(hearingId); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); final MatchDefendantCaseHearingEntity matchDefendantCaseHearingEntity = getMatchDefendantCaseHearingEntity(); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseEventListenerTest.java index 8a8d04110..34039bd40 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseEventListenerTest.java @@ -64,7 +64,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.JsonNode; @@ -274,10 +274,10 @@ public void shouldHandleCaseEjectedEvent() throws IOException { when(initiateCourtApplicationRepository.findBy(any())).thenReturn(initiateCourtApplicationEntity); when(jsonObjectToObjectConverter.convert(jsonObject, InitiateCourtApplicationProceedings.class)).thenReturn(initiateCourtApplicationProceedings); - when(objectToJsonObjectConverter.convert(any())).thenReturn(Json.createObjectBuilder() + when(objectToJsonObjectConverter.convert(any())).thenReturn(JsonObjects.createObjectBuilder() .add("id", randomUUID().toString()) - .add("prosecutionCases", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + .add("prosecutionCases", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("id", randomUUID().toString()) .add(CPS_ORGANISATION, CPS_ORGANISATION_VALUE) .add(TRIAL_RECEIPT_TYPE, "Transfer") @@ -379,10 +379,10 @@ public void shouldHandleCaseEjectedViaBdfEvent() throws IOException { when(initiateCourtApplicationRepository.findBy(any())).thenReturn(initiateCourtApplicationEntity); when(jsonObjectToObjectConverter.convert(jsonObject, InitiateCourtApplicationProceedings.class)).thenReturn(initiateCourtApplicationProceedings); - when(objectToJsonObjectConverter.convert(any())).thenReturn(Json.createObjectBuilder() + when(objectToJsonObjectConverter.convert(any())).thenReturn(JsonObjects.createObjectBuilder() .add("id", randomUUID().toString()) - .add("prosecutionCases", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + .add("prosecutionCases", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("id", randomUUID().toString()) .add(CPS_ORGANISATION, CPS_ORGANISATION_VALUE) .add(TRIAL_RECEIPT_TYPE, "Transfer") diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListenerTest.java index 1a581cc6f..d01d64d11 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/ProsecutionCaseMarkersUpdatedListenerTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -72,16 +72,16 @@ public void shouldPersistCpsOrganisation() { final UUID prosecutionId = randomUUID(); ProsecutionCaseEntity prosecutionCaseEntity = new ProsecutionCaseEntity(); - final JsonObject caseMarker = Json.createObjectBuilder() + final JsonObject caseMarker = JsonObjects.createObjectBuilder() .add("hearingId", randomUUID().toString()).build(); - final JsonObject prosecutionCase = Json.createObjectBuilder() + final JsonObject prosecutionCase = JsonObjects.createObjectBuilder() .add("cpsOrganisation", "A01") .add("trialReceiptType", "Transfer") .build(); prosecutionCaseEntity.setPayload(prosecutionCase.toString()); when(repository.findByCaseId(any())).thenReturn(prosecutionCaseEntity); - JsonEnvelope envelope = JsonEnvelope.envelopeFrom(JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), Json.createObjectBuilder().add("payload", caseMarker).build()); + JsonEnvelope envelope = JsonEnvelope.envelopeFrom(JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), JsonObjects.createObjectBuilder().add("payload", caseMarker).build()); eventListener.processCaseMarkersUpdated(envelope); verify(repository).save(argumentCaptor.capture()); ProsecutionCaseEntity prosecutionCaseEntitySaved = argumentCaptor.getValue(); diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/SharedCourtDocumentEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/SharedCourtDocumentEventListenerTest.java index 3fa45d8e2..fe3b030ee 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/SharedCourtDocumentEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/SharedCourtDocumentEventListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.prosecutioncase.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.hamcrest.Matchers.is; diff --git a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateCpsDefendantEventListenerTest.java b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateCpsDefendantEventListenerTest.java index 5db3e0706..1ae2bc9af 100644 --- a/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateCpsDefendantEventListenerTest.java +++ b/progression-event/progression-event-listener/src/test/java/uk/gov/moj/cpp/prosecutioncase/event/listener/UpdateCpsDefendantEventListenerTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.prosecutioncase.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/Originator.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/Originator.java index c31b091f3..4c020294e 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/Originator.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/Originator.java @@ -11,7 +11,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -28,11 +28,11 @@ private Originator() { } public static Metadata createMetadataWithProcessIdAndUserId(final String id, final String name, final String userId) { - return metadataFrom(Json.createObjectBuilder() + return metadataFrom(JsonObjects.createObjectBuilder() .add(ID, id) .add(NAME, name) .add(SOURCE, ORIGINATOR_VALUE) - .add(CONTEXT, Json.createObjectBuilder() + .add(CONTEXT, JsonObjects.createObjectBuilder() .add(USER_ID, userId)) .build()).build(); } @@ -44,7 +44,7 @@ public static JsonEnvelope assembleEnvelopeWithPayloadAndMetaDetails(final JsonO } private static JsonObject addMetadataToPayload(final JsonObject load, final Metadata metadata) { - final JsonObjectBuilder job = Json.createObjectBuilder(); + final JsonObjectBuilder job = JsonObjects.createObjectBuilder(); load.entrySet().forEach(entry -> job.add(entry.getKey(), entry.getValue())); job.add(JsonEnvelope.METADATA, metadata.asJsonObject()); return job.build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessor.java index 951c44282..ce95cb193 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessor.java @@ -6,8 +6,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; @@ -63,7 +63,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -231,7 +231,7 @@ public void cotrCreated(final Envelope event) { private JsonObject buildPayload(final Envelope event) { - final JsonObjectBuilder eventPayload = Json.createObjectBuilder() + final JsonObjectBuilder eventPayload = JsonObjects.createObjectBuilder() .add(COTR_ID, event.payload().getCotrId().toString()); if (nonNull(event.payload().getSubmissionId())) { @@ -659,7 +659,7 @@ private void sendOperationFailed(final Metadata metadata, final JsonObject paylo .withName(PROGRESSION_OPERATION_FAILED) .build(); - final JsonObject cpsServeMaterialStatusUpdated = Json.createObjectBuilder().add(SUBMISSION_ID, payload.getString(SUBMISSION_ID)) + final JsonObject cpsServeMaterialStatusUpdated = JsonObjects.createObjectBuilder().add(SUBMISSION_ID, payload.getString(SUBMISSION_ID)) .add(CASE_ID, payload.getString(CASE_ID)) .add(MESSAGE, message) .add(OPERATION, command).build(); @@ -686,7 +686,7 @@ public void handleEventProsecutionCotrUpdated(final Envelope invalidCaseUrns) { - final JsonObjectBuilder objectBuilder = Json.createObjectBuilder() + final JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder() .add("linkResponseResults", response.toString()); if (!invalidCaseUrns.isEmpty()) { - final JsonArrayBuilder invalidCaseUrnsArray = Json.createArrayBuilder(); + final JsonArrayBuilder invalidCaseUrnsArray = JsonObjects.createArrayBuilder(); for (final String caseUrn : invalidCaseUrns) { invalidCaseUrnsArray.add(caseUrn); } diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java index 5139616df..5ce01dadf 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/helper/SummonsHelper.java @@ -3,8 +3,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 org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessor.java index 841efb157..0df09c7ab 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessor.java @@ -28,7 +28,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -93,7 +93,7 @@ private void handleDefendantDefenceOrganisationChanged(final JsonEnvelope jsonEn .filter(defendant -> defendant.getId().equals(defendantId)) .findFirst(); if (optionalDefendant.isPresent()) { - final JsonObject publicEventPayload = Json.createObjectBuilder() + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder() .add("defendant", objectToJsonObjectConverter.convert(updateDefendant(caseId, defendantId, associatedDefenceOrganisation, optionalDefendant.get()))) .build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessor.java index b3ddffa40..1faaa081e 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessor.java @@ -10,8 +10,8 @@ import javax.json.JsonObjectBuilder; import static java.util.Optional.empty; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import org.slf4j.Logger; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessor.java index 8fc454393..26ea15cbf 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessor.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonValue; @@ -113,7 +113,7 @@ private void sendCommandDisassociateDefenceOrganisationForApplication(final Json activeApplicationsOnCaseOptional.get().getJsonArray(LINKED_APPLICATIONS).forEach(linkedApplicationJson->{ final JsonObject linkedApplicationJsonObject = (JsonObject) linkedApplicationJson; final String applicationId = linkedApplicationJsonObject.getString(APPLICATION_ID); - final JsonObjectBuilder disassociateDefenceOrganisationForApplicationBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder disassociateDefenceOrganisationForApplicationBuilder = JsonObjects.createObjectBuilder(); if(nonNull(applicationId)){ disassociateDefenceOrganisationForApplicationBuilder .add(APPLICATION_ID, applicationId) @@ -323,7 +323,7 @@ private JsonObject getDefendantJson(final JsonObject prosecutionCaseJson, final } private JsonObject removeProperty(final JsonObject origin, final String key) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()) { if (!entry.getKey().equals(key)) { builder.add(entry.getKey(), entry.getValue()); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessor.java index abf74d6a8..e2a694601 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessor.java @@ -19,7 +19,7 @@ import java.io.IOException; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -100,7 +100,7 @@ public void processApplicationEjected(final JsonEnvelope event) { private JsonArray getHearingIdsForCaseAllApplications(final JsonEnvelope event) { final String prosecutionCaseId = event.payloadAsJsonObject().getString(PROSECUTION_CASE_ID); - final JsonArrayBuilder hearingIdsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder hearingIdsBuilder = JsonObjects.createArrayBuilder(); progressionService.getProsecutionCaseDetailById(event, prosecutionCaseId).ifPresent(prosecutionCaseJsonObject -> { final GetHearingsAtAGlance hearingsAtAGlance = jsonObjectToObjectConverter. convert(prosecutionCaseJsonObject.getJsonObject("hearingsAtAGlance"), @@ -125,7 +125,7 @@ private void setCaseEjectedStorage(final JsonEnvelope event, final String prosec ProsecutionCase.class); if (prosecutionCase != null && prosecutionCase.getProsecutionCaseIdentifier() != null) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); final ProsecutionCaseIdentifier caseIdentifier = prosecutionCase.getProsecutionCaseIdentifier(); payloadBuilder.add("CaseId", prosecutionCaseId); @@ -153,7 +153,7 @@ private String getOriginatingOrganisation(final String originatingOrganisation) } private JsonArray getHearingIdsForAllApplications(final JsonEnvelope event, final String applicationId) { - final JsonArrayBuilder hearingIdsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder hearingIdsBuilder = JsonObjects.createArrayBuilder(); progressionService.getCourtApplicationById(event, applicationId).ifPresent(applicationAtAGlance -> { final JsonArray hearings = applicationAtAGlance.getJsonArray("hearings"); @@ -166,7 +166,7 @@ private JsonArray getHearingIdsForAllApplications(final JsonEnvelope event, fina } public void sendPublicMessage(final JsonEnvelope event, final JsonArray hearingIds, final String id, final String idKey, final String removalReason) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payloadBuilder.add(idKey, id); payloadBuilder.add(REMOVAL_REASON, removalReason); addHearingIds(hearingIds, payloadBuilder); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseMarkersUpdatedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseMarkersUpdatedProcessor.java index 8f77c6eb8..2b0f297be 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseMarkersUpdatedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseMarkersUpdatedProcessor.java @@ -5,7 +5,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import uk.gov.justice.core.courts.CaseMarkersSharedWithHearings; import uk.gov.justice.core.courts.CaseMarkersUpdated; @@ -58,7 +58,7 @@ public void processCaseMarkerSharedWithHearings(final JsonEnvelope event){ final CaseMarkersSharedWithHearings caseMarkersSharedWithHearings = jsonObjectToObjectConverter.convert(privateEventPayload, CaseMarkersSharedWithHearings.class); caseMarkersSharedWithHearings.getHearingIds().forEach( hearingId -> - sender.send(envelop(Json.createObjectBuilder() + sender.send(envelop(JsonObjects.createObjectBuilder() .add("prosecutionCaseId", caseMarkersSharedWithHearings.getProsecutionCaseId().toString()) .add("hearingId", hearingId.toString()) .add("caseMarkers", privateEventPayload.get("caseMarkers")) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseNoteProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseNoteProcessor.java index e4701abac..980483d1b 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseNoteProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseNoteProcessor.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ public void processCaseNoteAdded(final JsonEnvelope event) { LOGGER.warn("raising public event public.progression.case-note-added correlationId: {}", event.metadata().clientCorrelationId().orElse(null)); } sender.send( - envelop(Json.createObjectBuilder().build()) + envelop(JsonObjects.createObjectBuilder().build()) .withName("public.progression.case-note-added") .withMetadataFrom(event)); if (LOGGER.isWarnEnabled()) { @@ -49,7 +49,7 @@ public void processCaseNoteAddedV2(final JsonEnvelope event) { LOGGER.info(LOG_OUTPUT_FORMAT, "progression.event.case-note-added-v2", event.toObfuscatedDebugString()); } sender.send( - envelop(Json.createObjectBuilder().build()) + envelop(JsonObjects.createObjectBuilder().build()) .withName("public.progression.case-note-added") .withMetadataFrom(event)); } @@ -60,7 +60,7 @@ public void processCaseNoteEdited(final JsonEnvelope event) { LOGGER.info(LOG_OUTPUT_FORMAT, "progression.event.case-note-edited", event.toObfuscatedDebugString()); } sender.send( - envelop(Json.createObjectBuilder().build()) + envelop(JsonObjects.createObjectBuilder().build()) .withName("public.progression.case-note-edited") .withMetadataFrom(event)); } @@ -71,7 +71,7 @@ public void processCaseNoteEditedV2(final JsonEnvelope event) { LOGGER.info(LOG_OUTPUT_FORMAT, "progression.event.case-note-edited-v2", event.toObfuscatedDebugString()); } sender.send( - envelop(Json.createObjectBuilder().build()) + envelop(JsonObjects.createObjectBuilder().build()) .withName("public.progression.case-note-edited") .withMetadataFrom(event)); } diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseRemoveFromGroupCaseProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseRemoveFromGroupCaseProcessor.java index 4cf9ac29f..29461ca82 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseRemoveFromGroupCaseProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CaseRemoveFromGroupCaseProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CasesReferredToCourtProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CasesReferredToCourtProcessor.java index de68662d9..e0e0483c8 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CasesReferredToCourtProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CasesReferredToCourtProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.core.courts.HearingLanguage.ENGLISH; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilCaseExistsProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilCaseExistsProcessor.java index ccf53ad06..bbbd3f988 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilCaseExistsProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilCaseExistsProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilFeesUpdatedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilFeesUpdatedProcessor.java index 7c7bc2008..87b5399fd 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilFeesUpdatedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CivilFeesUpdatedProcessor.java @@ -11,7 +11,7 @@ import uk.gov.moj.cpp.progression.events.CivilFeeResults; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -52,7 +52,7 @@ public void processCivilFeesAdded(final JsonEnvelope envelope) { } private static JsonObject createResponsePayload(final CivilFeeResults response) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("civilFeeResults", response.toString()) .build(); } diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessor.java index db6fd1d47..e947cb00f 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java index 3a417c0c7..8a07d4647 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessor.java @@ -12,8 +12,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.core.courts.CourtApplicationPartyListingNeeds.courtApplicationPartyListingNeeds; @@ -116,7 +116,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -741,7 +741,7 @@ public void processCourtApplicationReferredToExistingHearing(final JsonEnvelope final Hearing updatedHearing = updateHearingWithApplication(event, hearing, courtApplication); progressionService.linkApplicationsToHearing(event, updatedHearing, singletonList(courtApplication.getId()), SENT_FOR_LISTING); - final JsonArrayBuilder prosecutionCasesBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder prosecutionCasesBuilder = JsonObjects.createArrayBuilder(); final Stream prosecutionCaseStream = ofNullable(updatedHearing.getProsecutionCases()).map(Collection::stream).orElseGet(Stream::empty); prosecutionCaseStream.map(prosecutionCase -> objectToJsonObjectConverter.convert(prosecutionCase)).forEach(prosecutionCasesBuilder::add); final JsonObjectBuilder hearingExtendedPayloadBuilder = createObjectBuilder() diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessor.java index a914e6e4b..01d43502d 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessor.java @@ -6,7 +6,7 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessor.java index 74911eeae..2d444a04c 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessor.java @@ -2,7 +2,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static 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; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterPdfPayloadGenerator.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterPdfPayloadGenerator.java index f17c2808f..3a96c25a0 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterPdfPayloadGenerator.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/CourtRegisterPdfPayloadGenerator.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -43,7 +43,7 @@ public class CourtRegisterPdfPayloadGenerator { @SuppressWarnings({"squid:S1188", "squid:S1192"}) public JsonObject mapPayload(final JsonObject jsonObject) { - final JsonObjectBuilder payloadForPdf = Json.createObjectBuilder(); + final JsonObjectBuilder payloadForPdf = JsonObjects.createObjectBuilder(); jsonObject.getJsonArray("courtRegisterDocumentRequests").stream().findAny().map(JsonObject.class::cast) .ifPresent(json -> { payloadForPdf.add("registerDate", formatZonedDate(json.getString("registerDate"))); @@ -58,12 +58,12 @@ public JsonObject mapPayload(final JsonObject jsonObject) { }); }); - final JsonArrayBuilder caseArray = Json.createArrayBuilder(); + final JsonArrayBuilder caseArray = JsonObjects.createArrayBuilder(); jsonObject.getJsonArray("courtRegisterDocumentRequests").stream().map(JsonObject.class::cast) .forEach(courtRegisterDocumentRequest -> courtRegisterDocumentRequest.getJsonArray("defendants").stream().map(r -> (JsonObject) r) .forEach(defendant -> defendant.getJsonArray("prosecutionCasesOrApplications").stream().map(JsonObject.class::cast).collect(Collectors.toList()) .forEach(pcoa -> { - final JsonObjectBuilder caseJson = Json.createObjectBuilder(); + final JsonObjectBuilder caseJson = JsonObjects.createObjectBuilder(); caseJson.add("defendantType", courtRegisterDocumentRequest.getString("defendantType", "")); buildNameAndAddress(defendant, caseJson); buildHearingDetails(defendant, caseJson); @@ -94,11 +94,11 @@ public JsonObject mapPayload(final JsonObject jsonObject) { } private void buildDefendantResults(JsonObject defendant, JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); Optional.ofNullable(defendant.getJsonArray("defendantResults")).ifPresent(results -> { final List resultList = results.stream().map(JsonObject.class::cast).collect(Collectors.toList()); resultList.forEach(result -> { - final JsonObjectBuilder resultBuilder = Json.createObjectBuilder() + final JsonObjectBuilder resultBuilder = JsonObjects.createObjectBuilder() .add(RESULT_CODE, result.getString(CJS_RESULT_CODE, DASH)) .add(RESULT_TEXT, prepareResultText(result.getString(RESULT_TEXT, ""))); jsonArrayBuilder.add(resultBuilder.build()); @@ -112,9 +112,9 @@ private void buildDefendantResults(JsonObject defendant, JsonObjectBuilder caseJ } private void buildCaseResults(JsonObject pcoa, JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); Optional.ofNullable(pcoa.getJsonArray(RESULTS)).ifPresent(results -> results.stream().map(JsonObject.class::cast).forEach(result -> { - final JsonObjectBuilder resultBuilder = Json.createObjectBuilder() + final JsonObjectBuilder resultBuilder = JsonObjects.createObjectBuilder() .add(RESULT_CODE, result.getString(CJS_RESULT_CODE, DASH)) .add(RESULT_TEXT, prepareResultText(result.getString(RESULT_TEXT, ""))); jsonArrayBuilder.add(resultBuilder.build()); @@ -127,10 +127,10 @@ private void buildCaseResults(JsonObject pcoa, JsonObjectBuilder caseJson) { } private void buildApplication(final JsonObject pcoaJson, JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); if (isApplicationValid(pcoaJson)) { - final JsonObject application = Json.createObjectBuilder() + final JsonObject application = JsonObjects.createObjectBuilder() .add("type", pcoaJson.getString("applicationType", DASH)) .add("decision", pcoaJson.getString("applicationDecision", DASH)) .add("decisionDate", formatDate(pcoaJson.getString("applicationDecisionDate", DASH))) @@ -221,10 +221,10 @@ private void buildDefenceCounsel(JsonObject defendant, JsonObjectBuilder caseJso } private void buildOffences(final JsonObject pcoaJson, JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); Optional.ofNullable(pcoaJson.getJsonArray("offences")).ifPresent(offences -> offences.stream().map(JsonObject.class::cast).forEach(offenceJson -> { final String convictionDate = formatDate(offenceJson.getString(CONVICTION_DATE, DASH)); - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder() + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder() .add("offenceCode", offenceJson.getString("offenceCode", DASH)) .add("offenceTitle", clearUndesiredCharacters(offenceJson.getString("offenceTitle", DASH))) .add("wording", addNewLineIfDesired(clearUndesiredCharacters(offenceJson.getString("wording", DASH)))) @@ -245,11 +245,11 @@ private void buildOffences(final JsonObject pcoaJson, JsonObjectBuilder caseJson } private void setResults(final JsonArray resultsArray, JsonObjectBuilder offenceBuilder) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); Optional.ofNullable(resultsArray).ifPresent(results -> { final List resultList = results.stream().map(JsonObject.class::cast).collect(Collectors.toList()); resultList.forEach(result -> { - final JsonObjectBuilder resultBuilder = Json.createObjectBuilder() + final JsonObjectBuilder resultBuilder = JsonObjects.createObjectBuilder() .add(RESULT_CODE, result.getString(CJS_RESULT_CODE, DASH)) .add(RESULT_TEXT, prepareResultText(result.getString(RESULT_TEXT, ""))); jsonArrayBuilder.add(resultBuilder.build()); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessor.java index 1c33aea85..5c28df510 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessor.java @@ -16,7 +16,7 @@ import uk.gov.moj.cpp.progression.service.ProgressionService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import java.util.Optional; @@ -55,7 +55,7 @@ public void handleDefendantDefenceOrganisationChanged(final JsonEnvelope jsonEnv .filter(defendant -> defendant.getId().equals(defendantDefenceOrganisationChanged.getDefendantId())) .findFirst(); if (optionalDefendant.isPresent()) { - final JsonObject publicEventPayload = Json.createObjectBuilder() + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder() .add("defendant", objectToJsonObjectConverter.convert(updateDefendant(defendantDefenceOrganisationChanged, optionalDefendant.get()))) .build(); sender.send(enveloper.withMetadataFrom(jsonEnvelope, PUBLIC_CASE_DEFENDANT_CHANGED).apply(publicEventPayload)); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessor.java index 5bac3adb5..32cc7bc59 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.Collections.emptySet; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.core.courts.Defendant; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessor.java index 52496d1d9..24acad0e9 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessor.java @@ -5,8 +5,8 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; @@ -60,7 +60,7 @@ import java.util.function.Predicate; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -359,7 +359,7 @@ private boolean checkForSameHearingDateTime(final ListHearingRequest listHearing } private static JsonArray getDefendantOffences(final List defendants) { - final JsonArrayBuilder offenceIdArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder offenceIdArrayBuilder = JsonObjects.createArrayBuilder(); defendants.stream() .flatMap(r -> r.getOffences().stream()) .map(Offence::getId) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ExtendedHearingProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ExtendedHearingProcessor.java index d0db841ae..47dacb03b 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ExtendedHearingProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ExtendedHearingProcessor.java @@ -3,8 +3,8 @@ import static java.lang.Boolean.FALSE; import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.moj.cpp.progression.processor.HearingConfirmedEventProcessor.PUBLIC_PROGRESSION_EVENT_PROSECUTION_CASES_REFERRED_TO_COURT; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -84,7 +84,7 @@ public void process(final JsonEnvelope jsonEnvelope) { hearingExtended.getShadowListedOffences().forEach(shadowListedOffence -> shadowListedOffencesBuilder.add(shadowListedOffence.toString())); } - final JsonObject commandPayload = Json.createObjectBuilder() + final JsonObject commandPayload = JsonObjects.createObjectBuilder() .add("hearingRequest", objectToJsonObjectConverter.convert(hearingExtended.getHearingRequest())) .add("shadowListedOffences", shadowListedOffencesBuilder.build()) .build(); @@ -108,7 +108,7 @@ public void processed(final JsonEnvelope jsonEnvelope) { } if (nonNull(courtApplications)) { final CourtApplication courtApplication = courtApplications.get(0); - final JsonObject hearingCourtApplication = Json.createObjectBuilder() + final JsonObject hearingCourtApplication = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("courtApplication", objectToJsonObjectConverter.convert(courtApplication)) .build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessor.java index 2d585e436..c0d992278 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.core.annotation.Handles; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FormEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FormEventProcessor.java index 9f2ca586a..2696b8fd1 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FormEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/FormEventProcessor.java @@ -6,8 +6,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.isNotEmpty; @@ -50,7 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -699,15 +699,15 @@ public void handleServeFormSubmittedPublicEvent(final JsonEnvelope envelope) { final JsonObject payload = envelope.payloadAsJsonObject(); - final JsonArrayBuilder defendantIdArray = Json.createArrayBuilder(); + final JsonArrayBuilder defendantIdArray = JsonObjects.createArrayBuilder(); final List formDefendantList = payload.getJsonArray(FORM_DEFENDANTS).getValuesAs(JsonObject.class); - formDefendantList.forEach(defendant -> defendantIdArray.add(Json.createObjectBuilder() + formDefendantList.forEach(defendant -> defendantIdArray.add(JsonObjects.createObjectBuilder() .add(DEFENDANT_ID, defendant.getString(DEFENDANT_ID)) .build() ) ); - final JsonObject createPetFormPayload = Json.createObjectBuilder().add(CASE_ID, payload.get(CASE_ID)) + final JsonObject createPetFormPayload = JsonObjects.createObjectBuilder().add(CASE_ID, payload.get(CASE_ID)) .add(SUBMISSION_ID, payload.getString(SUBMISSION_ID)) .add(COURT_FORM_ID, String.valueOf(randomUUID())) .add(FORM_DEFENDANTS, defendantIdArray.build()) @@ -735,15 +735,15 @@ public void handleServePtphFormSubmittedPublicEvent(final JsonEnvelope envelope) final JsonObject payload = envelope.payloadAsJsonObject(); - final JsonArrayBuilder defendantIdArray = Json.createArrayBuilder(); + final JsonArrayBuilder defendantIdArray = JsonObjects.createArrayBuilder(); final List formDefendantList = payload.getJsonArray(FORM_DEFENDANTS).getValuesAs(JsonObject.class); - formDefendantList.forEach(defendant -> defendantIdArray.add(Json.createObjectBuilder() + formDefendantList.forEach(defendant -> defendantIdArray.add(JsonObjects.createObjectBuilder() .add(DEFENDANT_ID, defendant.getString(DEFENDANT_ID)) .build() ) ); - final JsonObject createPetFormPayload = Json.createObjectBuilder().add(CASE_ID, payload.get(CASE_ID)) + final JsonObject createPetFormPayload = JsonObjects.createObjectBuilder().add(CASE_ID, payload.get(CASE_ID)) .add(SUBMISSION_ID, payload.getString(SUBMISSION_ID)) .add(COURT_FORM_ID, String.valueOf(randomUUID())) .add(FORM_DEFENDANTS, defendantIdArray.build()) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingApplicationLinkCreatedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingApplicationLinkCreatedProcessor.java index 147142598..f5371970c 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingApplicationLinkCreatedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingApplicationLinkCreatedProcessor.java @@ -2,7 +2,7 @@ import java.util.Objects; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import uk.gov.justice.services.core.annotation.Component; @@ -28,7 +28,7 @@ public class HearingApplicationLinkCreatedProcessor { @Handles("progression.event.hearing-application-link-created") public void process(final JsonEnvelope event) { - final JsonObjectBuilder payload = Json.createObjectBuilder(); + final JsonObjectBuilder payload = JsonObjects.createObjectBuilder(); final JsonObject hearing = event.payloadAsJsonObject().getJsonObject("hearing"); payload.add("id",hearing.getString("id")); payload.add("courtCentre",hearing.getJsonObject("courtCentre")); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessor.java index 58356e5ed..c480a9016 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessor.java @@ -8,7 +8,7 @@ import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessor.java index 2b1d53dbb..279b5d53f 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingListingNumberUpdatedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingListingNumberUpdatedEventProcessor.java index eaabb26b8..eceea4a11 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingListingNumberUpdatedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingListingNumberUpdatedEventProcessor.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessor.java index 63276dd5f..fe43db1c9 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessor.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.fromString; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessor.java index 1bdb29b8f..eaae330a2 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessor.java index 95b8b79fd..0cd5447df 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessor.java @@ -16,7 +16,7 @@ import uk.gov.moj.cpp.progression.service.ProgressionService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -59,7 +59,7 @@ public void handleListingTrialVacatedEvent(final JsonEnvelope jsonEnvelope) { LOGGER.info("public.listing.vacated-trial-updated event received with metadata {} and payload {}", jsonEnvelope.metadata(), jsonEnvelope.payloadAsJsonObject()); final JsonObject payload = jsonEnvelope.payloadAsJsonObject(); - final JsonObjectBuilder trialVacatedCommandBuilder = Json.createObjectBuilder() + final JsonObjectBuilder trialVacatedCommandBuilder = JsonObjects.createObjectBuilder() .add("hearingId", payload.getString("hearingId")); if(payload.containsKey(VACATED_TRIAL_REASON_ID)) { trialVacatedCommandBuilder.add(VACATED_TRIAL_REASON_ID, payload.getString(VACATED_TRIAL_REASON_ID)); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessor.java index 2d2df02ac..172fb58f0 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessor.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 org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessor.java index ef1ca63dc..6ce0db6c5 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessor.java @@ -3,7 +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 javax.json.Json.createObjectBuilder; +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/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessor.java index af50d043e..5ce72e835 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessor.java @@ -4,7 +4,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; @@ -48,7 +48,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -257,7 +257,7 @@ public void handleAllHearingOffenceUpdated(final JsonEnvelope event) { allHearingOffencesUpdated.getHearingIds().forEach(hearingId -> { - final JsonObjectBuilder payload = Json.createObjectBuilder() + final JsonObjectBuilder payload = JsonObjects.createObjectBuilder() .add("defendantId", allHearingOffencesUpdated.getDefendantId().toString()) .add(HEARING_ID, hearingId.toString()); if(privateEventPayload.containsKey(UPDATED_OFFENCES)){ diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedForPartialAllocationEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedForPartialAllocationEventProcessor.java index cf356002e..5c9e6fd85 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedForPartialAllocationEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedForPartialAllocationEventProcessor.java @@ -6,7 +6,7 @@ import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import uk.gov.justice.core.courts.HearingUpdatedForPartialAllocation; @@ -27,7 +27,7 @@ public class HearingUpdatedForPartialAllocationEventProcessor { public void handle(final Envelope event){ final HearingUpdatedForPartialAllocation hearingUpdatedForPartialAllocation = event.payload(); - final JsonArrayBuilder offenceIdsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder offenceIdsBuilder = JsonObjects.createArrayBuilder(); hearingUpdatedForPartialAllocation.getProsecutionCasesToRemove().stream() .flatMap(prosecutionCasesToRemove -> prosecutionCasesToRemove.getDefendantsToRemove().stream()) @@ -35,7 +35,7 @@ public void handle(final Envelope event){ .map(OffencesToRemove::getOffenceId) .forEach(offenceId -> offenceIdsBuilder.add(offenceId.toString())); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("hearingId", hearingUpdatedForPartialAllocation.getHearingId().toString()) .add("offenceIds", offenceIdsBuilder.build()) .build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessor.java index cef899835..0da0a5eb0 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessor.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessor.java index 86261e8a7..3365ebde8 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessor.java @@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -93,7 +93,7 @@ public void handleLinkCasesValidations(final JsonEnvelope envelope) { if (alreadyLinkedCases.get().size() > 0 && alreadyLinkedCases.get().containsKey(LINKED_CASES) && !alreadyLinkedCases.get().getJsonArray(LINKED_CASES).isEmpty()) { alreadyLinkedCases.get().getJsonArray(LINKED_CASES).stream().forEach( lc -> { - final JsonObject linkedCase = Json.createObjectBuilder().add("linkedCase", lc).build(); + final JsonObject linkedCase = JsonObjects.createObjectBuilder().add("linkedCase", lc).build(); if (linkedCase.getJsonObject("linkedCase").getString(CASE_ID).equals(existingCase.get().getString(CASE_ID))) { sender.send(Enveloper.envelop(createResponsePayload(LinkResponseResults.REFERENCE_ALREADY_LINKED)).withName(PUBLIC_PROGRESSION_LINK_CASES_RESPONSE).withMetadataFrom(envelope)); failed.set(true); @@ -131,8 +131,8 @@ public void handleLinkCasesValidations(final JsonEnvelope envelope) { } private JsonObject buildCasesLinkedEventPayload(final JsonEnvelope envelope, final UUID leadCaseId, final List caseUrns) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder().add(LINK_ACTION_TYPE, LinkType.LINK.toString()); - final JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder().add(LINK_ACTION_TYPE, LinkType.LINK.toString()); + final JsonArrayBuilder arrayBuilder = JsonObjects.createArrayBuilder(); // for case reference; caseURN is used for spi cases, and prosecutionAuthorityReference is used for sjp cases final ProsecutionCaseIdentifier pci = jsonObjectToObjectConverter.convert(progressionService.getProsecutionCaseDetailById(envelope, leadCaseId.toString()).get().getJsonObject("prosecutionCase"), ProsecutionCase.class).getProsecutionCaseIdentifier(); final String leadCaseUrn = pci.getCaseURN() != null ? pci.getCaseURN() : pci.getProsecutionAuthorityReference(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessor.java index 4b288b628..4ccebd0bb 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessor.java @@ -3,7 +3,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.core.courts.CourtCentre; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessor.java index b973d1021..f09ec30ea 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessor.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -94,7 +94,7 @@ public void handleMergeCasesValidations(final JsonEnvelope envelope) { if (alreadyMergedCases.get().size() > 0 && alreadyMergedCases.get().containsKey(MERGED_CASES) && !alreadyMergedCases.get().getJsonArray(MERGED_CASES).isEmpty()) { alreadyMergedCases.get().getJsonArray(MERGED_CASES).stream().forEach( mc -> { - final JsonObject mergedCase = Json.createObjectBuilder().add("mergedCase", mc).build(); + final JsonObject mergedCase = JsonObjects.createObjectBuilder().add("mergedCase", mc).build(); if (mergedCase.getJsonObject("mergedCase").getString(CASE_ID).equals(existingCase.get().getString(CASE_ID))) { sender.send(Enveloper.envelop(createResponsePayload(LinkResponseResults.REFERENCE_ALREADY_LINKED)).withName(PUBLIC_PROGRESSION_LINK_CASES_RESPONSE).withMetadataFrom(envelope)); failed.set(true); @@ -133,8 +133,8 @@ public void handleMergeCasesValidations(final JsonEnvelope envelope) { } private JsonObject buildCasesMergedEventPayload(final JsonEnvelope envelope, final UUID leadCaseId, final List caseUrns) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder().add(LINK_ACTION_TYPE, LinkType.LINK.toString()); // type is LINK in the listing public event, even for merge - final JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder().add(LINK_ACTION_TYPE, LinkType.LINK.toString()); // type is LINK in the listing public event, even for merge + final JsonArrayBuilder arrayBuilder = JsonObjects.createArrayBuilder(); // for case reference; caseURN is used for spi cases, and prosecutionAuthorityReference is used for sjp cases final ProsecutionCaseIdentifier pci = jsonObjectToObjectConverter.convert(progressionService.getProsecutionCaseDetailById(envelope, leadCaseId.toString()).get().getJsonObject("prosecutionCase"), ProsecutionCase.class).getProsecutionCaseIdentifier(); final String leadCaseUrn = pci.getCaseURN() != null ? pci.getCaseURN() : pci.getProsecutionAuthorityReference(); @@ -151,7 +151,7 @@ private JsonObject buildCasesMergedEventPayload(final JsonEnvelope envelope, fin if (!previousMergeSearchResult.isEmpty() && previousMergeSearchResult.containsKey(MERGED_CASES)) { previousMergeSearchResult.getJsonArray(MERGED_CASES).forEach( pmc -> { - final JsonObject implicitMergedCase = Json.createObjectBuilder().add(IMPLICIT_MERGED_CASE, pmc).build(); + final JsonObject implicitMergedCase = JsonObjects.createObjectBuilder().add(IMPLICIT_MERGED_CASE, pmc).build(); buildCaseLinkedOrUnlinkedEventJson(arrayBuilder, UUID.fromString(mergeCaseId), mergeCaseUrn, implicitMergedCase.getJsonObject(IMPLICIT_MERGED_CASE).getString(CASE_ID), implicitMergedCase.getJsonObject(IMPLICIT_MERGED_CASE).getString(CASE_URN)); } diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessor.java index 693d0b3cf..26f1ef1d4 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessor.java @@ -1,12 +1,12 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessor.java index d61686479..d3f685023 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessor.java @@ -38,7 +38,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -151,7 +151,7 @@ private void generateAndAddDocument(final JsonEnvelope event, final UUID caseId, final String recipientType, final String notificationType) { final UUID materialId = randomUUID(); final String fileName = format("%s notification of hearing %s %s copy", notificationType, formatter.format(LocalDateTime.now()), recipientType); - final JsonObject emailDocumentJson = Json.createObjectBuilder(event.payloadAsJsonObject()) + final JsonObject emailDocumentJson = JsonObjects.createObjectBuilder(event.payloadAsJsonObject()) .add(RECIPIENT_TYPE, recipientType) .add(NOTIFICATION_TYPE, notificationType).build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessor.java index 16fcb3bc3..3be23b9df 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessor.java @@ -2,7 +2,7 @@ import static java.util.Optional.empty; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessor.java index ba6e4eff1..f976e73ca 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessor.java @@ -4,7 +4,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.moj.cpp.progression.Originator.assembleEnvelopeWithPayloadAndMetaDetails; @@ -51,7 +51,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -233,7 +233,7 @@ private JsonObject updateNowContentWithAccountDivisionCode(final JsonObject json } private static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; @@ -291,7 +291,7 @@ private void addAsCourtDocuments(final JsonEnvelope incomingEvent, final NowDocu final CourtDocument courtDocument = courtDocument(nowDocumentRequest, permittedGroups, documentTypeDataJsonObject); - final JsonObject jsonObject = Json.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); sender.send(envelop(jsonObject).withName(PROGRESSION_COMMAND_CREATE_COURT_DOCUMENT).withMetadataFrom(incomingEvent)); } diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessor.java index 16a0ed18d..f32e34c42 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessor.java @@ -7,7 +7,7 @@ import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; @@ -56,7 +56,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -182,7 +182,7 @@ public void processOnlinePleaMaterialUploadRequest(final JsonEnvelope event) thr final String fileName = fileMetaDataJsonObject.getJsonString(FILE_NAME).getString(); materialService.uploadMaterial(uploadedAsCaseMaterial.getFileId(), uploadedAsCaseMaterial.getMaterialId(), contextSystemUserId.orElse(null)); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(MATERIAL_ID, uploadedAsCaseMaterial.getMaterialId().toString()) .add(COURT_DOCUMENT, objectToJsonObjectConverter .convert(buildCourtDocument(uploadedAsCaseMaterial.getCaseId(), uploadedAsCaseMaterial.getMaterialId(), fileName, uploadedAsCaseMaterial.getDefendantId(), uploadedAsCaseMaterial.getPleaNotificationType()))).build(); @@ -244,7 +244,7 @@ private JsonObject getOnlinePleaDocGeneratorPayload(final JsonObject payload, fi } private JsonObject getIndividualFinanceDocGeneratorPayload(final JsonObject payload, final PleadOnline pleadOnline) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); builder.add(URN, pleadOnline.getUrn()) .add(CASE_ID, pleadOnline.getCaseId().toString()) .add(DEFENDANT_ID, pleadOnline.getDefendantId().toString()) @@ -294,7 +294,7 @@ private JsonObject getIndividualFinanceDocGeneratorPayload(final JsonObject payl } private JsonObject getCompanyFinanceDocGeneratorPayload(final JsonObject payload, final PleadOnline pleadOnline) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); builder.add(URN, pleadOnline.getUrn()) .add(CASE_ID, pleadOnline.getCaseId().toString()) .add(DEFENDANT_ID, pleadOnline.getDefendantId().toString()) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessor.java index 64bf7ff70..2dd41eeb9 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessor.java @@ -2,8 +2,8 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static org.slf4j.LoggerFactory.getLogger; @@ -39,7 +39,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -351,15 +351,15 @@ public void handleServePetSubmittedPublicEvent(final JsonEnvelope envelope) { final Optional petFormObject = referenceDataService.getPetForm(envelope, requester); final String formId = petFormObject.map(jsonObject -> jsonObject.getString(FORM_ID_SNAKE_CASE)).orElse(null); - final JsonArrayBuilder defendantIdArray = Json.createArrayBuilder(); + final JsonArrayBuilder defendantIdArray = JsonObjects.createArrayBuilder(); final List petDefendantList = payload.getJsonArray(PET_DEFENDANTS).getValuesAs(JsonObject.class); - petDefendantList.forEach(defendant -> defendantIdArray.add(Json.createObjectBuilder() + petDefendantList.forEach(defendant -> defendantIdArray.add(JsonObjects.createObjectBuilder() .add(DEFENDANT_ID, defendant.getString(DEFENDANT_ID)) .build() ) ); - final JsonObject createPetFormPayload = Json.createObjectBuilder().add(CASE_ID, payload.get(CASE_ID)) + final JsonObject createPetFormPayload = JsonObjects.createObjectBuilder().add(CASE_ID, payload.get(CASE_ID)) .add(SUBMISSION_ID, payload.getString(SUBMISSION_ID)) .add(PET_ID, String.valueOf(randomUUID())) .add(FORM_ID, formId) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessor.java index 3aad21546..67a266414 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessor.java @@ -49,7 +49,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterPdfPayloadGenerator.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterPdfPayloadGenerator.java index 29287c321..7933c04bf 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterPdfPayloadGenerator.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterPdfPayloadGenerator.java @@ -17,7 +17,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -45,8 +45,8 @@ public class PrisonCourtRegisterPdfPayloadGenerator { @SuppressWarnings({"squid:S1188", "squid:S1192"}) public JsonObject mapPayload(final JsonObject jsonObject) { - final JsonObjectBuilder payloadForPdf = Json.createObjectBuilder(); - final JsonArrayBuilder casesArray = Json.createArrayBuilder(); + final JsonObjectBuilder payloadForPdf = JsonObjects.createObjectBuilder(); + final JsonArrayBuilder casesArray = JsonObjects.createArrayBuilder(); ofNullable(jsonObject.getJsonObject("prisonCourtRegister")).ifPresent(prisonCourtRegisterRequest -> { payloadForPdf.add("registerDate", LocalDate.now().format(OUT_DATE_FORMATTER)); @@ -69,7 +69,7 @@ public JsonObject mapPayload(final JsonObject jsonObject) { .map(JsonObject.class::cast) .collect(toList()) .forEach(pcoa -> { - final JsonObjectBuilder caseJson = Json.createObjectBuilder(); + final JsonObjectBuilder caseJson = JsonObjects.createObjectBuilder(); buildNameAndAddress(defendant, caseJson); buildHearingDetails(defendant, caseJson); @@ -107,11 +107,11 @@ public JsonObject mapPayload(final JsonObject jsonObject) { } private void buildDefendantResults(final JsonObject defendant, final JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); ofNullable(defendant.getJsonArray("defendantResults")).ifPresent(results -> { final List resultList = results.stream().map(JsonObject.class::cast).collect(toList()); resultList.forEach(result -> { - final JsonObjectBuilder resultBuilder = Json.createObjectBuilder() + final JsonObjectBuilder resultBuilder = JsonObjects.createObjectBuilder() .add(RESULT_CODE, result.getString(CJS_RESULT_CODE, DASH)) .add(RESULT_TEXT, prepareResultText(result.getString(RESULT_TEXT, ""))); jsonArrayBuilder.add(resultBuilder.build()); @@ -125,10 +125,10 @@ private void buildDefendantResults(final JsonObject defendant, final JsonObjectB } private void buildCaseResults(final JsonObject pcoa, final JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); if(!isApplicationValid(pcoa)){ ofNullable(pcoa.getJsonArray(RESULTS)).ifPresent(results -> results.stream().map(JsonObject.class::cast).forEach(result -> { - final JsonObjectBuilder resultBuilder = Json.createObjectBuilder() + final JsonObjectBuilder resultBuilder = JsonObjects.createObjectBuilder() .add(RESULT_CODE, result.getString(CJS_RESULT_CODE, DASH)) .add(RESULT_TEXT, prepareResultText(result.getString(RESULT_TEXT, ""))); jsonArrayBuilder.add(resultBuilder.build()); @@ -244,7 +244,7 @@ private void buildDefenceCounsel(final JsonObject defendant, final JsonObjectBui } private void buildApplication(final JsonObject pcoaJson, final JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); if (isApplicationValid(pcoaJson) && nonNull(pcoaJson.getJsonArray(RESULTS))) { final List resultList = @@ -253,10 +253,10 @@ private void buildApplication(final JsonObject pcoaJson, final JsonObjectBuilder .mapToObj(i -> pcoaJson.getJsonArray(RESULTS).getJsonObject(i)) .map(result -> prepareResultText(result.getString(RESULT_TEXT, DASH))) .collect(Collectors.toList()); - final JsonArrayBuilder resultJsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder resultJsonArrayBuilder = JsonObjects.createArrayBuilder(); resultList.stream().forEach(resultJsonArrayBuilder::add); - final JsonObjectBuilder applicationBuilder = Json.createObjectBuilder() + final JsonObjectBuilder applicationBuilder = JsonObjects.createObjectBuilder() .add("type", pcoaJson.getString("applicationType", DASH)) .add("result", resultJsonArrayBuilder.build() ); @@ -284,10 +284,10 @@ private boolean isApplicationValid(final JsonObject pcoaJson) { private void buildOffences(final JsonObject pcoaJson, final JsonObjectBuilder caseJson) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); ofNullable(pcoaJson.getJsonArray("offences")).ifPresent(offences -> offences.stream().map(JsonObject.class::cast).filter(offenceJson -> nonNull(offenceJson.getJsonArray(RESULTS))).forEach(offenceJson -> { final String convictionDate = formatDate(offenceJson.getString(CONVICTION_DATE, DASH)); - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder() + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder() .add("offenceCode", offenceJson.getString("offenceCode", DASH)) .add("offenceTitle", clearUndesiredCharacters(offenceJson.getString("offenceTitle", DASH))) .add("wording", addNewLineIfDesired(clearUndesiredCharacters(offenceJson.getString("wording", DASH)))) @@ -308,11 +308,11 @@ private void buildOffences(final JsonObject pcoaJson, final JsonObjectBuilder ca } private void setResults(final JsonArray resultsArray, final JsonObjectBuilder offenceBuilder) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); ofNullable(resultsArray).ifPresent(results -> { final List resultList = results.stream().map(JsonObject.class::cast).collect(toList()); resultList.forEach(result -> { - final JsonObjectBuilder resultBuilder = Json.createObjectBuilder() + final JsonObjectBuilder resultBuilder = JsonObjects.createObjectBuilder() .add(RESULT_CODE, result.getString(CJS_RESULT_CODE, DASH)) .add(RESULT_TEXT, prepareResultText(result.getString(RESULT_TEXT, ""))); jsonArrayBuilder.add(resultBuilder.build()); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessor.java index 478f0c79a..245fc26a8 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessor.java @@ -4,7 +4,7 @@ import static java.util.Optional.empty; import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; @@ -53,7 +53,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -155,7 +155,7 @@ public void handleUpdateActiveApplicationsOnCase(final JsonEnvelope jsonEnvelope activeApplicationsOnCaseOptional.get().getJsonArray(LINKED_APPLICATIONS).forEach(linkedApplicationJson->{ final JsonObject linkedApplicationJsonObject = (JsonObject) linkedApplicationJson; final String applicationId = linkedApplicationJsonObject.getString(APPLICATION_ID); - final JsonObjectBuilder updateDefendantAddressOnApplicationBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder updateDefendantAddressOnApplicationBuilder = JsonObjects.createObjectBuilder(); if(nonNull(applicationId) && nonNull(linkedApplicationJsonObject.getJsonArray(HEARING_IDS))){ updateDefendantAddressOnApplicationBuilder .add(APPLICATION_ID, applicationId) @@ -176,7 +176,7 @@ private void handleUpdateDefendantCustodialInformationForApplication(JsonEnvelop if (prosecutionCaseJson.containsKey("linkedApplicationsSummary") && caseStatus.equalsIgnoreCase(CaseStatusEnum.ACTIVE.name())) { prosecutionCaseJson.getJsonArray("linkedApplicationsSummary").forEach(linkedApplicationSummaryJson -> { final JsonObject linkedApplicationJsonObject = (JsonObject) linkedApplicationSummaryJson; - final JsonObjectBuilder updateCustodialInformationForApplicationBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder updateCustodialInformationForApplicationBuilder = JsonObjects.createObjectBuilder(); final String subjectId = linkedApplicationJsonObject.getString("subjectId", null); if (nonNull(subjectId) && nonNull(defendant.getMasterDefendantId()) && subjectId.equalsIgnoreCase(defendant.getMasterDefendantId().toString())) { updateCustodialInformationForApplicationBuilder.add(APPLICATION_ID, linkedApplicationJsonObject.getString(APPLICATION_ID)); @@ -425,14 +425,14 @@ private Optional getProsecutorById(final UUID prosecutorId, final Js } private void updateMatchedDefendantCustodialInformation(final JsonEnvelope jsonEnvelope, final DefendantCustodialInformationUpdateRequested defendantCustodialInformationUpdateRequested, final JsonObject matchedCases) { - final JsonObjectBuilder updateMatchedDefendantCustodialInformationBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder updateMatchedDefendantCustodialInformationBuilder = JsonObjects.createObjectBuilder(); final String matchedCaseIdString = matchedCases.getString(CASE_ID); updateMatchedDefendantCustodialInformationBuilder.add(CASE_ID, matchedCaseIdString); updateMatchedDefendantCustodialInformationBuilder.add(MASTER_DEFENDANT_ID, matchedCases.getString(MATCHED_MASTER_DEFENDANT_ID)); if (nonNull(defendantCustodialInformationUpdateRequested.getCustodialEstablishment())) { updateMatchedDefendantCustodialInformationBuilder.add(CUSTODIAL_ESTABLISHMENT, objectToJsonObjectConverter.convert(defendantCustodialInformationUpdateRequested.getCustodialEstablishment())); } - final JsonArrayBuilder defendantsArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder defendantsArrayBuilder = JsonObjects.createArrayBuilder(); matchedCases.getJsonArray(DEFENDANTS).getValuesAs(JsonObject.class).stream() .filter(defendant -> defendantCustodialInformationUpdateRequested.getMasterDefendantId().toString().equalsIgnoreCase(defendant.getString(MASTER_DEFENDANT_ID))) .filter(defendant -> shouldAvoidSameCaseSameDefendantId(matchedCaseIdString, defendant.getString("id"), defendantCustodialInformationUpdateRequested)) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessor.java index 6c25a1f08..9c8471172 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessor.java @@ -16,7 +16,7 @@ import uk.gov.moj.cpp.progression.service.ProgressionService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -61,7 +61,7 @@ public void processCpsProsecutorUpdated(final JsonEnvelope event) { private JsonArray getHearingIdsForCase(final JsonEnvelope event) { final String prosecutionCaseId = event.payloadAsJsonObject().getString("prosecutionCaseId"); - final JsonArrayBuilder hearingIdsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder hearingIdsBuilder = JsonObjects.createArrayBuilder(); progressionService.getCaseHearings(prosecutionCaseId).ifPresent(caseHearingsResponse -> caseHearingsResponse.getJsonArray(HEARINGS) .getValuesAs(JsonObject.class).stream().map(hearing -> jsonObjectToObjectConverter.convert(hearing, Hearings.class)) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/RelatedReferenceEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/RelatedReferenceEventProcessor.java index 6b5fa2010..9c60e6191 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/RelatedReferenceEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/RelatedReferenceEventProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessor.java index 5400c9c93..723dfb271 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessor.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -71,7 +71,7 @@ public void handleSplitCasesValidations(final JsonEnvelope envelope) { if (alreadyLinkedCases.get().size() > 0 && alreadyLinkedCases.get().containsKey(SPLIT_CASES) && !alreadyLinkedCases.get().getJsonArray(SPLIT_CASES).isEmpty()) { alreadyLinkedCases.get().getJsonArray(SPLIT_CASES).stream().forEach( sc -> { - final JsonObject splitCase = Json.createObjectBuilder().add("splitCase", sc).build(); + final JsonObject splitCase = JsonObjects.createObjectBuilder().add("splitCase", sc).build(); if (splitCase.getJsonObject("splitCase").getString(CASE_URN).contains(e)) { invalidCaseUrns.add(e); failed.set(true); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessor.java index 7b03a7685..d81f3bf79 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessor.java @@ -10,7 +10,7 @@ import uk.gov.justice.services.messaging.JsonObjects; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import java.util.Map; import java.util.Optional; @@ -85,7 +85,7 @@ private void processErrorAckResponse(JsonEnvelope event, JsonObject enforcementR } private Map getMaterialIdsForRequestId(final String requestId, final JsonEnvelope event) { - final JsonObject payload = Json.createObjectBuilder().add("requestId", requestId).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("requestId", requestId).build(); final JsonObject requestMaterialIdPayload = requester.request(envelop(payload) .withName("progression.query.now-document-requests-by-request-id") .withMetadataFrom(event)).payloadAsJsonObject(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessor.java index 0f627bf3b..cddfe021c 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessor.java @@ -3,7 +3,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; @@ -45,7 +45,7 @@ import uk.gov.moj.cpp.progression.service.MaterialService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -149,7 +149,7 @@ public void handleDocumentAvailable(final JsonEnvelope documentAvailableEvent) t final FileReference payloadFileReference = fileService.retrieve(payloadFileId).orElseThrow(() -> new BadRequestException("Failed to retrieve file")); LOGGER.info("Retrieved file reference '{}' successfully", payloadFileReference); - try (JsonReader reader = Json.createReader(payloadFileReference.getContentStream())) { + try (JsonReader reader = JsonObjects.createReader(payloadFileReference.getContentStream())) { final JsonObject rawPayload = reader.readObject(); LOGGER.info("Read payload '{}'", rawPayload); this.sender.send(envelopeFrom(metadataFrom(documentAvailableEvent.metadata()).withName("progression.command.handle-online-plea-document-creation").build(), diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UnlinkCasesEventProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UnlinkCasesEventProcessor.java index f92fd9d06..d1da6d1c5 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UnlinkCasesEventProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UnlinkCasesEventProcessor.java @@ -15,7 +15,7 @@ import uk.gov.moj.cpp.progression.events.CasesUnlinked; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -51,9 +51,9 @@ public void casesUnlinked(final JsonEnvelope event) { private JsonObject buildCaseUnlinkedEventPayload(final CasesUnlinked casesUnlinked) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payloadBuilder.add(LINK_ACTION_TYPE, UNLINK); - final JsonArrayBuilder casesArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder casesArrayBuilder = JsonObjects.createArrayBuilder(); casesUnlinked.getUnlinkedCases().forEach( unlinkedCases -> diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UpdateDefendantsWithMatchedRequestedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UpdateDefendantsWithMatchedRequestedProcessor.java index 460164820..4bec0d53d 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UpdateDefendantsWithMatchedRequestedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/UpdateDefendantsWithMatchedRequestedProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.core.courts.Defendant; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessor.java index 9de8ea29e..e72060a04 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessor.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.moj.cpp.progression.transformer.HearingHelper.transformedHearing; import static uk.gov.moj.cpp.progression.transformer.SchemaVariableConstants.COURT_APPLICATIONS; @@ -32,7 +32,7 @@ import java.util.Map; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -131,14 +131,14 @@ private JsonObject extractPoliceCases(final JsonObject hearingParent) { final JsonObject hearingObj = ((JsonObject) hearingParent.get(HEARING)); LOGGER.info("Starting extractPoliceCases prosecution cases from hearingParent {}", hearingParent); final JsonArray prosecutionCases = (JsonArray) hearingObj.get(PROSECUTION_CASES); - final JsonArrayBuilder policeCaseProsecutionCasesBuilder = Json.createArrayBuilder(); - final JsonArrayBuilder policeCasesBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder policeCaseProsecutionCasesBuilder = JsonObjects.createArrayBuilder(); + final JsonArrayBuilder policeCasesBuilder = JsonObjects.createArrayBuilder(); final JsonArray courtApplications = (JsonArray) hearingObj.get(COURT_APPLICATIONS); - final JsonArrayBuilder courtApplicationsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder courtApplicationsBuilder = JsonObjects.createArrayBuilder(); if (null != prosecutionCases && !prosecutionCases.isEmpty()) { extractPoliceProsecutionCases(prosecutionCases, policeCaseProsecutionCasesBuilder); } - JsonObject hearingObj1 = Json.createObjectBuilder().build(); + JsonObject hearingObj1 = JsonObjects.createObjectBuilder().build(); final JsonArray policeCaseProsecutionCases1 = policeCaseProsecutionCasesBuilder.build(); if (null != policeCaseProsecutionCases1 && !policeCaseProsecutionCases1.isEmpty()) { hearingObj1 = removeProperty(hearingObj, PROSECUTION_CASES); @@ -193,17 +193,17 @@ private void extractedPoliceCaseLogics(final JsonArrayBuilder policeCases, private JsonObject iterateCourtApplications(final JsonArray courtApplications, final JsonArrayBuilder policeCourtApplications, JsonObject hearingObj1, final JsonObject item) { for (int ic = 0; ic < courtApplications.size(); ic++) { final JsonObject itemCourt = courtApplications.getJsonObject(ic); - JsonObject newItem = Json.createObjectBuilder().build(); + JsonObject newItem = JsonObjects.createObjectBuilder().build(); final JsonArray courtApplicationCases = (JsonArray) itemCourt.get(COURT_APPLICATION_CASES); - final JsonArrayBuilder policeCourtApplicationCases = Json.createArrayBuilder(); + final JsonArrayBuilder policeCourtApplicationCases = JsonObjects.createArrayBuilder(); if (null != courtApplicationCases && !courtApplicationCases.isEmpty()) { iterateCourtApplicationCasesForOffences(item, courtApplicationCases, policeCourtApplicationCases); } final JsonObject courtOrder = itemCourt.getJsonObject(COURT_ORDER); - JsonObject newCourtOrder = Json.createObjectBuilder().build(); + JsonObject newCourtOrder = JsonObjects.createObjectBuilder().build(); if (null != courtOrder) { final JsonArray courtOrderOffences = (JsonArray) courtOrder.get(COURT_ORDER_OFFENCES); - final JsonArrayBuilder laaCourtOrderOffences = Json.createArrayBuilder(); + final JsonArrayBuilder laaCourtOrderOffences = JsonObjects.createArrayBuilder(); if (null != courtOrderOffences && !courtOrderOffences.isEmpty()) { iterateCourtOrderOffencesForOffences(item, courtOrderOffences, laaCourtOrderOffences); newCourtOrder = removeProperty(courtOrder, COURT_ORDER_OFFENCES); @@ -332,7 +332,7 @@ public static JsonObject addProperty(final JsonObject origin, final String key, } private static JsonObjectBuilder getJsonObjectBuilder() { - return Json.createObjectBuilder(); + return JsonObjects.createObjectBuilder(); } } \ No newline at end of file diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessor.java index 65def46e5..3edef560f 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessor.java @@ -3,7 +3,7 @@ import static java.util.Objects.nonNull; import static java.util.Optional.empty; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentRemovedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentRemovedProcessor.java index 4c444c693..ed56a5303 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentRemovedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentRemovedProcessor.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor.document; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import uk.gov.justice.core.courts.CourtsDocumentRemoved; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessor.java index 32e9568fd..0f32149b2 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessor.java @@ -19,7 +19,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -64,7 +64,7 @@ private Map getCaseValuesMap(final ProsecutionCase prosecutionCa private JsonObject enrich(final JsonObject source, final Map keyValuePair) { if(MapUtils.isNotEmpty(keyValuePair)) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); source.entrySet(). forEach(e -> builder.add(e.getKey(), e.getValue())); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUploadedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUploadedProcessor.java index a9737506d..fc9fcfcf4 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUploadedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUploadedProcessor.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -44,7 +44,7 @@ public void handleCourtDocumentUploadEvent(final JsonEnvelope envelope) { final UUID materialId = courtsDocumentUploaded.getMaterialId(); LOGGER.info("Received progression.event.court-document-uploaded , material id {} file service id {}", materialId,fileServiceId); materialService.uploadMaterial(fileServiceId, materialId, envelope); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialId", materialId.toString()) .build(); sender.send(enveloper.withMetadataFrom(envelope, PUBLIC_COURT_DOCUMENT_UPLOADED).apply(payload)); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessor.java index 1882fb2cc..f07f9007b 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessor.java @@ -27,7 +27,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -72,7 +72,7 @@ public void handleDefendantBailDocumentCreatedEvent(final JsonEnvelope envelope) final Optional materialMetadata = materialService.getMaterialMetadata(envelope, defendantBailDocumentCreated.getMaterialId()); materialMetadata.ifPresent(data -> { - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("materialId", defendantBailDocumentCreated.getMaterialId().toString()) .add("courtDocument", objectToJsonObjectConverter .convert(buildCourtDocumentWithMaterialUserGroups(defendantBailDocumentCreated, data, bailDocumentTypeId))).build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/CaseDefendantSummonsService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/CaseDefendantSummonsService.java index 2ea5f2301..32936bb8e 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/CaseDefendantSummonsService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/CaseDefendantSummonsService.java @@ -3,7 +3,7 @@ import static com.google.common.collect.Lists.newArrayList; import static java.util.Objects.nonNull; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.defaultIfBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsPayloadUtil.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsPayloadUtil.java index af59d63c6..f8e8e1273 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsPayloadUtil.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsPayloadUtil.java @@ -3,7 +3,7 @@ import static java.lang.String.format; import static java.time.format.DateTimeFormatter.ofPattern; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsService.java index b1ccb9af1..20ec5d6d8 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/summons/SummonsService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor.summons; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.isNotBlank; import static org.apache.commons.lang3.StringUtils.isBlank; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/CorrespondenceService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/CorrespondenceService.java index 7dfdf2e56..f1fe06e9a 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/CorrespondenceService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/CorrespondenceService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.moj.cpp.progression.service.MetadataUtil.metadataWithNewActionName; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DefenceService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DefenceService.java index 8d459f674..a15be7416 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DefenceService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DefenceService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.moj.cpp.progression.service.MetadataUtil.metadataWithNewActionName; @@ -19,7 +19,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class DefenceService { @@ -42,7 +42,7 @@ public class DefenceService { public CaseDefendantsOrganisations getDefendantsAndAssociatedOrganisationsForCase(final JsonEnvelope envelope, final String caseId){ final Metadata metadata = metadataWithNewActionName(envelope.metadata(), CASE_DEFENDANTS_ORGANISATIONS); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add(CASE_ID, caseId) .build(); return requester.requestAsAdmin(envelopeFrom(metadata, jsonPayLoad), CaseDefendantsOrganisations.class).payload(); @@ -51,7 +51,7 @@ public CaseDefendantsOrganisations getDefendantsAndAssociatedOrganisationsForCas public JsonObject getRoleInCaseByCaseId(final JsonEnvelope envelope, final String caseId){ final Metadata metadata = metadataWithNewActionName(envelope.metadata(), ROLE_IN_CASE_BY_CASEID); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add(CASE_ID, caseId) .build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorService.java index 8fe5ffa7c..6b0e80deb 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorService.java @@ -6,7 +6,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.transaction.Transactional.TxType.REQUIRES_NEW; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.moj.cpp.progression.service.DocumentTemplateType.getDocumentTemplateNameByType; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/FileService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/FileService.java index 1a1b68db0..a53efc826 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/FileService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/FileService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.fileservice.api.FileServiceException; import uk.gov.justice.services.fileservice.api.FileStorer; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/HearingService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/HearingService.java index eff9cd660..68f2dd9bf 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/HearingService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/HearingService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ListingService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ListingService.java index 761023b07..455f2b4ef 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ListingService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ListingService.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -86,7 +86,6 @@ public void listNextCourtHearings(final JsonEnvelope jsonEnvelope, final ListNex } public void listNextCourtHearings(final JsonEnvelope jsonEnvelope, final ListNextHearingsV3 listNextHearings) { - final JsonObject nextHearingsJson = objectToJsonObjectConverter.convert(listNextHearings); if (LOGGER.isDebugEnabled()) { LOGGER.debug("Posting next hearings to listing for hearing V3 '{}' ", listNextHearings.getHearingId()); @@ -110,7 +109,7 @@ public void listUnscheduledNextHearings(final JsonEnvelope jsonEnvelope, final L public List getShadowListedOffenceIds(final JsonEnvelope jsonEnvelope, final UUID hearingId) { final Set shadowListedOffenceIds = new HashSet<>(); final Metadata metadata = metadataWithNewActionName(jsonEnvelope.metadata(), LISTING_SEARCH_HEARING); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add("id", hearingId.toString()) .build(); final Hearing hearingListed = requester.requestAsAdmin(envelopeFrom(metadata, jsonPayLoad), Hearing.class).payload(); @@ -141,7 +140,7 @@ public List getShadowListedOffenceIds(final JsonEnvelope jsonEnvelope, fin public List getFutureHearings(final JsonEnvelope jsonEnvelope, final String caseUrn) { final Metadata metadata = metadataWithNewActionName(jsonEnvelope.metadata(), LISTING_ANY_ALLOCATION_SEARCH_HEARINGS); final LocalDate startDate = utcClock.now().toLocalDate(); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add("caseUrn", caseUrn) .add("startDate", startDate.toString()) .build(); @@ -176,7 +175,7 @@ public Optional getCommittingCourt(final JsonEnvelope jsonEnvel private Hearing searchHearing(final JsonEnvelope jsonEnvelope, final UUID hearingId) { final Metadata metadata = metadataWithNewActionName(jsonEnvelope.metadata(), LISTING_SEARCH_HEARING); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add("id", hearingId.toString()) .build(); return requester.requestAsAdmin(envelopeFrom(metadata, jsonPayLoad), Hearing.class).payload(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/MaterialService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/MaterialService.java index 136a9e135..808e6036c 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/MaterialService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/MaterialService.java @@ -4,7 +4,7 @@ import static java.util.Objects.isNull; import static java.util.UUID.fromString; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.awaitility.Awaitility.with; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -71,7 +71,7 @@ public void uploadMaterial(final UUID fileServiceId, final UUID materialId, fina throw new RuntimeException("UserId missing from event."); } LOGGER.info("material being uploaded '{}' file service id '{}'", materialId, fileServiceId); - final JsonObject uploadMaterialPayload = Json.createObjectBuilder() + final JsonObject uploadMaterialPayload = JsonObjects.createObjectBuilder() .add(FIELD_MATERIAL_ID, materialId.toString()) .add("fileServiceId", fileServiceId.toString()) .build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationNotifyService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationNotifyService.java index 475739516..ef28894b5 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationNotifyService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationNotifyService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationService.java index 87a9e6b95..f489f3bc2 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/NotificationService.java @@ -6,8 +6,8 @@ import static java.util.Optional.of; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.core.courts.AddMaterialV2.addMaterialV2; import static uk.gov.justice.core.courts.DefendantSubject.defendantSubject; @@ -78,7 +78,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -688,7 +688,7 @@ private void sendNotification(final JsonEnvelope event, final UUID notificationI emailAddressOptional.ifPresent(email -> { final CourtDocument courtDocument = postalService.courtDocument(postalNotificationDetails.getCourtApplication().getId(), materialId, event, null); - final JsonObject courtDocumentPayload = Json.createObjectBuilder() + final JsonObject courtDocumentPayload = JsonObjects.createObjectBuilder() .add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)) .add("courtDocumentMetadata", courtDocumentMetadata != null @@ -798,7 +798,7 @@ private void sendEmailNotification(final JsonEnvelope event, postalNotificationDetails.getCourtApplication().getId(), materialId, event, null ); - final JsonObject courtDocumentPayload = Json.createObjectBuilder() + final JsonObject courtDocumentPayload = JsonObjects.createObjectBuilder() .add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)) .build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/OpaNoticeService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/OpaNoticeService.java index e9c313aa1..26b64e97f 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/OpaNoticeService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/OpaNoticeService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.jobstore.api.task.ExecutionStatus.STARTED; import static uk.gov.moj.cpp.progression.task.Task.GENERATE_OPA_NOTICE; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/PostalService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/PostalService.java index d1778cfdd..d9b21a86e 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/PostalService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/PostalService.java @@ -47,7 +47,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -122,7 +122,7 @@ public PostalNotification getPostalNotificationForCourtApplicationParty(final Js final Optional orderingCourtOptional = ofNullable(courtCentre); - JsonObject localJusticeArea = Json.createObjectBuilder().build(); + JsonObject localJusticeArea = JsonObjects.createObjectBuilder().build(); localJusticeArea = getLja(envelope, courtCentre, orderingCourtOptional, localJusticeArea); @@ -170,7 +170,7 @@ public PostalNotification getPostalNotificationForProsecutor(final JsonEnvelope final CourtCentre courtCentre = postalNotificationDetails.getCourtCentre(); final Optional orderingCourtOptional = ofNullable(courtCentre); - JsonObject localJusticeArea = Json.createObjectBuilder().build(); + JsonObject localJusticeArea = JsonObjects.createObjectBuilder().build(); localJusticeArea = getLja(envelope, courtCentre, orderingCourtOptional, localJusticeArea); @@ -254,7 +254,7 @@ public void sendPostalNotification(final JsonEnvelope envelope, final UUID appli final CourtDocument courtDocument = courtDocument(applicationId, materialId, envelope, linkedCaseId); - final JsonObject courtDocumentPayload = Json.createObjectBuilder() + final JsonObject courtDocumentPayload = JsonObjects.createObjectBuilder() .add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)) .add("courtDocumentMetadata", courtDocumentMetadata != null @@ -272,7 +272,7 @@ public void sendPostalNotificationAaag(final JsonEnvelope envelope, final UUID a final CourtDocument courtDocument = courtDocument(applicationId, materialId, envelope, linkedCaseId); - final JsonObject courtDocumentPayload = Json.createObjectBuilder() + final JsonObject courtDocumentPayload = JsonObjects.createObjectBuilder() .add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)) .add("courtDocumentMetadata", courtDocumentMetadata != null diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java index 39a5c1128..4ae921b49 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/ProgressionService.java @@ -11,8 +11,8 @@ import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.core.courts.ApplicationStatus.FINALISED; @@ -127,7 +127,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -443,7 +443,7 @@ private Offence populateOffenceBasedOnPleaGuiltyType(final Offence offence, fina } public void updateListingNumber(final JsonEnvelope jsonEnvelope, final ProsecutionCase prosecutionCase) { - final JsonArrayBuilder offenceListingNumbersBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder offenceListingNumbersBuilder = JsonObjects.createArrayBuilder(); prosecutionCase.getDefendants().stream() .flatMap(defendant -> defendant.getOffences().stream()) .forEach(offence -> offenceListingNumbersBuilder.add(createObjectBuilder() @@ -459,7 +459,7 @@ public void updateListingNumber(final JsonEnvelope jsonEnvelope, final Prosecuti } public void increaseListingNumber(final JsonEnvelope jsonEnvelope, final ProsecutionCase prosecutionCase, final UUID hearingId) { - final JsonArrayBuilder offenceListingNumbersBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder offenceListingNumbersBuilder = JsonObjects.createArrayBuilder(); prosecutionCase.getDefendants().stream() .flatMap(defendant -> defendant.getOffences().stream()) .forEach(offence -> offenceListingNumbersBuilder.add(offence.getId().toString())); @@ -528,7 +528,7 @@ public static ZonedDateTime getEarliestDate(final List hearingDays) public void createCourtDocument(final JsonEnvelope jsonEnvelope, final List courtDocuments) { courtDocuments.forEach(courtDocument -> { - final JsonObject jsonObject = Json.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); LOGGER.info("court document is being created '{}' ", courtDocument.getCourtDocumentId()); sender.send(enveloper.withMetadataFrom(jsonEnvelope, PROGRESSION_COMMAND_CREATE_COURT_DOCUMENT).apply(jsonObject)); }); @@ -536,7 +536,7 @@ public void createCourtDocument(final JsonEnvelope jsonEnvelope, final List prosecutionCases) { prosecutionCases.forEach(prosecutionCase -> { - final JsonObject jsonObject = Json.createObjectBuilder().add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCase)).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCase)).build(); LOGGER.info("prosecution case is being created '{}' ", prosecutionCase.getId()); sender.send(enveloper.withMetadataFrom(jsonEnvelope, PROGRESSION_COMMAND_CREATE_PROSECUTION_CASE).apply(jsonObject)); relayCaseToCourtStore(prosecutionCase); @@ -546,7 +546,7 @@ public void createProsecutionCases(final JsonEnvelope jsonEnvelope, final List

deltaProsecutionCases) { @@ -834,7 +834,7 @@ public Country getCountryByPostcode(final String postCode, final JsonEnvelope en public Optional getActiveApplicationsOnCase(final JsonEnvelope envelope, final String caseId){ Optional result = Optional.empty(); - final JsonObject payload = Json.createObjectBuilder().add(PROSECUTION_CASE_ID, caseId).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(PROSECUTION_CASE_ID, caseId).build(); final JsonEnvelope activeLinkedApplications = requester.request(enveloper.withMetadataFrom(envelope, PROGRESSION_QUERY_ACTIVE_APPLICATIONS_ON_CASE).apply(payload)); if (!activeLinkedApplications.payloadAsJsonObject().isEmpty()) { result = Optional.of(activeLinkedApplications.payloadAsJsonObject()); @@ -924,7 +924,7 @@ public JsonObject getProsecutionCaseById(final JsonEnvelope envelope, final Stri } public Optional getCaseHearings(final String caseId) { - final JsonObject payload = Json.createObjectBuilder().add(CASE_ID, caseId).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(CASE_ID, caseId).build(); final UUID systemUser = nonNull(serviceContextSystemUserProvider.getContextSystemUserId()) && serviceContextSystemUserProvider.getContextSystemUserId().isPresent() ? serviceContextSystemUserProvider.getContextSystemUserId().get() : null; final MetadataBuilder metadataBuilder = metadataBuilder().withId(randomUUID()) @@ -953,7 +953,7 @@ public Optional searchLinkedCases(final JsonEnvelope envelope, final } public void updateHearingListingStatusToHearingInitiated(final JsonEnvelope jsonEnvelope, final Initiate hearingInitiate) { - final JsonObject hearingListingStatusCommand = Json.createObjectBuilder() + final JsonObject hearingListingStatusCommand = JsonObjects.createObjectBuilder() .add(HEARING_LISTING_STATUS, HEARING_INITIALISED) .add(HEARING, objectToJsonObjectConverter.convert(hearingInitiate.getHearing())) .build(); @@ -981,7 +981,7 @@ private void updateHearingListingStatusToSentForListing(final JsonEnvelope jsonE // case hearing (SENT_FOR_LISTING) and not down the application-hearing branch below. final Hearing hearing = shapeExistingHearingForListing(rawHearing, jsonEnvelope); if (isNotEmpty(hearing.getProsecutionCases())) { - final JsonObjectBuilder hearingListingStatusCommandBuilder = Json.createObjectBuilder() + final JsonObjectBuilder hearingListingStatusCommandBuilder = JsonObjects.createObjectBuilder() .add(HEARING_LISTING_STATUS, SENT_FOR_LISTING) .add(HEARING, objectToJsonObjectConverter.convert(hearing)); if (isNotEmpty(listHearingRequests)) { @@ -993,7 +993,7 @@ private void updateHearingListingStatusToSentForListing(final JsonEnvelope jsonE sender.send(enveloper.withMetadataFrom(jsonEnvelope, PROGRESSION_UPDATE_DEFENDANT_LISTING_STATUS_COMMAND).apply(hearingListingStatusCommand)); } else { - final JsonObjectBuilder hearingCreatedForApplicationCommandBuilder = Json.createObjectBuilder() + final JsonObjectBuilder hearingCreatedForApplicationCommandBuilder = JsonObjects.createObjectBuilder() .add(HEARING_LISTING_STATUS, SENT_FOR_LISTING) .add(HEARING, objectToJsonObjectConverter.convert(hearing)); @@ -1045,7 +1045,7 @@ public void updateHearingListingStatusToSentForListing(final JsonEnvelope jsonEn final Hearing hearing = transformHearingListingNeeds(hearingListingNeeds, seedingHearing, false, null); if (isNotEmpty(hearing.getProsecutionCases())) { - final JsonObjectBuilder hearingListingStatusCommandBuilder = Json.createObjectBuilder() + final JsonObjectBuilder hearingListingStatusCommandBuilder = JsonObjects.createObjectBuilder() .add(HEARING_LISTING_STATUS, SENT_FOR_LISTING) .add(HEARING, objectToJsonObjectConverter.convert(hearing)); @@ -1068,7 +1068,7 @@ public void updateHearingListingStatusToSentForListing(final JsonEnvelope jsonEn sender.send(JsonEnvelope.envelopeFrom(JsonEnvelope.metadataFrom(jsonEnvelope.metadata()).withName(PROGRESSION_UPDATE_DEFENDANT_LISTING_STATUS_COMMAND_V3), hearingListingStatusCommand)); } else { - final JsonObjectBuilder hearingCreatedForApplicationCommandBuilder = Json.createObjectBuilder() + final JsonObjectBuilder hearingCreatedForApplicationCommandBuilder = JsonObjects.createObjectBuilder() .add(HEARING_LISTING_STATUS, SENT_FOR_LISTING) .add(HEARING, objectToJsonObjectConverter.convert(hearing)); @@ -1109,7 +1109,7 @@ public void updateHearingListingStatusToSentForListing(final JsonEnvelope jsonEn } public void listUnscheduledHearings(final JsonEnvelope jsonEnvelope, final Hearing hearing) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(HEARING, objectToJsonObjectConverter.convert(hearing)) .build(); @@ -1118,7 +1118,7 @@ public void listUnscheduledHearings(final JsonEnvelope jsonEnvelope, final Heari public void sendUpdateDefendantListingStatusForUnscheduledListing(final JsonEnvelope jsonEnvelope, final List unscheduledHearings, final Set hearingsToBeSentNotification) { unscheduledHearings.forEach(unscheduledHearing -> { - final JsonObject hearingListingStatusCommand = Json.createObjectBuilder() + final JsonObject hearingListingStatusCommand = JsonObjects.createObjectBuilder() .add(UNSCHEDULED, true) .add(NOTIFY_NCES, hearingsToBeSentNotification.contains(unscheduledHearing.getId())) .add(HEARING_LISTING_STATUS, SENT_FOR_LISTING) @@ -1141,7 +1141,7 @@ public void recordUnlistedHearing(final JsonEnvelope jsonEnvelope, final UUID or newHearingIds.stream().forEach(s -> newHearingIdArrays.add(s.getId().toString())); - final JsonObject hearingListingStatusCommand = Json.createObjectBuilder() + final JsonObject hearingListingStatusCommand = JsonObjects.createObjectBuilder() .add(HEARING_ID, originalHearingId.toString()) .add(UNSCHEDULED_HEARING_IDS, newHearingIdArrays.build()) .build(); @@ -1149,7 +1149,7 @@ public void recordUnlistedHearing(final JsonEnvelope jsonEnvelope, final UUID or } public void updateHearingListingStatusToHearingUpdate(final JsonEnvelope jsonEnvelope, final Hearing hearing) { - final JsonObject hearingListingStatusCommand = Json.createObjectBuilder() + final JsonObject hearingListingStatusCommand = JsonObjects.createObjectBuilder() .add(HEARING_LISTING_STATUS, "HEARING_INITIALISED") .add(HEARING, objectToJsonObjectConverter.convert(hearing)) .build(); @@ -1158,7 +1158,7 @@ public void updateHearingListingStatusToHearingUpdate(final JsonEnvelope jsonEnv } public void publishHearingDetailChangedPublicEvent(final JsonEnvelope jsonEnvelope, final ConfirmedHearing confirmedHearing) { - final JsonObject hearingDetailChangedPayload = Json.createObjectBuilder() + final JsonObject hearingDetailChangedPayload = JsonObjects.createObjectBuilder() .add(HEARING, objectToJsonObjectConverter.convert(transformUpdatedHearing(confirmedHearing, jsonEnvelope))) .build(); LOGGER.info("publish public hearing details changed event with payload {}", hearingDetailChangedPayload); @@ -1268,7 +1268,7 @@ public void updateCourtApplicationStatus(final JsonEnvelope jsonEnvelope, final } public void updateCourtApplicationStatus(final JsonEnvelope jsonEnvelope, final UUID applicationId, final ApplicationStatus status) { - final JsonObject updateApplicationStatus = Json.createObjectBuilder() + final JsonObject updateApplicationStatus = JsonObjects.createObjectBuilder() .add("id", applicationId.toString()) .add("applicationStatus", status.toString()) .build(); @@ -1943,7 +1943,7 @@ public void storeBookingReferencesWithCourtScheduleIds(final JsonEnvelope jsonEn } public void populateHearingToProbationCaseworker(final JsonEnvelope jsonEnvelope, final UUID hearingId) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .build(); @@ -1953,7 +1953,7 @@ public void populateHearingToProbationCaseworker(final JsonEnvelope jsonEnvelope } public void populateHearingToProbationCaseworker(final Metadata metadata, final UUID hearingId) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .build(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SjpService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SjpService.java index 05b5b6f03..7f1f99b48 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SjpService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SjpService.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class SjpService { @@ -28,7 +28,7 @@ public class SjpService { public ProsecutionCase getProsecutionCase(final JsonEnvelope envelope, final UUID caseId){ final Metadata metadata = metadataWithNewActionName(envelope.metadata(), GET_SJP_PROSECUTION_CASE); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()) .build(); return requester.requestAsAdmin(envelopeFrom(metadata, jsonPayLoad), ProsecutionCase.class).payload(); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecLetterService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecLetterService.java index f961d97fe..b56573473 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecLetterService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecLetterService.java @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.core.courts.JurisdictionType.MAGISTRATES; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.moj.cpp.progression.processor.summons.SummonsPayloadUtil.getCourtTime; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecNotificationService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecNotificationService.java index 4cedc2e38..49ed99fdd 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecNotificationService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/StatDecNotificationService.java @@ -42,7 +42,7 @@ import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorService.java index 34a22bc98..d34e53dfc 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.MapUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; @@ -12,7 +12,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.Map; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -44,7 +44,7 @@ public void generateDocument(final DocumentGenerationRequest request, final Json .add("payloadFileServiceId", request.getPayloadFileServiceId().toString()); if (isNotEmpty(request.getAdditionalInformation())) { - JsonArrayBuilder infoArrayBuilder = Json.createArrayBuilder(); + JsonArrayBuilder infoArrayBuilder = JsonObjects.createArrayBuilder(); final Map additionalInfo = request.getAdditionalInformation(); additionalInfo.forEach((k, v) -> infoArrayBuilder.add(createObjectBuilder() diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UpdateDefendantService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UpdateDefendantService.java index 6d584dde7..79a29f7cc 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UpdateDefendantService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UpdateDefendantService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.core.courts.PersonDefendant.personDefendant; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UsersGroupService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UsersGroupService.java index 49e391c11..66a6b13d3 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UsersGroupService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/UsersGroupService.java @@ -4,7 +4,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; @@ -30,7 +30,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -54,7 +54,7 @@ public class UsersGroupService { public Optional getDefenceOrganisationDetails(final UUID organisationId, final Metadata metadata) { log.info("Getting defence organisation details for organisation id {} " + organisationId.toString()); - final JsonObject getOrganisationForUserRequest = Json.createObjectBuilder().add(ORGANISATION_ID, organisationId.toString()).build(); + final JsonObject getOrganisationForUserRequest = JsonObjects.createObjectBuilder().add(ORGANISATION_ID, organisationId.toString()).build(); final Metadata metadataWithActionName = metadataWithNewActionName(metadata, "usersgroups.get-organisation-details"); final JsonEnvelope requestEnvelope = envelopeFrom(metadataWithActionName, getOrganisationForUserRequest); final JsonEnvelope response = requester.requestAsAdmin(requestEnvelope); @@ -75,7 +75,7 @@ public Optional getDefenceOrganisationDetails(final UUID } public String getGroupIdForDefenceLawyers() { - final JsonObject getOrganisationForUserRequest = Json.createObjectBuilder().add(GROUP_NAME, "Defence Lawyers").build(); + final JsonObject getOrganisationForUserRequest = JsonObjects.createObjectBuilder().add(GROUP_NAME, "Defence Lawyers").build(); final Metadata metadata = metadataBuilder().withName("usersgroups.get-group-details-byname") .withClientCorrelationId(randomUUID().toString()) .withId(randomUUID()) @@ -120,7 +120,7 @@ public List getUserGroupsForUser(final JsonEnvelope envelope) } public JsonObject getGroupsWithOrganisation(final JsonEnvelope event) { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final Envelope response = requester.requestAsAdmin(envelop(payload) .withName("usersgroups.get-groups-with-organisation") diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/BaseDataAggregator.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/BaseDataAggregator.java index 1ebb0f0c1..260969c03 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/BaseDataAggregator.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/BaseDataAggregator.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service.disqualificationreferral; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isBlank; import uk.gov.justice.core.courts.CourtCentre; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningDataAggregator.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningDataAggregator.java index f8cf5ff95..e30b0dbee 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningDataAggregator.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningDataAggregator.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service.disqualificationreferral; 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.core.courts.Address; import uk.gov.justice.core.courts.CourtCentre; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningGenerationService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningGenerationService.java index bbb0f405f..78bd24f44 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningGenerationService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/disqualificationreferral/ReferralDisqualifyWarningGenerationService.java @@ -46,7 +46,7 @@ import java.util.stream.IntStream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -126,7 +126,7 @@ public void generateReferralDisqualifyWarning(final JsonEnvelope event, final St private void generateCourtDocument(final JsonEnvelope event, final UUID caseId, final ReferredDefendant defendant, final String filename, final UUID materialId) { final CourtDocument courtDocument = courtDocument(event, asList(defendant.getId()), materialId, caseId, filename); - final JsonObject courtDocumentPayload = Json.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); + final JsonObject courtDocumentPayload = JsonObjects.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); LOGGER.info("creating ReferralDisqualifyWarning court document payload - {}", courtDocumentPayload); sender.send(envelop(courtDocumentPayload).withName(PROGRESSION_COMMAND_CREATE_COURT_DOCUMENT).withMetadataFrom(event)); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationService.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationService.java index a4281c3bb..8fcfe4a87 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationService.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationService.java @@ -34,7 +34,7 @@ import java.util.stream.IntStream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -98,7 +98,7 @@ public void generateHearingLogEvent(final JsonEnvelope event, final UUID caseId, private void generateCourtDocument(final JsonEnvelope event, final UUID caseId, final String filename, final UUID materialId, final Optional applicationId) { final CourtDocument courtDocument = courtDocument(event, materialId, caseId, filename, applicationId); - final JsonObject courtDocumentPayload = Json.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); + final JsonObject courtDocumentPayload = JsonObjects.createObjectBuilder().add("courtDocument", objectToJsonObjectConverter.convert(courtDocument)).build(); LOGGER.info("creating hearing event log court document payload - {}", courtDocumentPayload); sender.send(envelop(courtDocumentPayload).withName(PROGRESSION_COMMAND_CREATE_COURT_DOCUMENT).withMetadataFrom(event)); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ApplicationHelper.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ApplicationHelper.java index 106111272..9dc189b94 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ApplicationHelper.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ApplicationHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.transformer; -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.progression.transformer.HearingHelper.filterJudicialResults; import static uk.gov.moj.cpp.progression.transformer.SchemaVariableConstants.ALLEGATION_OR_COMPLAINT_END_DATE; import static uk.gov.moj.cpp.progression.transformer.SchemaVariableConstants.ALLEGATION_OR_COMPLAINT_START_DATE; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingHelper.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingHelper.java index b074adb15..51e909eaf 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingHelper.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/HearingHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.transformer; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.progression.transformer.ApplicationHelper.transformApplications; import static uk.gov.moj.cpp.progression.transformer.ProsecutionCaseHelper.transformProsecutionCases; import static uk.gov.moj.cpp.progression.transformer.SchemaVariableConstants.APPLICANT_COUNSELS; @@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -176,7 +176,7 @@ public static JsonObject transformedHearing(final JsonObject hearingPayload) { } private static JsonArray filterDefendantJudicialResults(final JsonArray judicialResults) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final List filteredResults = judicialResults.getValuesAs(JsonObject.class).stream().filter(jr -> !jr.getJsonObject(JUDICIAL_RESULT).getBoolean(PUBLISHED_FOR_NOWS)) .collect(Collectors.toList()); @@ -185,7 +185,7 @@ private static JsonArray filterDefendantJudicialResults(final JsonArray judicial } public static JsonArray filterJudicialResults(final JsonArray judicialResults) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final List filteredResults = judicialResults.getValuesAs(JsonObject.class).stream().filter(jr -> !jr.getBoolean(PUBLISHED_FOR_NOWS)) .collect(Collectors.toList()); diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/OffenceHelper.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/OffenceHelper.java index 9fcd68988..ad837befb 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/OffenceHelper.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/OffenceHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.transformer; -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.progression.transformer.HearingHelper.filterJudicialResults; import static uk.gov.moj.cpp.progression.transformer.SchemaVariableConstants.ALLOCATION_DECISION; import static uk.gov.moj.cpp.progression.transformer.SchemaVariableConstants.ALLOCATION_DECISION_DATE; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ProsecutionCaseHelper.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ProsecutionCaseHelper.java index 94efd9378..a8218c9f8 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ProsecutionCaseHelper.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ProsecutionCaseHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.transformer; -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.progression.transformer.HearingHelper.filterJudicialResults; import static uk.gov.moj.cpp.progression.transformer.OffenceHelper.transformOffences; import static uk.gov.moj.cpp.progression.transformer.SchemaVariableConstants.ALIASES; diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformer.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformer.java index f360d0138..4dacc4165 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformer.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformer.java @@ -50,7 +50,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; @SuppressWarnings({"squid:S3655", "squid:S2259", "squid:S1067", "squid:S1854", "squid:S1135", "squid:S1481"}) @@ -292,7 +292,7 @@ private JsonObject getEthnicityJson(final UUID id, final JsonEnvelope jsonEnvelo .getEthinicity(jsonEnvelope, id, requester) .orElseThrow(() -> new ReferenceDataNotFoundException("Ethnicity", id.toString())); } - return Json.createObjectBuilder().build(); + return JsonObjects.createObjectBuilder().build(); } private JsonObject getNationalityJson(final UUID id, final JsonEnvelope jsonEnvelope) { @@ -301,7 +301,7 @@ private JsonObject getNationalityJson(final UUID id, final JsonEnvelope jsonEnve .getNationality(jsonEnvelope, id, requester) .orElseThrow(() -> new ReferenceDataNotFoundException("Country Nationality", id.toString())); } - return Json.createObjectBuilder().build(); + return JsonObjects.createObjectBuilder().build(); } } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessorTest.java index d628a4819..877e6bf0a 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrEventsProcessorTest.java @@ -7,8 +7,8 @@ import static java.util.Arrays.asList; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -68,7 +68,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.io.Resources; @@ -156,7 +156,7 @@ public class CotrEventsProcessorTest { private static JsonObject getReviewNotes(final UUID id1, final UUID id2) { final JsonObject reviewNotes = createObjectBuilder() - .add("reviewNotes", Json.createArrayBuilder() + .add("reviewNotes", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add(ID, id1.toString()) .add(REVIEW_NOTE_TYPE, "CASE_PROGRESSION") @@ -183,14 +183,14 @@ private static JsonObject getReviewNotes(final UUID id1, final UUID id2) { private static JsonObject buildCotrDetails() { final ZonedDateTime hearingDay = ZonedDateTime.now(); - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(ID, String.valueOf(randomUUID())) .add("hearingDay", String.valueOf(hearingDay)) .add("hearingId", String.valueOf(randomUUID())) .add("isArchived", false) .add("isProsecutionServed", false) - .add("cotrDefendants", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + .add("cotrDefendants", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("dateOfBirth", String.valueOf(LocalDate.now())) .add("defenceFormData", "defenceFormData") .add("defendantNumber", 1) @@ -200,8 +200,8 @@ private static JsonObject buildCotrDetails() { .add("lastName", "lastName") .add("servedBy", "servedBy") .add("servedOn", "servedOn") - .add("defenceAdditionalInfo", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + .add("defenceAdditionalInfo", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("addedBy", String.valueOf(randomUUID())) .add("addedByName", "addedByName") .add("addedOn", String.valueOf(LocalDate.now())) @@ -766,7 +766,7 @@ public void shouldTestHandleEventProsecutionCotrUpdated() { private JsonEnvelope getEnvelope(final String name) { return envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()).withName(name).build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); } private String generateHearingData() { @@ -781,14 +781,14 @@ private String generateHearingData() { } private Optional createCotrDetails() { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("cotrDetails", createArrayBuilder().add(buildCotrDetails()) .add(buildCotrDetails())).build(); return Optional.ofNullable(payload); } private Optional createNoCotrDetails() { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("cotrDetails", createArrayBuilder().build()).build(); return Optional.ofNullable(payload); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/DefenceCounselEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/DefenceCounselEventProcessorTest.java index 3eabbc4ab..a0fd212dc 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/DefenceCounselEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/DefenceCounselEventProcessorTest.java @@ -14,7 +14,7 @@ import java.io.StringReader; import java.util.function.Consumer; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -87,6 +87,6 @@ private void verifyCommandHandlerCalled(final String expectedPayload, String exp } private JsonObject toJsonObject(final String value) { - return Json.createReader(new StringReader(value)).readObject(); + return JsonObjects.createReader(new StringReader(value)).readObject(); } } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultEventProcessorTest.java index f0be572c1..1c65562aa 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultEventProcessorTest.java @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItems; @@ -116,7 +116,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.io.Resources; @@ -1026,7 +1026,7 @@ private JsonEnvelope generateResultDefinitionsJson() throws IOException { .withId(randomUUID()) .withName(REFERENCEDATA_GET_ALL_RESULT_DEFINITIONS); - final JsonObject payload = Json.createReader( + final JsonObject payload = JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readObject(); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultedEventProcessorTest.java index 54efcd2cf..29d397066 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingResultedEventProcessorTest.java @@ -85,7 +85,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.apache.commons.lang3.RandomStringUtils; @@ -193,7 +193,7 @@ public class HearingResultedEventProcessorTest { @Test public void shouldIssueCommandToProcessHearingResultsWhenHearingResultedReceived() { final Hearing hearing = Hearing.hearing().withId(randomUUID()).build(); - final JsonObject publicEventPayload = Json.createObjectBuilder().add("hearing", objectToJsonObjectConverter.convert(hearing)) + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder().add("hearing", objectToJsonObjectConverter.convert(hearing)) .add("sharedTime", new UtcClock().now().toString()) .add("hearingDay", LocalDate.now().toString()).build(); @@ -236,7 +236,7 @@ public void shouldUpdateDriveNumberWhenHearingResultedReceived() { .withApplicant(courtApplicationParty) .withSubject(courtApplicationParty) .build())).build(); - final JsonObject publicEventPayload = Json.createObjectBuilder().add("hearing", objectToJsonObjectConverter.convert(hearing)) + final JsonObject publicEventPayload = JsonObjects.createObjectBuilder().add("hearing", objectToJsonObjectConverter.convert(hearing)) .add("sharedTime", new UtcClock().now().toString()) .add("hearingDay", LocalDate.now().toString()).build(); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingSelectedOffenceRemovedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingSelectedOffenceRemovedEventProcessorTest.java index 13bc08b26..f757c2f3a 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingSelectedOffenceRemovedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/HearingSelectedOffenceRemovedEventProcessorTest.java @@ -3,8 +3,8 @@ 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.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.hasSize; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/ProgressionEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/ProgressionEventProcessorTest.java index bd1e5e449..17357dda5 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/ProgressionEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/ProgressionEventProcessorTest.java @@ -5,8 +5,8 @@ import static java.util.Optional.of; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -47,7 +47,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.core.Is; @@ -108,7 +108,7 @@ public class ProgressionEventProcessorTest { private ArgumentCaptor> envelopeCaptor; private static JsonObject getOffence(final String modeoftrial) { - return Json.createObjectBuilder().add("legislation", "legislation") + return JsonObjects.createObjectBuilder().add("legislation", "legislation") .add("welshlegislation", LEGISLATION_WELSH) .add("title", "title") .add("welshoffencetitle", WELSH_OFFENCE_TITLE) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/UnscheduledHearingListingRequestedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/UnscheduledHearingListingRequestedEventProcessorTest.java index 4ddcbedcc..51843d5c3 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/UnscheduledHearingListingRequestedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/event/UnscheduledHearingListingRequestedEventProcessorTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.event; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/HearingNotificationHelperTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/HearingNotificationHelperTest.java index 74c12d6e1..f7d7b5394 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/HearingNotificationHelperTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/HearingNotificationHelperTest.java @@ -2,7 +2,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static 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; @@ -55,7 +55,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; + import javax.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; @@ -195,7 +195,7 @@ void initMocks() { when(applicationParameters.getNotifyHearingTemplateId()).thenReturn(TEMPLATE_ID); jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.event.list-hearing-requested"), - objectToJsonObjectConverter.convert(Json.createObjectBuilder().build())); + objectToJsonObjectConverter.convert(createObjectBuilder().build())); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/NullAwareJsonObjectBuilderTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/NullAwareJsonObjectBuilderTest.java index aa0f2ca42..f770cd63c 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/NullAwareJsonObjectBuilderTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/NullAwareJsonObjectBuilderTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -18,7 +18,7 @@ public class NullAwareJsonObjectBuilderTest { @Test public void testAddString() { final JsonObjectBuilder builder = - NullAwareJsonObjectBuilder.wrap(Json.createObjectBuilder()); + NullAwareJsonObjectBuilder.wrap(JsonObjects.createObjectBuilder()); final String value = null; final String name = null; final JsonObject json = diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/TestHelper.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/TestHelper.java index de873bc60..957810dc6 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/TestHelper.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/helper/TestHelper.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.core.courts.CaseDocument; import uk.gov.justice.core.courts.CommittingCourt; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/listener/MaterialAddedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/listener/MaterialAddedProcessorTest.java index b4f4965b8..c10351be9 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/listener/MaterialAddedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/listener/MaterialAddedProcessorTest.java @@ -20,7 +20,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.io.Resources; @@ -73,7 +73,7 @@ public class MaterialAddedProcessorTest { @Test public void shouldForwardCourtOriginUpdateWhenOriginatorIsCourt() { - final JsonObject metaDataJson = Json.createObjectBuilder() + final JsonObject metaDataJson = JsonObjects.createObjectBuilder() .add(MaterialAddedProcessor.ORIGINATOR, MaterialAddedProcessor.ORIGINATOR_VALUE) .add("id", UUID.randomUUID().toString()).build(); when(metadata.asJsonObject()).thenReturn(metaDataJson); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessorTest.java index 95b2bbebd..c197aaa55 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationDefenceOrganisationChangedProcessorTest.java @@ -30,7 +30,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -126,9 +126,9 @@ void shouldHandleDefendantDefenceOrganisationChanged() { .withId(prosecutionCaseId) .withDefendants(getDefendants(defendantId, prosecutionCaseId, associatedDefenceOrganisation)) .build(); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendantId.toString()).build()) .build()) .build()).build(); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationLaaAssociatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationLaaAssociatedProcessorTest.java index a5bb34aeb..eda395bba 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationLaaAssociatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationLaaAssociatedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessorTest.java index 142559e06..9d0df9ad0 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationOffencesUpdatedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentCaptor.forClass; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationRepOrderOffencesUpdatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationRepOrderOffencesUpdatedProcessorTest.java index ab185bb4c..d5ee6f8a2 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationRepOrderOffencesUpdatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ApplicationRepOrderOffencesUpdatedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -49,7 +49,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -299,7 +299,7 @@ public void shouldHandleApplicationRepOrderUpdatedForApplicationEventMessage() { .build())) .build(); - when(progressionService.getProsecutionCaseById(any(JsonEnvelope.class), eq(defendantCase.getCaseId().toString()))).thenReturn(Json.createObjectBuilder().add("prosecutionCase", objectToJsonConverter.convert(prosecutionCase)).build()); + when(progressionService.getProsecutionCaseById(any(JsonEnvelope.class), eq(defendantCase.getCaseId().toString()))).thenReturn(JsonObjects.createObjectBuilder().add("prosecutionCase", objectToJsonConverter.convert(prosecutionCase)).build()); when(jsonObjectToObjectConverter.convert(any(JsonObject.class), eq(ProsecutionCase.class))).thenReturn(prosecutionCase); eventProcessor.handleApplicationRepOrderUpdatedForApplicationEvent(envelope); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessorTest.java index 47d4427fc..9ccf0f07b 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CPSEmailNotificationProcessorTest.java @@ -2,8 +2,8 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessorTest.java index c2c01eb4c..5e4505b20 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseApplicationEjectedEventProcessorTest.java @@ -26,7 +26,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -180,7 +180,7 @@ public void shouldHandleApplicationEjectedEventEventMessage() { when(payload.getString("removalReason")).thenReturn(REMOVAL_REASON); when(progressionService.getCourtApplicationById(envelope, applicationId)).thenReturn(of(applicationAtAGlance)); - when(applicationAtAGlance.getJsonArray("hearings")).thenReturn(Json.createArrayBuilder().add(payload).build()); + when(applicationAtAGlance.getJsonArray("hearings")).thenReturn(JsonObjects.createArrayBuilder().add(payload).build()); when(payload.getString("id")).thenReturn(hearingId); //When diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseReferredToCourtEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseReferredToCourtEventProcessorTest.java index d3251bc75..2661e75a8 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseReferredToCourtEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CaseReferredToCourtEventProcessorTest.java @@ -50,7 +50,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -148,9 +148,9 @@ public void shouldHandleCasesReferredToCourtEventMessage() throws Exception { .thenReturn(sjpCourtReferral); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of - (Json.createObjectBuilder().build())); + (JsonObjects.createObjectBuilder().build())); when(progressionService.getReferralReasonByReferralReasonId(any(), any())) - .thenReturn(Json.createObjectBuilder().add("reason", "reason for referral").build()); + .thenReturn(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build()); when(referredProsecutionCaseTransformer.transform(any(ReferredProsecutionCase.class), any(HearingLanguage.class), any(JsonEnvelope.class))).thenReturn(prosecutionCase); when(listCourtHearingTransformer.transform(any(), any(), any(), any(), any(UUID.class))).thenReturn @@ -179,7 +179,7 @@ public void shouldHandleExceptionsOnMissingRequiredData() throws Exception { .thenReturn(sjpCourtReferral); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of - (Json.createObjectBuilder().add("caseId", randomUUID().toString()).build())); + (JsonObjects.createObjectBuilder().add("caseId", randomUUID().toString()).build())); //When this.eventProcessor.process(jsonEnvelope); @@ -202,7 +202,7 @@ public void shouldHandleExceptionsOnRefData() throws Exception { .thenReturn(sjpCourtReferral); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of - (Json.createObjectBuilder().add("caseId", randomUUID().toString()).build())); + (JsonObjects.createObjectBuilder().add("caseId", randomUUID().toString()).build())); //When this.eventProcessor.process(jsonEnvelope); @@ -225,7 +225,7 @@ public void shouldHandleExceptionsOnSearch() throws Exception { .thenReturn(sjpCourtReferral); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of - (Json.createObjectBuilder().add("caseId", randomUUID().toString()).build())); + (JsonObjects.createObjectBuilder().add("caseId", randomUUID().toString()).build())); //When this.eventProcessor.process(jsonEnvelope); @@ -255,10 +255,10 @@ public void shouldHandleCasesReferredToCourtWithDisqualificationEventMessage() t when(jsonObjectToObjectConverter.convert(courtReferralJson, SjpCourtReferral.class)) .thenReturn(sjpCourtReferral); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of - (Json.createObjectBuilder().build())); - when(progressionService.getReferralReasonByReferralReasonId(any(), any())).thenReturn(Json.createObjectBuilder().build()); + (JsonObjects.createObjectBuilder().build())); + when(progressionService.getReferralReasonByReferralReasonId(any(), any())).thenReturn(JsonObjects.createObjectBuilder().build()); when(progressionService.getReferralReasonByReferralReasonId(any(), any())) - .thenReturn(Json.createObjectBuilder().add("reason", "For disqualification") + .thenReturn(JsonObjects.createObjectBuilder().add("reason", "For disqualification") .build()); when(referredProsecutionCaseTransformer.transform(any(ReferredProsecutionCase.class), any(HearingLanguage.class), any @@ -345,7 +345,7 @@ public void shouldThrowExceptionWhenDuplicateCaseExistsByProsecutionAuthorityRef // Mock duplicate found for ProsecutionAuthorityReference when(progressionService.caseExistsByCaseUrn(jsonEnvelope, "proAuthRef")).thenReturn(Optional.of - (Json.createObjectBuilder().add("caseId", randomUUID().toString()).build())); + (JsonObjects.createObjectBuilder().add("caseId", randomUUID().toString()).build())); this.eventProcessor.referSJPCasesToCourt(jsonEnvelope); @@ -363,9 +363,9 @@ public void shouldThrowExceptionWhenDuplicateCaseExistsByCaseUrn() throws Except // Mock no duplicate for ProAuthRef, but duplicate found for CaseURN when(progressionService.caseExistsByCaseUrn(jsonEnvelope, "proAuthRef")).thenReturn(Optional.of - (Json.createObjectBuilder().build())); + (JsonObjects.createObjectBuilder().build())); when(progressionService.caseExistsByCaseUrn(jsonEnvelope, "caseURN")).thenReturn(Optional.of - (Json.createObjectBuilder().add("caseId", randomUUID().toString()).build())); + (JsonObjects.createObjectBuilder().add("caseId", randomUUID().toString()).build())); this.eventProcessor.referSJPCasesToCourt(jsonEnvelope); @@ -387,9 +387,9 @@ public void shouldHandleSJPCasesReferredToCourtEventMessage() throws Exception { .thenReturn(sjpCourtReferral); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of - (Json.createObjectBuilder().build())); + (JsonObjects.createObjectBuilder().build())); when(progressionService.getReferralReasonByReferralReasonId(any(), any())) - .thenReturn(Json.createObjectBuilder().add("reason", "reason for referral").build()); + .thenReturn(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build()); when(referredProsecutionCaseTransformer.transform(any(ReferredProsecutionCase.class), any(HearingLanguage.class), any (JsonEnvelope.class))).thenReturn(prosecutionCase); when(listCourtHearingTransformer.transformSjpReferralNextHearing(any(), any(), any(), any(), any())).thenReturn diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessorTest.java index 39f1f29d0..56f488adf 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationDeletedEventProcessorTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessorTest.java index bfc3a63d7..ddccbdeaa 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtApplicationProcessorTest.java @@ -6,8 +6,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.codehaus.groovy.runtime.InvokerHelper.asList; @@ -136,7 +136,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.collect.Lists; @@ -1499,7 +1499,7 @@ public void shouldProcessEventWhenApplicationReferredToExistingHearingGenericBre when(jsonObjectToObjectConverter.convert(event.payloadAsJsonObject(), ApplicationReferredToExistingHearing.class)).thenReturn(applicationReferredToExistingHearing); when(progressionService.getHearing(event, hearingId.toString())).thenReturn(Optional.of(createObjectBuilder().add("hearing", createObjectBuilder(). - add("prosecutionCases", Json.createArrayBuilder().add(createObjectBuilder().add("id", caseId_1.toString()).build()).build()).build()).build())); + add("prosecutionCases", JsonObjects.createArrayBuilder().add(createObjectBuilder().add("id", caseId_1.toString()).build()).build()).build()).build())); when(progressionService.getProsecutionCaseDetailById(any(JsonEnvelope.class), eq(caseId_2.toString()))) .thenReturn(Optional.of(createObjectBuilder().add("prosecutionCase", createObjectBuilder() @@ -1557,7 +1557,7 @@ public void shouldProcessCourtApplicationProceedingsInitiated() { final JsonEnvelope event = envelopeFrom(metadataBuilder, payload); when(progressionService.getProsecutionCase(any(), any())).thenReturn(Optional.of - (createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().build + (createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().build ()).build())); //When @@ -1603,7 +1603,7 @@ public void shouldProcessCourtApplicationProceedingsInitiatedWhenLegalEntityIsAp final JsonEnvelope event = envelopeFrom(metadataBuilder, payload); when(progressionService.getProsecutionCase(any(), any())).thenReturn(Optional.of - (createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().build + (createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().build ()).build())); //When @@ -1651,7 +1651,7 @@ public void shouldProcessCourtApplicationProceedingsInitiatedWhenDefendantIsResp final JsonEnvelope event = envelopeFrom(metadataBuilder, payload); when(progressionService.getProsecutionCase(any(), any())).thenReturn(Optional.of - (createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().build + (createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().build ()).build())); //When @@ -1813,7 +1813,7 @@ public void shouldProcessCourtApplicationProceedingsInitiatedWithSjpCase() { when(sjpService.getProsecutionCase(event, caseId)).thenReturn(sjpCase); when(progressionService.getProsecutionCase(any(), any())).thenReturn(Optional.of - (createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().build + (createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().build ()).build())); courtApplicationProcessor.processCourtApplicationInitiated(event); @@ -1877,7 +1877,7 @@ public void shouldProcessCourtApplicationProceedingsWithAlreadyInitiatedSjpCase( .build()); when(progressionService.getProsecutionCase(any(), any())).thenReturn(Optional.of - (createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().build + (createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().build ()).build())); courtApplicationProcessor.processCourtApplicationInitiated(event); @@ -1909,7 +1909,7 @@ public void shouldProcessCourtApplicationProceedingsWithCortOrders() { final JsonEnvelope event = envelopeFrom(metadataBuilder, payload); when(progressionService.getProsecutionCase(any(), any())).thenReturn(Optional.of - (createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().build + (createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().build ()).build())); courtApplicationProcessor.processCourtApplicationInitiated(event); @@ -2412,7 +2412,7 @@ public void shouldProcessApplicationDefendantUpdateRequested() throws IOExceptio private JsonObject getJsonPayload(final String fileName) throws IOException { final String jsonString = Resources.toString(Resources.getResource(fileName), defaultCharset()); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readObject(); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentCreatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentCreatedProcessorTest.java index 4c9241462..265e41f6c 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentCreatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentCreatedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentNotifiedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentNotifiedProcessorTest.java index 564b5dccf..79ef18740 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentNotifiedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtDocumentNotifiedProcessorTest.java @@ -4,7 +4,7 @@ import static java.util.Optional.of; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -30,7 +30,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -113,7 +113,7 @@ public void shouldProcessCourtDocumentSendToCPS_WhenFeatureToggleIsOffForDefence @Test public void shouldProcessCourtDocumentSendToCPS_WhenFeatureToggleIsOnForDefenceDisclosure() { - final String transformedPayload = Json.createObjectBuilder().add("a", "b").build().toString(); + final String transformedPayload = JsonObjects.createObjectBuilder().add("a", "b").build().toString(); when(courtDocumentTransformer.transform(any(), any(), any(), any())).thenReturn(of(transformedPayload)); when(featureControlGuard.isFeatureEnabled("defenceDisclosure")).thenReturn(true); @@ -125,7 +125,7 @@ public void shouldProcessCourtDocumentSendToCPS_WhenFeatureToggleIsOnForDefenceD @Test public void shouldProcessCourtDocumentSendToCPS_WhenSendToCpsTrue() { - final String transformedPayload = Json.createObjectBuilder().add("a", "b").build().toString(); + final String transformedPayload = JsonObjects.createObjectBuilder().add("a", "b").build().toString(); when(courtDocumentTransformer.transform(any(), any(), any(), any())).thenReturn(of(transformedPayload)); courtDocument = courtDocument() @@ -150,7 +150,7 @@ public void shouldProcessCourtDocumentSendToCPS_WhenSendToCpsTrue() { @Test public void shouldProcessOPACourtDocumentSendToCPS_WhenSendToCpsTrue() { - final String transformedPayload = Json.createObjectBuilder().add("a", "b").build().toString(); + final String transformedPayload = JsonObjects.createObjectBuilder().add("a", "b").build().toString(); when(courtDocumentTransformer.transform(any(), any(), any(), any())).thenReturn(of(transformedPayload)); courtDocument = courtDocument() diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessorTest.java index 9a6825551..28ef9e81d 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtProceedingsInitiatedProcessorTest.java @@ -2,8 +2,8 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -68,7 +68,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -427,7 +427,7 @@ void shouldSendPublicMessageInCaseOfGroupCases() throws IOException { .build())) .build()); when(listCourtHearingTransformer.transform(any(), any(), anyList(), any())).thenReturn(ListCourtHearing.listCourtHearing().withHearings(hearingsList).build()); - when(objectToJsonObjectConverter.convert(any())).thenReturn(Json.createObjectBuilder().build()); + when(objectToJsonObjectConverter.convert(any())).thenReturn(JsonObjects.createObjectBuilder().build()); this.eventProcessor.handle(requestMessage); verify(sender, VerificationModeFactory.times(2)).send(envelopeCaptor.capture()); @@ -1467,7 +1467,7 @@ private List prepareReferenceDataOffencesJsonObject(final UUID offen .replace("OFFENCE_ID", offenceId.toString()) .replace("OFFENCE_CODE", offenceCode) .replace("LEGISLATION", legislation); - final JsonReader jsonReader = Json.createReader(new StringReader(referenceDataOffenceJsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(referenceDataOffenceJsonString)); return jsonReader.readObject().getJsonArray("offences").getValuesAs(JsonObject.class); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessorTest.java index deb65b1ad..0767d1063 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CourtRegisterEventProcessorTest.java @@ -36,7 +36,7 @@ import java.time.ZonedDateTime; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -115,7 +115,7 @@ public void shouldGenerateCourtRegister() throws IOException, FileServiceExcepti MetadataBuilderFactory.metadataWithRandomUUID("progression.event.court-register-generated"), jsonObject); - final JsonObject fileStorePayload = Json.createObjectBuilder().add("templatePayload", "some values").build(); + final JsonObject fileStorePayload = JsonObjects.createObjectBuilder().add("templatePayload", "some values").build(); when(courtRegisterPdfPayloadGenerator.mapPayload(any(JsonObject.class))).thenReturn(fileStorePayload); final UUID fileId = UUID.randomUUID(); @@ -135,14 +135,14 @@ public void shouldGenerateCourtRegister() throws IOException, FileServiceExcepti @Test public void shouldNotifyCourt() { - final JsonArrayBuilder recipientJsonArray = Json.createArrayBuilder(); + final JsonArrayBuilder recipientJsonArray = JsonObjects.createArrayBuilder(); final String templateId = UUID.randomUUID().toString(); final String emailAddress1 = "abc@test.com"; - recipientJsonArray.add(Json.createObjectBuilder().add("templateId", templateId) + recipientJsonArray.add(JsonObjects.createObjectBuilder().add("templateId", templateId) .add("recipientName", "yots court center") .add("emailTemplateName", "some template") .add("emailAddress1", emailAddress1).build()); - final JsonObject notificationObject = Json.createObjectBuilder().add("recipients", recipientJsonArray).add("systemDocGeneratorId", "some uuid").build(); + final JsonObject notificationObject = JsonObjects.createObjectBuilder().add("recipients", recipientJsonArray).add("systemDocGeneratorId", "some uuid").build(); final JsonEnvelope requestEnvelope = JsonEnvelope.envelopeFrom( metadataWithRandomUUID("progression.event.court-register-notified").withUserId(UUID.randomUUID().toString()), notificationObject); @@ -158,14 +158,14 @@ public void shouldNotifyCourt() { @Test public void shouldNotifyCourtV2() { - final JsonArrayBuilder recipientJsonArray = Json.createArrayBuilder(); + final JsonArrayBuilder recipientJsonArray = JsonObjects.createArrayBuilder(); final String templateId = UUID.randomUUID().toString(); final String emailAddress1 = "abc@test.com"; - recipientJsonArray.add(Json.createObjectBuilder().add("templateId", templateId) + recipientJsonArray.add(JsonObjects.createObjectBuilder().add("templateId", templateId) .add("recipientName", "yots court center") .add("emailTemplateName", "some template") .add("emailAddress1", emailAddress1).build()); - final JsonObject notificationObject = Json.createObjectBuilder().add("recipients", recipientJsonArray).add("systemDocGeneratorId", "some uuid").build(); + final JsonObject notificationObject = JsonObjects.createObjectBuilder().add("recipients", recipientJsonArray).add("systemDocGeneratorId", "some uuid").build(); final JsonEnvelope requestEnvelope = JsonEnvelope.envelopeFrom( metadataWithRandomUUID("progression.event.court-register-notified").withUserId(UUID.randomUUID().toString()), notificationObject); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CreateNextHearingEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CreateNextHearingEventProcessorTest.java index 0701419f9..27658b2ca 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CreateNextHearingEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CreateNextHearingEventProcessorTest.java @@ -14,7 +14,7 @@ import javax.json.JsonObject; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CustodyTimeLimitProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CustodyTimeLimitProcessorTest.java index 6db75bbaf..81f649510 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CustodyTimeLimitProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/CustodyTimeLimitProcessorTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -20,7 +20,7 @@ import java.time.LocalDate; import java.util.Arrays; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -53,7 +53,7 @@ public void shouldProcessStopCustodyTimeLimitClock() { final JsonEnvelope event = envelopeFrom(metadataWithRandomUUID("public.events.hearing.custody-time-limit-clock-stopped"), createObjectBuilder() .add("hearingId", hearingId) - .add("offenceIds", Json.createArrayBuilder() + .add("offenceIds", JsonObjects.createArrayBuilder() .add(offence1Id) .add(offence2Id) .build()) @@ -110,7 +110,7 @@ public void shouldProcessCustodyTimeLimitExtended() { final String extendedTimeLimit = LocalDate.now().toString(); final JsonEnvelope event = envelopeFrom(metadataWithRandomUUID("progression.events.custody-time-limit-extended"), createObjectBuilder() - .add("hearingIds", Json.createArrayBuilder() + .add("hearingIds", JsonObjects.createArrayBuilder() .add(hearing1Id) .add(hearing2Id) .build() diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationAssociatedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationAssociatedEventProcessorTest.java index 1e9104e9c..2156a8b9d 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationAssociatedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationAssociatedEventProcessorTest.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -53,7 +53,7 @@ public void shouldAssociateDefenceOrganisation() { .withName("public.progression.defence-organisation-associated") .withUserId(userId.toString()); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("defendantId", defendantId.toString()) .add("organisationId", organisationId.toString()) .add("organisationName", ORGANISATION_NAME) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationDisassociatedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationDisassociatedEventProcessorTest.java index 932f0d91f..170ab59fd 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationDisassociatedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefenceOrganisationDisassociatedEventProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceAssocationLockedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceAssocationLockedProcessorTest.java index efb1935a0..7d5b2acd5 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceAssocationLockedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceAssocationLockedProcessorTest.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -52,7 +52,7 @@ public void shouldAssociateDefenceOrganisation() { .withName("public.progression.defence-association-for-laa-locked") .withUserId(userId.toString()); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("defendantId", defendantId.toString()) .add("prosecutionCaseId", prosecutionCaseId.toString()) .add("lockedByRepOrder", true) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationAssociatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationAssociatedProcessorTest.java index cbf6f0199..f0b1682b9 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationAssociatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationAssociatedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessorTest.java index b5ed446ae..34ad93d4f 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantDefenceOrganisationChangedProcessorTest.java @@ -29,7 +29,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -111,9 +111,9 @@ public void shouldHandleDefendantDefenceOrganisationChanged() throws Exception { .withId(prosecutionCaseId) .withDefendants(getDefendants(defendantId, prosecutionCaseId, associatedDefenceOrganisation)) .build(); - final JsonObject jsonObject = Json.createObjectBuilder() - .add("payload", Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("payload", JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", defendantId.toString()).build()) .build()) .build()).build(); @@ -149,7 +149,7 @@ private List getDefendants(final UUID defendantId, final UUID prosecu private JsonObject jsonFromString(final String jsonObjectStr) { JsonObject object; - try (JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { object = jsonReader.readObject(); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessorTest.java index 08e17d340..3533513a7 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantMatchingEventProcessorTest.java @@ -35,7 +35,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -91,7 +91,7 @@ public void handleDefendantUnmatchedEvent() { .withDefendants(createDefendants(defendantId)) .build(); - final JsonObject incomingProsecutionCaseJson = Json.createObjectBuilder() + final JsonObject incomingProsecutionCaseJson = JsonObjects.createObjectBuilder() .add("prosecutionCase", objectToJsonObjectConverter.convert(incomingProsecutionCase)) .build(); final Optional incomingProsecutionCaseJsonOptional = Optional.of(incomingProsecutionCaseJson); @@ -122,7 +122,7 @@ public void handleDefendantUnmatchedV2Event() { .withDefendants(createDefendants(defendantId)) .build(); - final JsonObject incomingProsecutionCaseJson = Json.createObjectBuilder() + final JsonObject incomingProsecutionCaseJson = JsonObjects.createObjectBuilder() .add("prosecutionCase", objectToJsonObjectConverter.convert(incomingProsecutionCase)) .build(); final Optional incomingProsecutionCaseJsonOptional = Optional.of(incomingProsecutionCaseJson); @@ -166,7 +166,7 @@ public void handleMasterDefendantIdUpdatedEvent() { .withDefendants(createDefendants(incomingDefendantId)) .build(); - final JsonObject incomingProsecutionCaseJson = Json.createObjectBuilder() + final JsonObject incomingProsecutionCaseJson = JsonObjects.createObjectBuilder() .add("prosecutionCase", objectToJsonObjectConverter.convert(incomingProsecutionCase)) .build(); final Optional incomingProsecutionCaseJsonOptional = Optional.of(incomingProsecutionCaseJson); @@ -204,7 +204,7 @@ public void handleMasterDefendantIdUpdatedEventWithNoCourtProceedingsInitiatedDa .withDefendants(createDefendants(incomingDefendantId)) .build(); - final JsonObject incomingProsecutionCaseJson = Json.createObjectBuilder() + final JsonObject incomingProsecutionCaseJson = JsonObjects.createObjectBuilder() .add("prosecutionCase", objectToJsonObjectConverter.convert(incomingProsecutionCase)) .build(); final Optional incomingProsecutionCaseJsonOptional = Optional.of(incomingProsecutionCaseJson); @@ -243,7 +243,7 @@ private List createDefendants(final UUID matchedDefendantId) { private JsonEnvelope getJsonEnvelope(final boolean isDeleted) { return JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.event.defendant-matched"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("defendantId", randomUUID().toString()) .add("hasDefendantAlreadyBeenDeleted", isDeleted) .build()); @@ -252,7 +252,7 @@ private JsonEnvelope getJsonEnvelope(final boolean isDeleted) { private JsonEnvelope getJsonEnvelopeForUnmatching(final String prosecutionCaseId, final String defendantId) { return JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.event.defendant-unmatched"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("defendantId", defendantId) .add("prosecutionCaseId", prosecutionCaseId) .build()); @@ -261,10 +261,10 @@ private JsonEnvelope getJsonEnvelopeForUnmatching(final String prosecutionCaseId private JsonEnvelope buildDefendantUnmatchedV2EventEnvelope(final String prosecutionCaseId, final String defendantId, final String masterDefendantId) { return JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.event.defendant-unmatched-v2"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("defendantId", defendantId) .add("prosecutionCaseId", prosecutionCaseId) - .add("defendant", Json.createObjectBuilder() + .add("defendant", JsonObjects.createObjectBuilder() .add("id", defendantId) .add("masterDefendantId", masterDefendantId) .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java index 15f9620cf..932caaeec 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java @@ -1,229 +1,199 @@ -package uk.gov.moj.cpp.progression.processor; - -import com.google.common.collect.ImmutableMap; -import com.google.common.io.Resources; -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.core.courts.CourtApplication; -import uk.gov.justice.core.courts.DefendantTrialRecordSheetRequested; -import uk.gov.justice.core.courts.DefendantTrialRecordSheetRequestedForApplication; -import uk.gov.justice.progression.courts.exract.CourtExtractRequested; -import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; -import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; -import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; -import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; -import uk.gov.justice.services.common.util.UtcClock; -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.framework.api.JsonObjectConvertersFactory; -import uk.gov.moj.cpp.progression.service.ConversionFormat; -import uk.gov.moj.cpp.progression.service.DocumentGenerationRequest; -import uk.gov.moj.cpp.progression.service.FileService; -import uk.gov.moj.cpp.progression.service.ProgressionService; -import uk.gov.moj.cpp.progression.service.SystemDocGeneratorService; - -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import static com.google.common.io.Resources.getResource; -import static java.nio.charset.Charset.defaultCharset; -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.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.never; -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.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; - -@ExtendWith(MockitoExtension.class) -public class DefendantTrialRecordSheetRequestedProcessorTest { - - @InjectMocks - private DefendantTrialRecordSheetRequestedProcessor eventProcessor; - - @Mock - private Sender sender; - - @Spy - private final ObjectToJsonObjectConverter objectToJsonObjectConverter = new ObjectToJsonObjectConverter(new ObjectMapperProducer().objectMapper()); - - private final StringToJsonObjectConverter stringToJsonObjectConverter = new StringToJsonObjectConverter(); - - @Captor - private ArgumentCaptor envelopeArgumentCaptor; - @Spy - private UtcClock utcClock; - - @Mock - private FileService fileService; - @Spy - private final JsonObjectToObjectConverter jsonToObjectConverter = new JsonObjectConvertersFactory().jsonObjectToObjectConverter(); - @Mock - ProgressionService progressionService; - @Mock - SystemDocGeneratorService systemDocGeneratorService; - @Test - void process() { - final UUID defendantId = randomUUID(); - final UUID caseId = randomUUID(); - final UUID streamId = randomUUID(); - - JsonObject nameJsonObject = createObjectBuilder() - .add("name", "test name") - .build(); - JsonObject recordSheetPayload = createObjectBuilder() - .add("defendant", nameJsonObject) - .build(); - JsonObject newRecordSheetPayload = createObjectBuilder() - .add("payload", recordSheetPayload) - .build(); - final JsonEnvelope event = envelopeFrom( - metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested").withStreamId(streamId), - objectToJsonObjectConverter.convert(DefendantTrialRecordSheetRequested.defendantTrialRecordSheetRequested() - .withDefendantId(defendantId) - .withCaseId(caseId) - .build())); - - when(progressionService.generateTrialRecordSheetPayload(event, caseId, defendantId)).thenReturn(newRecordSheetPayload); - when(fileService.storePayload(any(JsonObject.class), anyString(), anyString())).thenReturn((randomUUID())); - doNothing().when(systemDocGeneratorService).generateDocument(any(), any()); - - this.eventProcessor.process(event); - verify(sender, times(0)).send(envelopeArgumentCaptor.capture()); - } - - @Test - void processWhenPayloadIsNull() { - final UUID defendantId = randomUUID(); - final UUID caseId = randomUUID(); - final UUID streamId = randomUUID(); - - JsonObject nameJsonObject = createObjectBuilder() - .add("name", "test name") - .build(); - JsonObject recordSheetPayload = createObjectBuilder() - .add("defendant", nameJsonObject) - .build(); - JsonObject newRecordSheetPayload = createObjectBuilder() - .build(); - final JsonEnvelope event = envelopeFrom( - metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested").withStreamId(streamId), - objectToJsonObjectConverter.convert(DefendantTrialRecordSheetRequested.defendantTrialRecordSheetRequested() - .withDefendantId(defendantId) - .withCaseId(caseId) - .build())); - - when(progressionService.generateTrialRecordSheetPayload(event, caseId, defendantId)).thenReturn(newRecordSheetPayload); - - this.eventProcessor.process(event); - verify(sender, never()).send(envelopeArgumentCaptor.capture()); - verify(fileService, never()).storePayload(any(JsonObject.class), anyString(), anyString()); - verify(systemDocGeneratorService, never()).generateDocument(any(DocumentGenerationRequest.class), any(JsonEnvelope.class)); - } - - @Test - void shouldProcessForApplication() { - ArgumentCaptor captor = ArgumentCaptor.forClass(DocumentGenerationRequest.class); - final UUID applicationId = randomUUID(); - final UUID caseId = randomUUID(); - final UUID offenceId1 = randomUUID(); - final UUID offenceId2 = randomUUID(); - final UUID fileId1 = randomUUID(); - final UUID fileId2 = randomUUID(); - final JsonEnvelope event = envelopeFrom( - metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested-for-application").withStreamId(applicationId), - objectToJsonObjectConverter.convert(DefendantTrialRecordSheetRequestedForApplication.defendantTrialRecordSheetRequestedForApplication() - .withCaseId(caseId) - .withOffenceIds(Arrays.asList(offenceId1, offenceId2)) - .withCourtApplication(CourtApplication.courtApplication().build()) - .build())); - final JsonObject payload1 = createObjectBuilder().add("caseReference", randomUUID().toString()).build(); - final JsonObject payload2 = createObjectBuilder().add("caseReference", randomUUID().toString()).build(); - final String defendantName1 = "name1"; - final String defendantName2 = "name2"; - when(progressionService.generateTrialRecordSheetPayloadForApplication(event, caseId, Arrays.asList(offenceId1, offenceId2))).thenReturn(Json.createArrayBuilder() - .add(Json.createObjectBuilder() - .add("payload", payload1) - .add("defendantName", defendantName1) - .build()) - .add(Json.createObjectBuilder() - .add("payload", payload2) - .add("defendantName", defendantName2) - .build()) - .build()); - - when(fileService.storePayload(eq(payload1), anyString(), eq("RecordSheet"))).thenReturn((fileId1)); - when(fileService.storePayload(eq(payload2), anyString(), eq("RecordSheet"))).thenReturn((fileId2)); - - eventProcessor.processForApplication(event); - verify(systemDocGeneratorService, times(2)).generateDocument(captor.capture(), eq(event)); - - final Map additionalInformation1 = ImmutableMap.of("caseId", caseId.toString(), "defendantName", defendantName1); - final DocumentGenerationRequest firstRequest = captor.getAllValues().get(0); - assertThat(firstRequest.getPayloadFileServiceId(), is((fileId1))); - assertThat(firstRequest.getAdditionalInformation(), is(additionalInformation1)); - assertThat(firstRequest.getConversionFormat(), is((ConversionFormat.PDF))); - assertThat(firstRequest.getSourceCorrelationId(), is((applicationId.toString()))); - assertThat(firstRequest.getOriginatingSource(), is(("RECORD_SHEET"))); - assertThat(firstRequest.getTemplateIdentifier(), is(("RecordSheet"))); - - final Map additionalInformation2 = ImmutableMap.of("caseId", caseId.toString(), "defendantName", defendantName2); - final DocumentGenerationRequest secondRequest = captor.getAllValues().get(1); - assertThat(secondRequest.getPayloadFileServiceId(), is((fileId2))); - assertThat(secondRequest.getAdditionalInformation(), is(additionalInformation2)); - assertThat(secondRequest.getConversionFormat(), is((ConversionFormat.PDF))); - assertThat(secondRequest.getSourceCorrelationId(), is((applicationId.toString()))); - assertThat(secondRequest.getOriginatingSource(), is(("RECORD_SHEET"))); - assertThat(secondRequest.getTemplateIdentifier(), is(("RecordSheet"))); - } - - @Test - void shouldProcessForApplicationWhenCourtOrderOffencesResultIsUpdated() throws IOException { - ArgumentCaptor captor = ArgumentCaptor.forClass(JsonObject.class); - - final UUID applicationId = randomUUID(); - final UUID caseId = UUID.fromString("09816ffe-38e5-4fe1-af4b-4bee159eb034"); - final UUID offenceId1 = UUID.fromString("0ab230be-f414-46e9-8744-639b4b49a5c6"); - - final UUID fileId1 = randomUUID(); - final JsonEnvelope event = envelopeFrom( - metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested-for-application").withStreamId(applicationId), - new StringToJsonObjectConverter().convert(Resources.toString(getResource("progression.event.defendant-trial-record-sheet-requested-for-application.json"), defaultCharset()))); - - final JsonArray queryResponse = stringToJsonObjectConverter.convert(Resources.toString(getResource("progression.query.record-sheet-for-application.json"), defaultCharset())).getJsonArray("payloads"); - when(progressionService.generateTrialRecordSheetPayloadForApplication(event, caseId, List.of(offenceId1))) - .thenReturn(queryResponse); - - when(fileService.storePayload(any(), anyString(), eq("RecordSheet"))).thenReturn((fileId1)); - - eventProcessor.processForApplication(event); - - verify(fileService).storePayload(captor.capture(), anyString(), eq("RecordSheet")); - final CourtExtractRequested result = jsonToObjectConverter.convert(captor.getValue(), CourtExtractRequested.class); - final CourtExtractRequested expected = jsonToObjectConverter.convert(stringToJsonObjectConverter.convert(Resources.toString(getResource("progression.query.expected.record-sheet-for-application.json"), defaultCharset())), CourtExtractRequested.class); - assertThat(result, is(expected)); - - } +package uk.gov.moj.cpp.progression.processor; + +import com.google.common.collect.ImmutableMap; +import com.google.common.io.Resources; +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.core.courts.CourtApplication; +import uk.gov.justice.core.courts.DefendantTrialRecordSheetRequested; +import uk.gov.justice.core.courts.DefendantTrialRecordSheetRequestedForApplication; +import uk.gov.justice.progression.courts.exract.CourtExtractRequested; +import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; +import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; +import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; +import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; +import uk.gov.justice.services.common.util.UtcClock; +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.framework.api.JsonObjectConvertersFactory; +import uk.gov.moj.cpp.progression.service.ConversionFormat; +import uk.gov.moj.cpp.progression.service.DocumentGenerationRequest; +import uk.gov.moj.cpp.progression.service.FileService; +import uk.gov.moj.cpp.progression.service.ProgressionService; +import uk.gov.moj.cpp.progression.service.SystemDocGeneratorService; + +import uk.gov.justice.services.messaging.JsonObjects; +import javax.json.JsonArray; +import javax.json.JsonObject; + +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import static com.google.common.io.Resources.getResource; +import static java.nio.charset.Charset.defaultCharset; +import static java.util.UUID.randomUUID; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; +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.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; + +@ExtendWith(MockitoExtension.class) +public class DefendantTrialRecordSheetRequestedProcessorTest { + + @InjectMocks + private DefendantTrialRecordSheetRequestedProcessor eventProcessor; + + @Mock + private Sender sender; + + @Spy + private final ObjectToJsonObjectConverter objectToJsonObjectConverter = new ObjectToJsonObjectConverter(new ObjectMapperProducer().objectMapper()); + + private final StringToJsonObjectConverter stringToJsonObjectConverter = new StringToJsonObjectConverter(); + + @Captor + private ArgumentCaptor envelopeArgumentCaptor; + @Spy + private UtcClock utcClock; + + @Mock + private FileService fileService; + @Spy + private final JsonObjectToObjectConverter jsonToObjectConverter = new JsonObjectConvertersFactory().jsonObjectToObjectConverter(); + @Mock + ProgressionService progressionService; + @Mock + SystemDocGeneratorService systemDocGeneratorService; + @Test + void process() { + final UUID defendantId = randomUUID(); + final UUID caseId = randomUUID(); + final UUID streamId = randomUUID(); + + JsonObject nameJsonObject = createObjectBuilder() + .add("name", "test name") + .build(); + JsonObject recordSheetPayload = createObjectBuilder() + .add("defendant", nameJsonObject) + .build(); + JsonObject newRecordSheetPayload = createObjectBuilder() + .add("payload", recordSheetPayload) + .build(); + final JsonEnvelope event = envelopeFrom( + metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested").withStreamId(streamId), + objectToJsonObjectConverter.convert(DefendantTrialRecordSheetRequested.defendantTrialRecordSheetRequested() + .withDefendantId(defendantId) + .withCaseId(caseId) + .build())); + + when(progressionService.generateTrialRecordSheetPayload(event, caseId, defendantId)).thenReturn(newRecordSheetPayload); + when(fileService.storePayload(any(JsonObject.class), anyString(), anyString())).thenReturn((randomUUID())); + doNothing().when(systemDocGeneratorService).generateDocument(any(), any()); + + this.eventProcessor.process(event); + verify(sender, times(0)).send(envelopeArgumentCaptor.capture()); + } + + @Test + void shouldProcessForApplication() { + ArgumentCaptor captor = ArgumentCaptor.forClass(DocumentGenerationRequest.class); + final UUID applicationId = randomUUID(); + final UUID caseId = randomUUID(); + final UUID offenceId1 = randomUUID(); + final UUID offenceId2 = randomUUID(); + final UUID fileId1 = randomUUID(); + final UUID fileId2 = randomUUID(); + final JsonEnvelope event = envelopeFrom( + metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested-for-application").withStreamId(applicationId), + objectToJsonObjectConverter.convert(DefendantTrialRecordSheetRequestedForApplication.defendantTrialRecordSheetRequestedForApplication() + .withCaseId(caseId) + .withOffenceIds(Arrays.asList(offenceId1, offenceId2)) + .withCourtApplication(CourtApplication.courtApplication().build()) + .build())); + final JsonObject payload1 = createObjectBuilder().add("caseReference", randomUUID().toString()).build(); + final JsonObject payload2 = createObjectBuilder().add("caseReference", randomUUID().toString()).build(); + final String defendantName1 = "name1"; + final String defendantName2 = "name2"; + when(progressionService.generateTrialRecordSheetPayloadForApplication(event, caseId, Arrays.asList(offenceId1, offenceId2))).thenReturn(JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() + .add("payload", payload1) + .add("defendantName", defendantName1) + .build()) + .add(JsonObjects.createObjectBuilder() + .add("payload", payload2) + .add("defendantName", defendantName2) + .build()) + .build()); + + when(fileService.storePayload(eq(payload1), anyString(), eq("RecordSheet"))).thenReturn((fileId1)); + when(fileService.storePayload(eq(payload2), anyString(), eq("RecordSheet"))).thenReturn((fileId2)); + + eventProcessor.processForApplication(event); + verify(systemDocGeneratorService, times(2)).generateDocument(captor.capture(), eq(event)); + + final Map additionalInformation1 = ImmutableMap.of("caseId", caseId.toString(), "defendantName", defendantName1); + final DocumentGenerationRequest firstRequest = captor.getAllValues().get(0); + assertThat(firstRequest.getPayloadFileServiceId(), is((fileId1))); + assertThat(firstRequest.getAdditionalInformation(), is(additionalInformation1)); + assertThat(firstRequest.getConversionFormat(), is((ConversionFormat.PDF))); + assertThat(firstRequest.getSourceCorrelationId(), is((applicationId.toString()))); + assertThat(firstRequest.getOriginatingSource(), is(("RECORD_SHEET"))); + assertThat(firstRequest.getTemplateIdentifier(), is(("RecordSheet"))); + + final Map additionalInformation2 = ImmutableMap.of("caseId", caseId.toString(), "defendantName", defendantName2); + final DocumentGenerationRequest secondRequest = captor.getAllValues().get(1); + assertThat(secondRequest.getPayloadFileServiceId(), is((fileId2))); + assertThat(secondRequest.getAdditionalInformation(), is(additionalInformation2)); + assertThat(secondRequest.getConversionFormat(), is((ConversionFormat.PDF))); + assertThat(secondRequest.getSourceCorrelationId(), is((applicationId.toString()))); + assertThat(secondRequest.getOriginatingSource(), is(("RECORD_SHEET"))); + assertThat(secondRequest.getTemplateIdentifier(), is(("RecordSheet"))); + } + + @Test + void shouldProcessForApplicationWhenCourtOrderOffencesResultIsUpdated() throws IOException { + ArgumentCaptor captor = ArgumentCaptor.forClass(JsonObject.class); + + final UUID applicationId = randomUUID(); + final UUID caseId = UUID.fromString("09816ffe-38e5-4fe1-af4b-4bee159eb034"); + final UUID offenceId1 = UUID.fromString("0ab230be-f414-46e9-8744-639b4b49a5c6"); + + final UUID fileId1 = randomUUID(); + final JsonEnvelope event = envelopeFrom( + metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested-for-application").withStreamId(applicationId), + new StringToJsonObjectConverter().convert(Resources.toString(getResource("progression.event.defendant-trial-record-sheet-requested-for-application.json"), defaultCharset()))); + + final JsonArray queryResponse = stringToJsonObjectConverter.convert(Resources.toString(getResource("progression.query.record-sheet-for-application.json"), defaultCharset())).getJsonArray("payloads"); + when(progressionService.generateTrialRecordSheetPayloadForApplication(event, caseId, List.of(offenceId1))) + .thenReturn(queryResponse); + + when(fileService.storePayload(any(), anyString(), eq("RecordSheet"))).thenReturn((fileId1)); + + eventProcessor.processForApplication(event); + + verify(fileService).storePayload(captor.capture(), anyString(), eq("RecordSheet")); + final CourtExtractRequested result = jsonToObjectConverter.convert(captor.getValue(), CourtExtractRequested.class); + final CourtExtractRequested expected = jsonToObjectConverter.convert(stringToJsonObjectConverter.convert(Resources.toString(getResource("progression.query.expected.record-sheet-for-application.json"), defaultCharset())), CourtExtractRequested.class); + assertThat(result, is(expected)); + + } } \ No newline at end of file diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessorTest.java index eafeba538..0731a55dc 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantsAddedToCourtProceedingsProcessorTest.java @@ -7,8 +7,8 @@ import static java.util.Collections.singletonList; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; @@ -81,7 +81,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.collect.Lists; @@ -548,16 +548,16 @@ public void shouldIssueDefendantsAddedToCourtProceedingsPublicEvent() { final JsonEnvelope event = envelopeFrom( metadataWithRandomUUID("progression.event.defendants-and-listing-hearing-requests-added"), createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(createObjectBuilder() .add("id", defendantId.toString()) - .add("offences", Json.createArrayBuilder().add(createObjectBuilder() + .add("offences", JsonObjects.createArrayBuilder().add(createObjectBuilder() .add("id", offenceId.toString()) .build()) .build()) .build()) .build()) - .add("listHearingRequests", Json.createArrayBuilder().add(createObjectBuilder() - .add("listDefendantRequests", Json.createArrayBuilder().add(createObjectBuilder() + .add("listHearingRequests", JsonObjects.createArrayBuilder().add(createObjectBuilder() + .add("listDefendantRequests", JsonObjects.createArrayBuilder().add(createObjectBuilder() .add("defendantId", defendantId.toString()) .build()) .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DeleteOffencesFromAllocatedHearingEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DeleteOffencesFromAllocatedHearingEventProcessorTest.java index 51f317bb5..34a608209 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DeleteOffencesFromAllocatedHearingEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DeleteOffencesFromAllocatedHearingEventProcessorTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -20,7 +20,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -51,7 +51,7 @@ public void shouldHandleOffencesRemovedFromExistingAllocatedHearing() { final UUID offenceId2 = randomUUID(); final JsonObject offenceRemovedFromExistingUnallocatedHearing = createObjectBuilder() .add("hearingId", hearingId.toString()) - .add("offenceIds", Json.createArrayBuilder() + .add("offenceIds", JsonObjects.createArrayBuilder() .add(offenceId1.toString()) .add(offenceId2.toString()) .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessorTest.java index c94f38403..6599340da 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FinancialMeansProcessorTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.times; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FormEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FormEventProcessorTest.java index 71f593b35..554d116df 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FormEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/FormEventProcessorTest.java @@ -3,8 +3,8 @@ import static com.google.common.io.Resources.getResource; import static java.nio.charset.Charset.defaultCharset; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessorTest.java index 364ea6999..32c2f28b6 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingConfirmedEventProcessorTest.java @@ -5,7 +5,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -106,7 +106,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; @@ -661,8 +661,8 @@ public void shouldProcessHearingConfirmedForExtendHearing() { when(envelope.payloadAsJsonObject()).thenReturn(payload); when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingConfirmed).thenReturn(hearing); when(progressionService.retrieveHearing(any(), any())).thenReturn(hearing); - when(progressionService.getHearing(any(), any())).thenReturn(Optional.of(Json. - createObjectBuilder().add("hearing", Json.createObjectBuilder().build()) + when(progressionService.getHearing(any(), any())).thenReturn(Optional.of(JsonObjects. + createObjectBuilder().add("hearing", JsonObjects.createObjectBuilder().build()) .add("hearingListingStatus", "HEARING_INITIALISED") .build())); @@ -855,8 +855,8 @@ public void shouldProcessHearingConfirmedForFullyExtendHearing() { when(hearingConfirmed.getConfirmedHearing()).thenReturn(confirmedHearing); when(envelope.payloadAsJsonObject()).thenReturn(payload); when(jsonObjectToObjectConverter.convert(any(JsonObject.class), any())).thenReturn(hearingConfirmed).thenReturn(hearing); - when(progressionService.getHearing(any(), any())).thenReturn(Optional.of(Json. - createObjectBuilder().add("hearing", Json.createObjectBuilder().build()) + when(progressionService.getHearing(any(), any())).thenReturn(Optional.of(JsonObjects. + createObjectBuilder().add("hearing", JsonObjects.createObjectBuilder().build()) .add("hearingListingStatus", "HEARING_INITIALISED") .build())); @@ -1490,9 +1490,9 @@ private Offence createOffence(final UUID offenceId) { private JsonObject createProsecutionCaseJson(final UUID offenceId, final UUID defendantId, final UUID caseId) { return createObjectBuilder() .add("id", caseId.toString()) - .add("defendants", Json.createArrayBuilder().add(createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(createObjectBuilder() .add("id", defendantId.toString()) - .add("offences", Json.createArrayBuilder().add(createObjectBuilder() + .add("offences", JsonObjects.createArrayBuilder().add(createObjectBuilder() .add("id", offenceId.toString()) .build()) .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDaysWithoutCourtCentreCorrectedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDaysWithoutCourtCentreCorrectedProcessorTest.java index c07fd04d8..6e277c407 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDaysWithoutCourtCentreCorrectedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDaysWithoutCourtCentreCorrectedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessorTest.java index 5656a00e6..a677ef310 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingDeletedEventProcessorTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -102,10 +102,10 @@ public void shouldIssueDeleteHearingForProsecutionCaseCommand() { final UUID prosecutionCaseId2 = randomUUID(); final JsonObject hearingDeletedForProsecutionCase = createObjectBuilder() .add("hearingId", hearingId.toString()) - .add("courtApplicationIds", Json.createArrayBuilder() + .add("courtApplicationIds", JsonObjects.createArrayBuilder() .add(courtApplicationId.toString()) .build()) - .add("prosecutionCaseIds", Json.createArrayBuilder() + .add("prosecutionCaseIds", JsonObjects.createArrayBuilder() .add(prosecutionCaseId1.toString()) .add(prosecutionCaseId2.toString()) .build()) @@ -153,7 +153,7 @@ public void shouldCallDeleteCaseCommandFroDeletedCases(){ final JsonObject offencesRemovedFromHearing = createObjectBuilder() .add("hearingId", hearingId.toString()) - .add("prosecutionCaseIds", Json.createArrayBuilder() + .add("prosecutionCaseIds", JsonObjects.createArrayBuilder() .add(prosecutionCaseId1.toString()) .add(prosecutionCaseId2.toString()) .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessorTest.java index e94099cbb..3492e3a4a 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingMarkedAsDuplicateEventProcessorTest.java @@ -5,7 +5,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.core.IsEqual.equalTo; @@ -26,7 +26,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -66,15 +66,15 @@ public void shouldHandleHearingMarkedAsDuplicate() { final String offence2Id = randomUUID().toString(); final JsonObject hearingMarkedAsDuplicate = createObjectBuilder() .add("hearingId", hearingId) - .add("prosecutionCaseIds", Json.createArrayBuilder() + .add("prosecutionCaseIds", JsonObjects.createArrayBuilder() .add(case1Id) .add(case2Id) .build()) - .add("defendantIds", Json.createArrayBuilder() + .add("defendantIds", JsonObjects.createArrayBuilder() .add(defendant1Id) .add(defendant2Id) .build()) - .add("offenceIds", Json.createArrayBuilder() + .add("offenceIds", JsonObjects.createArrayBuilder() .add(offence1Id) .add(offence2Id) .build()) @@ -105,7 +105,7 @@ public void shouldHandleHearingMarkedAsDuplicatePrivateEvent() { final UUID case2Id = randomUUID(); final JsonObject hearingMarkedAsDuplicate = createObjectBuilder() .add("hearingIdToBeDeleted", hearingId.toString()) - .add("caseIds", Json.createArrayBuilder() + .add("caseIds", JsonObjects.createArrayBuilder() .add(case1Id.toString()) .add(case2Id.toString()) .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingNowsEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingNowsEventProcessorTest.java index ca173ba45..a8bdd318f 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingNowsEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingNowsEventProcessorTest.java @@ -12,7 +12,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -35,8 +35,8 @@ public class HearingNowsEventProcessorTest { @Test public void shouldProcessNowNotificationGeneratedEvent() { - final JsonObject requestJson = Json.createObjectBuilder().add("key", "value").build(); - final Metadata metadata = metadataFrom(Json.createObjectBuilder().add("id", ID.toString()).build()) + final JsonObject requestJson = JsonObjects.createObjectBuilder().add("key", "value").build(); + final Metadata metadata = metadataFrom(JsonObjects.createObjectBuilder().add("id", ID.toString()).build()) .withName(PROGRESSION_COMMAND_FOR_NOW_NOTIFICATION_GENERATED) .build(); final JsonEnvelope event = envelopeFrom(metadata, requestJson); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessorTest.java index faa648185..2b96282d6 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingResultedEventProcessorTest.java @@ -5,7 +5,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.nio.charset.Charset.defaultCharset; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessorTest.java index 939238e16..b90730892 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingTrialVacatedEventProcessorTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessorTest.java index 824301fa1..9bfc3b94d 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedCourtroomRemovedEventProcessorTest.java @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.progression.processor; +import uk.gov.justice.services.messaging.JsonObjects; + import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; @@ -376,7 +378,7 @@ private HearingEntity createHearingEntity(final Hearing hearing) { } private JsonObject createJsonObjectWithHearingId() { - return javax.json.Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("hearingId", HEARING_ID.toString()) .build(); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessorTest.java index 233c72833..de1e480f3 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUnallocatedEventProcessorTest.java @@ -5,7 +5,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -22,7 +22,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -55,7 +55,7 @@ public void shouldIssueUnallocateHearingCommand() { final UUID offenceId2 = randomUUID(); final JsonObject hearingUnllocated = createObjectBuilder() .add("hearingId", hearingId.toString()) - .add("offenceIds", Json.createArrayBuilder() + .add("offenceIds", JsonObjects.createArrayBuilder() .add(offenceId1.toString()) .add(offenceId2.toString()) .build()) @@ -86,7 +86,7 @@ public void shouldIssueRemoveHearingForOffenceCommand() { final UUID offenceId2 = randomUUID(); final JsonObject hearingUnllocated = createObjectBuilder() .add("hearingId", hearingId.toString()) - .add("offenceIds", Json.createArrayBuilder() + .add("offenceIds", JsonObjects.createArrayBuilder() .add(offenceId1.toString()) .add(offenceId2.toString()) .build()) @@ -117,7 +117,7 @@ public void shouldHandleOffencesRemovedFromExistingUnallocatedHearing() { final UUID offenceId2 = randomUUID(); final JsonObject offenceRemovedFromExistingUnallocatedHearing = createObjectBuilder() .add("hearingId", hearingId.toString()) - .add("offenceIds", Json.createArrayBuilder() + .add("offenceIds", JsonObjects.createArrayBuilder() .add(offenceId1.toString()) .add(offenceId2.toString()) .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessorTest.java index 9ae74bcf5..7c79b4334 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HearingUpdatedEventProcessorTest.java @@ -6,7 +6,7 @@ import static java.util.Collections.singletonList; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -77,7 +77,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.collect.ImmutableList; @@ -290,7 +290,7 @@ public void shouldHandleAddedNewDefendantToHearing() { public void shouldProcessHearingUpdatedWhenProsecutionCaseListed() { final UUID hearingId = randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("updatedHearing", objectToJsonObjectConverter.convert(ConfirmedHearing.confirmedHearing() .withId(hearingId).build())) .build(); @@ -325,7 +325,7 @@ public void shouldProcessHearingUpdatedWhenProsecutionCaseListed() { public void shouldProcessHearingUpdatedWhenProsecutionCaseListedAndProgressionCasesRemoved() { final UUID hearingId = randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("updatedHearing", objectToJsonObjectConverter.convert(ConfirmedHearing.confirmedHearing() .withId(hearingId).build())) .build(); @@ -359,7 +359,7 @@ public void shouldProcessHearingUpdatedWhenProsecutionCaseListedAndProgressionCa public void shouldProcessHearingUpdatedWhenProsecutionCaseInitialised() { final UUID hearingId = randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("updatedHearing", objectToJsonObjectConverter.convert(ConfirmedHearing.confirmedHearing() .withId(hearingId).build())) .build(); @@ -627,7 +627,7 @@ public void shouldNotSendHearingNotificationsToDefenceAndProsecutor_Notification public void shouldNotProcessHearingUpdatedWhenProsecutionCasesEmpty() { final UUID hearingId = randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("updatedHearing", objectToJsonObjectConverter.convert(ConfirmedHearing.confirmedHearing() .withId(hearingId).build())) .build(); @@ -681,9 +681,9 @@ public void shouldNotProcessHearingAreEmptyUpdatedWhenProsecutionCasesEmpty() { private JsonObject createProsecutionCaseJson(final UUID offenceId, final UUID defendantId, final UUID caseId) { return createObjectBuilder() .add("id", caseId.toString()) - .add("defendants", Json.createArrayBuilder().add(createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(createObjectBuilder() .add("id", defendantId.toString()) - .add("offences", Json.createArrayBuilder().add(createObjectBuilder() + .add("offences", JsonObjects.createArrayBuilder().add(createObjectBuilder() .add("id", offenceId.toString()) .build()) .build()) @@ -719,7 +719,7 @@ public JsonObject getPayload(final String path) { } private static JsonObject getOffence(final String modeoftrial) { - return Json.createObjectBuilder().add(LEGISLATION, "E12") + return JsonObjects.createObjectBuilder().add(LEGISLATION, "E12") .add(LEGISLATION_WELSH, "123") .add(OFFENCE_TITLE, "title-of-offence") .add(WELSH_OFFENCE_TITLE, "welsh-title") diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessorTest.java index 7f709d996..c12e2c039 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/HmiEventProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessorTest.java index 60cb9706f..a49d33054 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/LinkCasesEventProcessorTest.java @@ -31,7 +31,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -85,7 +85,7 @@ public void shouldRaiseReferenceNotFound() { MetadataBuilderFactory.metadataWithRandomUUID("progression.event.validate-link-cases"), casesUnlinkedPayload); - when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of(Json.createObjectBuilder().build())); + when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of(JsonObjects.createObjectBuilder().build())); processor.handleLinkCasesValidations(requestMessage); verify(sender).send(envelopeCaptor.capture()); @@ -114,7 +114,7 @@ public void shouldRaiseReferenceNotValid() { validatePayload); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(CASE_ID, leadCaseId.toString()).build() + JsonObjects.createObjectBuilder().add(CASE_ID, leadCaseId.toString()).build() )); processor.handleLinkCasesValidations(requestMessage); @@ -146,13 +146,13 @@ public void shouldProcessLinkCases() { validatePayload); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(CASE_ID, randomUUID().toString()).build() + JsonObjects.createObjectBuilder().add(CASE_ID, randomUUID().toString()).build() )); when(progressionService.searchLinkedCases(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(LINKED_CASES, Json.createArrayBuilder().build()).build() + JsonObjects.createObjectBuilder().add(LINKED_CASES, JsonObjects.createArrayBuilder().build()).build() )); when(progressionService.getProsecutionCaseDetailById(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().add("id", leadCaseId.toString()).add("prosecutionCaseIdentifier", Json.createObjectBuilder().add("caseURN", leadCaseUrn) + JsonObjects.createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().add("id", leadCaseId.toString()).add("prosecutionCaseIdentifier", JsonObjects.createObjectBuilder().add("caseURN", leadCaseUrn) ).build()).build() )); processor.handleLinkCasesValidations(requestMessage); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessorTest.java index 31c4b9c28..474068963 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ListHearingRequestedProcessorTest.java @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.*; @@ -77,7 +77,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; @@ -624,7 +624,7 @@ public void shouldUpdateYouthOnlyForFirstHearingListingOnPublicListedEvent() { final JsonObject payload = createObjectBuilder() .add("hearingId", hearingId.toString()) .add("hearingType", "PTP") - .add("caseUrns", Json.createArrayBuilder() + .add("caseUrns", JsonObjects.createArrayBuilder() .add(createObjectBuilder().add("caseURN", firstCaseUrn)) .add(createObjectBuilder().add("caseURN", secondCaseUrn))) .build(); @@ -657,10 +657,10 @@ public void shouldUpdateYouthOnlyForFirstHearingListingOnPublicListedEvent() { .build(); final JsonObject hearingsAtAGlance = createObjectBuilder() - .add("hearings", Json.createArrayBuilder() + .add("hearings", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("id", hearingId.toString()) - .add("hearingDays", Json.createArrayBuilder() + .add("hearingDays", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("sittingDay", ZonedDateTime.now().toString()))))) .build(); @@ -715,7 +715,7 @@ public void shouldIgnorePublicListedEventWhenNoCaseUrns() { createObjectBuilder() .add("hearingId", randomUUID().toString()) .add("hearingType", "PTP") - .add("caseUrns", Json.createArrayBuilder()) + .add("caseUrns", JsonObjects.createArrayBuilder()) .build()); listHearingRequestedProcessor.handlePublicHearingListed(requestMessage); @@ -732,7 +732,7 @@ public void shouldNotUpdateYouthWhenNotFirstListingForAnyCase() { final JsonObject payload = createObjectBuilder() .add("hearingId", hearingId) .add("hearingType", "PTP") - .add("caseUrns", Json.createArrayBuilder() + .add("caseUrns", JsonObjects.createArrayBuilder() .add(createObjectBuilder().add("caseURN", caseUrn))) .build(); final JsonEnvelope requestMessage = envelopeFrom( @@ -749,10 +749,10 @@ public void shouldNotUpdateYouthWhenNotFirstListingForAnyCase() { final JsonObject storedCaseJson = createObjectBuilder() .add("prosecutionCase", objectToJsonObjectConverter.convert(storedCase)) .add("hearingsAtAGlance", createObjectBuilder() - .add("hearings", Json.createArrayBuilder() + .add("hearings", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("id", hearingId) - .add("hearingDays", Json.createArrayBuilder() + .add("hearingDays", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("sittingDay", ZonedDateTime.now().toString())))))) .build(); @@ -779,7 +779,7 @@ public void shouldNotUpdateYouthWhenProsecutionCasePayloadMissing() { createObjectBuilder() .add("hearingId", randomUUID().toString()) .add("hearingType", "PTP") - .add("caseUrns", Json.createArrayBuilder() + .add("caseUrns", JsonObjects.createArrayBuilder() .add(createObjectBuilder().add("caseURN", caseUrn))) .build()); @@ -807,7 +807,7 @@ public void shouldNotUpdateYouthWhenFirstListingAndNoDefendants() { createObjectBuilder() .add("hearingId", hearingId) .add("hearingType", "PTP") - .add("caseUrns", Json.createArrayBuilder() + .add("caseUrns", JsonObjects.createArrayBuilder() .add(createObjectBuilder().add("caseURN", caseUrn))) .build()); @@ -815,10 +815,10 @@ public void shouldNotUpdateYouthWhenFirstListingAndNoDefendants() { final JsonObject storedCaseJson = createObjectBuilder() .add("prosecutionCase", objectToJsonObjectConverter.convert(storedCase)) .add("hearingsAtAGlance", createObjectBuilder() - .add("hearings", Json.createArrayBuilder() + .add("hearings", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("id", hearingId) - .add("hearingDays", Json.createArrayBuilder() + .add("hearingDays", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("sittingDay", ZonedDateTime.now().toString())))))) .build(); @@ -889,7 +889,7 @@ public JsonObject getPayload(final String path) { } private static JsonObject getOffence(final String modeoftrial) { - return Json.createObjectBuilder().add(LEGISLATION, "E12") + return JsonObjects.createObjectBuilder().add(LEGISLATION, "E12") .add(LEGISLATION_WELSH, "123") .add(OFFENCE_TITLE, "title-of-offence") .add(WELSH_OFFENCE_TITLE, "welsh-title") diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessorTest.java index f94d3bbf2..658fe1015 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/MergeCasesEventProcessorTest.java @@ -32,7 +32,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -95,7 +95,7 @@ public void shouldRaiseReferenceNotFound() { MetadataBuilderFactory.metadataWithRandomUUID("progression.event.validate-link-cases"), validatePayload); - when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of(Json.createObjectBuilder().build())); + when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of(JsonObjects.createObjectBuilder().build())); processor.handleMergeCasesValidations(requestMessage); verify(sender).send(envelopeCaptor.capture()); @@ -122,7 +122,7 @@ public void shouldRaiseReferenceNotValid() { validatePayload); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(CASE_ID, leadCaseId.toString()).build() + JsonObjects.createObjectBuilder().add(CASE_ID, leadCaseId.toString()).build() )); processor.handleMergeCasesValidations(requestMessage); @@ -150,13 +150,13 @@ public void shouldProcessValidateCases() { casesUnlinkedPayload); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(CASE_ID, randomUUID().toString()).build() + JsonObjects.createObjectBuilder().add(CASE_ID, randomUUID().toString()).build() )); when(progressionService.searchLinkedCases(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(MERGED_CASES, Json.createArrayBuilder().build()).build() + JsonObjects.createObjectBuilder().add(MERGED_CASES, JsonObjects.createArrayBuilder().build()).build() )); when(progressionService.getProsecutionCaseDetailById(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add("prosecutionCase", Json.createObjectBuilder().add("id", leadCaseId.toString()).add("prosecutionCaseIdentifier", Json.createObjectBuilder().add("caseURN", leadCaseUrn) + JsonObjects.createObjectBuilder().add("prosecutionCase", JsonObjects.createObjectBuilder().add("id", leadCaseId.toString()).add("prosecutionCaseIdentifier", JsonObjects.createObjectBuilder().add("caseURN", leadCaseUrn) ).build()).build() )); processor.handleMergeCasesValidations(requestMessage); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessorTest.java index ad8598ff4..7f105d9ae 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NextHearingEventProcessorTest.java @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessorTest.java index 347fed18e..3bbf9bf3a 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationNotifyEventProcessorTest.java @@ -5,7 +5,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessorTest.java index 8139af7fc..30cac54f1 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NotificationRequestProcessorTest.java @@ -2,8 +2,8 @@ import static java.util.Optional.empty; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.is; @@ -28,7 +28,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -121,7 +121,7 @@ public void shouldEmailDocument() { .add("postage", false) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("notifications", createArrayBuilder() .add(notification) .build()) @@ -147,7 +147,7 @@ public void shouldEmailDocumentForOnlinePlea() { final String urn = "AB1243"; final String email = "email@hmcts.net"; - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("systemDocGeneratorId", materialId.toString()) .add("notificationId", notificationId.toString()) .add("caseId", caseId.toString()) @@ -179,7 +179,7 @@ public void shouldNotifyDefendantAboutPleaSubmission() { final String email = "email@hmcts.net"; final String postcode = "CR0 5QT"; - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()) .add("email", email) .add("urn", urn) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsMaterialStatusEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsMaterialStatusEventProcessorTest.java index 39290a57a..9857623c0 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsMaterialStatusEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsMaterialStatusEventProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -19,7 +19,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -74,7 +74,7 @@ public void shouldProcessStatusUpdatedForEmail() { .add("secondClassLetter", false) .add("isNotificationApi", false) .add("isCps", false) - .add("emailNotifications", Json.createArrayBuilder() + .add("emailNotifications", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("sendToAddress", "sendToAddress") .build()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessorTest.java index ec0c1773d..441d1d764 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/NowsRequestedEventProcessorTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonassert.JsonAssert.with; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; @@ -52,7 +52,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -122,7 +122,7 @@ public static NowDocumentRequest nowsRequestedTemplateWithNonVisibleUsers() { } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } @BeforeEach @@ -358,11 +358,11 @@ private JsonEnvelope envelope(final NowDocumentRequested nowDocumentRequested) { } private void initReferenceData() { - final JsonObject docTypeData = Json.createObjectBuilder() + final JsonObject docTypeData = JsonObjects.createObjectBuilder() .add("section", COURT_FINAL_ORDERS) .add("seqNum", 3) .add("courtDocumentTypeRBAC", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("uploadUserGroups", createArrayBuilder().build()) .add("readUserGroups", createArrayBuilder() .add(buildUserGroup(MAGISTRATES)) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessorTest.java index 27a5558a5..bc611a013 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OnlinePleaEventProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.any; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OpaNoticeProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OpaNoticeProcessorTest.java index 65e4097e5..d473581ef 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OpaNoticeProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/OpaNoticeProcessorTest.java @@ -30,7 +30,7 @@ import java.time.ZonedDateTime; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.CoreMatchers; @@ -223,7 +223,7 @@ private JsonEnvelope getJsonEnvelop(final String commandName) { .withName(commandName) .withId(randomUUID()) .build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); } private void verifyOpaNoticeSentContents(final Envelope envelope, final JsonObject opaNoticeSent, final String event) { diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessorTest.java index b1c78bfe7..6d76c0cef 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PetFormEventProcessorTest.java @@ -6,8 +6,8 @@ import static java.nio.charset.Charset.defaultCharset; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PleaUpdatedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PleaUpdatedEventProcessorTest.java index 052ea80e6..721830ed5 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PleaUpdatedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PleaUpdatedEventProcessorTest.java @@ -14,7 +14,7 @@ import java.io.StringReader; import java.util.function.Consumer; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -59,6 +59,6 @@ private void verifyCommandHandlerCalled(final String expectedPayload) { } private JsonObject toJsonObject(final String value) { - return Json.createReader(new StringReader(value)).readObject(); + return JsonObjects.createReader(new StringReader(value)).readObject(); } } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessorTest.java index 88a62d315..0c4091688 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PrisonCourtRegisterEventProcessorTest.java @@ -1,15 +1,21 @@ package uk.gov.moj.cpp.progression.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.Spy; -import org.mockito.junit.jupiter.MockitoExtension; +import static java.util.Collections.singletonList; +import static java.util.UUID.randomUUID; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.anyString; +import static org.hamcrest.Matchers.notNullValue; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.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.test.utils.core.reflection.ReflectionUtil.setField; +import static uk.gov.moj.cpp.progression.helper.LinkSplitMergeHelper.CASE_ID; + import uk.gov.justice.core.courts.PrisonCourtRegisterGenerated; import uk.gov.justice.core.courts.PrisonCourtRegisterGeneratedV2; import uk.gov.justice.core.courts.PrisonCourtRegisterRecorded; @@ -37,30 +43,26 @@ import uk.gov.moj.cpp.progression.service.amp.dto.PcrEventPayload; import uk.gov.moj.cpp.progression.service.amp.mappers.HearingResultsDocumentSubscriptionPCRMapper; import uk.gov.moj.cpp.progression.service.amp.service.HearingResultsDocumentSubscriptionClient; - -import javax.json.Json; -import javax.json.JsonObject; -import javax.ws.rs.core.Response; import java.time.Instant; import java.time.ZonedDateTime; import java.util.Optional; import java.util.UUID; -import static java.util.Collections.singletonList; -import static java.util.UUID.randomUUID; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.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.test.utils.core.reflection.ReflectionUtil.setField; -import static uk.gov.moj.cpp.progression.helper.LinkSplitMergeHelper.CASE_ID; +import javax.ws.rs.core.Response; + +import uk.gov.justice.services.messaging.JsonObjects; +import javax.json.JsonObject; + +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.Spy; +import org.mockito.junit.jupiter.MockitoExtension; @ExtendWith(MockitoExtension.class) public class PrisonCourtRegisterEventProcessorTest { @@ -93,7 +95,6 @@ public class PrisonCourtRegisterEventProcessorTest { HearingResultsDocumentSubscriptionPCRMapper hearingResultsDocumentSubscriptionPCRMapper; @Mock HearingResultsDocumentSubscriptionClient hearingResultsDocumentSubscriptionClient; - @Spy private final JsonObjectToObjectConverter jsonToObjectConverter = new JsonObjectConvertersFactory().jsonObjectToObjectConverter(); @Mock @@ -152,9 +153,9 @@ public void shouldGeneratePrisonCourtRegister() { doNothing().when(systemDocGeneratorService).generateDocument(any(DocumentGenerationRequest.class), any(JsonEnvelope.class)); - when(prisonCourtRegisterPdfPayloadGenerator.mapPayload(any(JsonObject.class))).thenReturn(Json.createObjectBuilder().build()); + when(prisonCourtRegisterPdfPayloadGenerator.mapPayload(any(JsonObject.class))).thenReturn(JsonObjects.createObjectBuilder().build()); when(progressionService.caseExistsByCaseUrn(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(CASE_ID, randomUUID().toString()).build() + JsonObjects.createObjectBuilder().add(CASE_ID, randomUUID().toString()).build() )); prisonCourtRegisterEventProcessor.generatePrisonCourtRegister(requestMessage); @@ -221,7 +222,7 @@ public void shouldSendPrisonCourtRegisterV2() throws InterruptedException { MetadataBuilder metadata = MetadataBuilderFactory.metadataWithDefaults(); final JsonObject jsonObject = objectToJsonObjectConverter.convert(prisonCourtRegisterGenerated); - JsonObject jsonObjectWithId = Json.createObjectBuilder(jsonObject).add("id", prisonCourtRegisterId).build(); + JsonObject jsonObjectWithId = JsonObjects.createObjectBuilder(jsonObject).add("id", prisonCourtRegisterId).build(); final JsonEnvelope requestMessage = envelopeFrom(metadata, jsonObjectWithId); PcrEventPayload pcrEventPayload = PcrEventPayload.builder() .materialId(randomUUID()) @@ -348,7 +349,6 @@ public void shouldSendPrisonCourtRegisterV2WithMissingCreatedAtUsesCurrentTime() verify(hearingResultsDocumentSubscriptionClient).post("http://hrds-address", pcrEventPayload); verify(hearingResultsDocumentSubscriptionPCRMapper).mapPcrForhearingResultsDocument(any(PrisonCourtRegisterGeneratedV2.class), eq("test@hmcst.net"), any(Instant.class)); } - @Test public void shouldSendPrisonCourtRegisterWithDefendantHasNoDateOfBirth() { final UUID fileId = randomUUID(); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProbationCaseworkerProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProbationCaseworkerProcessorTest.java index 6f3b03e3f..2b8f8023d 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProbationCaseworkerProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProbationCaseworkerProcessorTest.java @@ -16,7 +16,7 @@ import java.io.IOException; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -58,7 +58,7 @@ public void shouldProcessHearingPopulatedToProbationCaseworker() throws IOExcept when(restEasyClientService.post(eq(HEARING_DETAILS_URL), any(), any())).thenReturn(response); final JsonObject hearing = stringToJsonObjectConverter.convert(Resources.toString(getResource("hearing.json"), defaultCharset())); - final JsonObject payload = Json.createObjectBuilder().add("hearing", hearing).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("hearing", hearing).build(); final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.events.hearing-populated-to-probation-caseworker"), @@ -79,7 +79,7 @@ public void shouldProcessDeletedHearingPopulatedToProbationCaseworker() throws I when(restEasyClientService.post(eq(HEARING_DELETED_URL), any(), any())).thenReturn(response); final JsonObject hearing = stringToJsonObjectConverter.convert(Resources.toString(getResource("hearing.json"), defaultCharset())); - final JsonObject payload = Json.createObjectBuilder().add("hearing", hearing).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("hearing", hearing).build(); final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.events.hearing-populated-to-probation-caseworker"), diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseCreatedInHearingEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseCreatedInHearingEventProcessorTest.java index 192fe0124..9ccb978e6 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseCreatedInHearingEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseCreatedInHearingEventProcessorTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessorTest.java index 2fe7d0aa6..50b7b06ab 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutionCaseDefendantUpdatedProcessorTest.java @@ -4,8 +4,8 @@ import static java.nio.charset.Charset.defaultCharset; import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -53,7 +53,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.io.Resources; @@ -157,7 +157,7 @@ public void shouldHandleDefendantCustodialInformationUpdatedEvent_WhenDifferentC .thenReturn(defendantCustodialInformationUpdateRequested); when(objectToJsonObjectConverter.convert(Mockito.any(uk.gov.moj.cpp.progression.events.CustodialEstablishment.class))).thenReturn(payload); when(progressionService.searchLinkedCases(any(), anyString())).thenReturn(Optional.of( - Json.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, Json.createArrayBuilder() + JsonObjects.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add(CASE_ID, randomUUID().toString()) .add(CASE_URN, "caseIdProsecutionCaseService") @@ -212,7 +212,7 @@ public void shouldHandleDefendantCustodialInformationUpdatedEvent_WhenSameCase_D when(objectToJsonObjectConverter.convert(Mockito.any(DefendantCustodialInformationUpdateRequested.class))).thenReturn(payload); when(objectToJsonObjectConverter.convert(Mockito.any(uk.gov.moj.cpp.progression.events.CustodialEstablishment.class))).thenReturn(payload); when(progressionService.searchLinkedCases(any(), anyString())).thenReturn(Optional.of( - Json.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, Json.createArrayBuilder() + JsonObjects.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add(CASE_ID, caseIdProsecutionCaseService) .add(CASE_URN, "caseIdProsecutionCaseService") @@ -266,7 +266,7 @@ public void shouldHandleDefendantCustodialInformationUpdatedEvent_WhenSameCase_S .thenReturn(defendantCustodialInformationUpdateRequested); when(objectToJsonObjectConverter.convert(Mockito.any(uk.gov.moj.cpp.progression.events.CustodialEstablishment.class))).thenReturn(payload); when(progressionService.searchLinkedCases(any(), anyString())).thenReturn(Optional.of( - Json.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, Json.createArrayBuilder() + JsonObjects.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add(CASE_ID, caseIdProsecutionCaseService) .add(CASE_URN, "caseIdProsecutionCaseService") @@ -315,7 +315,7 @@ public void shouldHandleDefendantCustodialInformationUpdatedEvent_WhenNoMatching when(jsonObjectConverter.convert(any(), eq(DefendantCustodialInformationUpdateRequested.class))) .thenReturn(defendantCustodialInformationUpdateRequested); when(progressionService.searchLinkedCases(any(), anyString())).thenReturn(Optional.of( - Json.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, Json.createArrayBuilder() + JsonObjects.createObjectBuilder().add(MATCHED_DEFENDANT_CASES, JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add(CASE_ID, caseIdProsecutionCaseService) .add(CASE_URN, "caseIdProsecutionCaseService") diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessorTest.java index 5faed4bbc..a8d0fa4e9 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/ProsecutorCaseCpsProsecutorUpdatedEventProcessorTest.java @@ -2,8 +2,8 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PublishCourtListEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PublishCourtListEventProcessorTest.java index 77ac50c09..3e2e7d248 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PublishCourtListEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/PublishCourtListEventProcessorTest.java @@ -3,7 +3,7 @@ import static com.google.common.io.Resources.getResource; import static java.nio.charset.Charset.defaultCharset; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/RelatedHearingEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/RelatedHearingEventProcessorTest.java index 8dee35ea8..c87e76252 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/RelatedHearingEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/RelatedHearingEventProcessorTest.java @@ -35,7 +35,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -198,7 +198,7 @@ public void shouldIssueUpdateRelatedHearingCommandToListingContextAndHearingCont public void shouldHandlePublicCasesAddedForUpdatedRelatedHearing() { final String hearingId = randomUUID().toString(); final String seedingHearingId = randomUUID().toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("hearingId", hearingId) .add("seedingHearingId", seedingHearingId).build(); final JsonEnvelope event = envelopeFrom( diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SendStatDecAppointmentLetterProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SendStatDecAppointmentLetterProcessorTest.java index c14cf416a..9b6f3c70e 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SendStatDecAppointmentLetterProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SendStatDecAppointmentLetterProcessorTest.java @@ -2,7 +2,7 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessorTest.java index 3c3347deb..364e9df4a 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SplitCasesEventProcessorTest.java @@ -29,7 +29,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -88,8 +88,8 @@ public void shouldRaiseReferenceAlreadyLinked() { MetadataBuilderFactory.metadataWithRandomUUID("progression.event.validate-split-cases"), validatePayload); - when(progressionService.searchLinkedCases(any(), any())).thenReturn(Optional.of(Json.createObjectBuilder().add(SPLIT_CASES, Json.createArrayBuilder().add( - Json.createObjectBuilder().add(CASE_URN, String.join(",", caseUrnsToSplit))).build()).build())); + when(progressionService.searchLinkedCases(any(), any())).thenReturn(Optional.of(JsonObjects.createObjectBuilder().add(SPLIT_CASES, JsonObjects.createArrayBuilder().add( + JsonObjects.createObjectBuilder().add(CASE_URN, String.join(",", caseUrnsToSplit))).build()).build())); processor.handleSplitCasesValidations(requestMessage); verify(sender).send(envelopeCaptor.capture()); @@ -120,7 +120,7 @@ public void shouldProcessValidateCases() { validatePayload); when(progressionService.searchLinkedCases(any(), any())).thenReturn(Optional.of( - Json.createObjectBuilder().add(SPLIT_CASES, Json.createArrayBuilder().build()).build() + JsonObjects.createObjectBuilder().add(SPLIT_CASES, JsonObjects.createArrayBuilder().build()).build() )); processor.handleSplitCasesValidations(requestMessage); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessorTest.java index 911825c4e..f9a123e1a 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/StagingEnforcementAcknowledgmentEventProcessorTest.java @@ -18,7 +18,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -63,18 +63,18 @@ public void shouldProcessAcknowledgementWhenOriginatorIsCourts() { final String requestId = UUID.randomUUID().toString(); final String materialId_1 = UUID.randomUUID().toString(); final String materialId_2 = UUID.randomUUID().toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("originator", "courts") - .add("acknowledgement", Json.createObjectBuilder().add("accountNumber", 1234) + .add("acknowledgement", JsonObjects.createObjectBuilder().add("accountNumber", 1234) .build()) .add("requestId", requestId).build(); when(envelope.metadata()).thenReturn(Envelope.metadataBuilder().withId(UUID.randomUUID()).withName("public.stagingenforcement.enforce-financial-imposition-acknowledgement").build()); when(envelope.payloadAsJsonObject()).thenReturn(payload); - final JsonArray jsonResponseArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_1).add("payload", "").build()) - .add(Json.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_2).add("payload", "").build()) + final JsonArray jsonResponseArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_1).add("payload", "").build()) + .add(JsonObjects.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_2).add("payload", "").build()) .build(); - JsonObject jsonObject = Json.createObjectBuilder().add("nowDocumentRequests", jsonResponseArray).build(); + JsonObject jsonObject = JsonObjects.createObjectBuilder().add("nowDocumentRequests", jsonResponseArray).build(); when(queryResponseEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); when(requester.request(any(Envelope.class))).thenReturn(queryResponseEnvelope); eventProcessor.processAcknowledgement(envelope); @@ -87,18 +87,18 @@ public void shouldProcessEnforcementAcknowledgementErrorWhenOriginatorIsCourts() final String requestId = UUID.randomUUID().toString(); final String materialId_1 = UUID.randomUUID().toString(); final String materialId_2 = UUID.randomUUID().toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("originator", "courts") - .add("acknowledgement", Json.createObjectBuilder().add("errorCode", "ERR1234").add("errorMessage", "post code is invalid") + .add("acknowledgement", JsonObjects.createObjectBuilder().add("errorCode", "ERR1234").add("errorMessage", "post code is invalid") .build()) .add("requestId", requestId).build(); when(envelope.metadata()).thenReturn(Envelope.metadataBuilder().withId(UUID.randomUUID()).withName("public.stagingenforcement.enforce-financial-imposition-acknowledgement").build()); when(envelope.payloadAsJsonObject()).thenReturn(payload); - final JsonArray jsonResponseArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_1).add("payload", "").build()) - .add(Json.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_2).add("payload", "").build()) + final JsonArray jsonResponseArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_1).add("payload", "").build()) + .add(JsonObjects.createObjectBuilder().add("requestId", requestId).add("materialId", materialId_2).add("payload", "").build()) .build(); - JsonObject jsonObject = Json.createObjectBuilder().add("nowDocumentRequests", jsonResponseArray).build(); + JsonObject jsonObject = JsonObjects.createObjectBuilder().add("nowDocumentRequests", jsonResponseArray).build(); when(queryResponseEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); when(requester.request(any(Envelope.class))).thenReturn(queryResponseEnvelope); eventProcessor.processAcknowledgement(envelope); @@ -109,15 +109,15 @@ public void shouldProcessEnforcementAcknowledgementErrorWhenOriginatorIsCourts() @Test public void shouldNotProcessEnforcementAcknowledgementWhenNoMaterialsForRequestId() { final String requestId = UUID.randomUUID().toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("originator", "courts") - .add("acknowledgement", Json.createObjectBuilder().add("accountNumber", 1234) + .add("acknowledgement", JsonObjects.createObjectBuilder().add("accountNumber", 1234) .build()) .add("requestId", requestId).build(); when(envelope.metadata()).thenReturn(Envelope.metadataBuilder().withId(UUID.randomUUID()).withName("public.stagingenforcement.enforce-financial-imposition-acknowledgement").build()); when(envelope.payloadAsJsonObject()).thenReturn(payload); - JsonObject jsonObject = Json.createObjectBuilder().add("nowDocumentRequests", Json.createArrayBuilder().build()).build(); + JsonObject jsonObject = JsonObjects.createObjectBuilder().add("nowDocumentRequests", JsonObjects.createArrayBuilder().build()).build(); when(queryResponseEnvelope.payloadAsJsonObject()).thenReturn(jsonObject); when(requester.request(any(Envelope.class))).thenReturn(queryResponseEnvelope); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SummonsDataPreparedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SummonsDataPreparedEventProcessorTest.java index 2cb5c9e66..22e95583e 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SummonsDataPreparedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SummonsDataPreparedEventProcessorTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.singletonList; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessorTest.java index 577d322d7..95477cb38 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/SystemDocGeneratorEventProcessorTest.java @@ -2,8 +2,8 @@ import static java.lang.Boolean.FALSE; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -161,7 +161,7 @@ public void shouldProcessPrisonCourtRegisterDocumentAvailable() throws FileServi .add(createObjectBuilder().add(PROPERTY_NAME, "caseId").add(PROPERTY_VALUE, randomUUID().toString())) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(ORIGINATING_SOURCE, "PRISON_COURT_REGISTER") .add(TEMPLATE_IDENTIFIER, "OEE_Layout5") .add(CONVERSION_FORMAT, "pdf") @@ -204,7 +204,7 @@ public void shouldProcessRecordSheetDocumentAvailable() throws FileServiceExcept final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("public.systemdocgenerator.events.document-available"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(ORIGINATING_SOURCE, RECORD_SHEET_ORIG_SOURCE) .add(TEMPLATE_IDENTIFIER, RECORD_SHEET_TEMPLATE) .add(CONVERSION_FORMAT, "pdf") @@ -246,7 +246,7 @@ public void shouldFailedPrisonCourtRegister() { final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("public.systemdocgenerator.events.generation-failed"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(ORIGINATING_SOURCE, "PRISON_COURT_REGISTER") .add(TEMPLATE_IDENTIFIER, "OEE_Layout5") .add(CONVERSION_FORMAT, "pdf") @@ -283,7 +283,7 @@ public void shouldProcessNowsDocumentAvailableWhenOriginatingSourceIsNows() thro final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("public.systemdocgenerator.events.document-available"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(ORIGINATING_SOURCE, "NOWs") .add(TEMPLATE_IDENTIFIER, "OEE_Layout6") .add(CONVERSION_FORMAT, "pdf") @@ -317,7 +317,7 @@ public void shouldProcessNowsFailedToGenerateWhenOriginatingSourceIsNows() { final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("public.systemdocgenerator.events.generation-failed"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(ORIGINATING_SOURCE, "NOWs") .add(TEMPLATE_IDENTIFIER, "OEE_Layout6") .add(CONVERSION_FORMAT, "pdf") @@ -350,7 +350,7 @@ public void shouldNotProcessNowsDocumentAvailableWhenOriginatingSourceIsNotNows( final UUID systemDocGeneratorId = UUID.randomUUID(); final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("public.systemdocgenerator.events.document-available"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(ORIGINATING_SOURCE, "NOWS_DOCUMENTS") .add(TEMPLATE_IDENTIFIER, "OEE_Layout6") .add(CONVERSION_FORMAT, "pdf") @@ -370,7 +370,7 @@ public void shouldNotProcessNowsFailedToGenerateWhenOriginatingSourceIsNotNows() final UUID fileId = UUID.randomUUID(); final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("public.systemdocgenerator.events.generation-failed"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(ORIGINATING_SOURCE, "NOWS_DOCUMENTS") .add(TEMPLATE_IDENTIFIER, "OEE_Layout6") .add(CONVERSION_FORMAT, "pdf") @@ -387,7 +387,7 @@ public void shouldNotProcessNowsFailedToGenerateWhenOriginatingSourceIsNotNows() } private Metadata getMetadataFrom(final String userId, final UUID courtCentreId) { - return metadataFrom(Json.createObjectBuilder() + return metadataFrom(JsonObjects.createObjectBuilder() .add("court_register", courtCentreId.toString()) .add(JsonMetadata.ID, randomUUID().toString()) .add(HeaderConstants.USER_ID, userId) @@ -396,7 +396,7 @@ private Metadata getMetadataFrom(final String userId, final UUID courtCentreId) } private JsonObject documentAvailablePayload(final UUID templatePayloadId, final String templateIdentifier, final String reportId, final UUID generatedDocumentId, final String originatingSource) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(PAYLOAD_FILE_SERVICE_ID, templatePayloadId.toString()) .add(TEMPLATE_IDENTIFIER, templateIdentifier) .add(CONVERSION_FORMAT, "pdf") diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/UnscheduledHearingAllocationNotifiedEventProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/UnscheduledHearingAllocationNotifiedEventProcessorTest.java index c7c403683..d6b3678d8 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/UnscheduledHearingAllocationNotifiedEventProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/UnscheduledHearingAllocationNotifiedEventProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalToIgnoringCase; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessorTest.java index 42f1e1f6c..26800bae6 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/VejCaseworkerProcessorTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.io.StringReader; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonReader; @@ -93,7 +93,7 @@ public void shouldProcessVejHearingPopulatedToProbationCaseworker() throws IOExc verify(restEasyClientService).post(eq(VEJ_HEARING_DETAILS_URL), envelopeArgumentCaptor.capture(), any()); final String argumentCaptor = envelopeArgumentCaptor.getValue(); - final JsonReader jsonReader = Json.createReader(new StringReader(argumentCaptor)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(argumentCaptor)); final JsonObject externalPayload = jsonReader.readObject(); jsonReader.close(); final JsonObject hearingObj = (JsonObject) externalPayload.get(HEARING); @@ -106,7 +106,7 @@ public void shouldProcessVejHearingPopulatedToProbationCaseworker() throws IOExc @Test public void shouldProcessVejHearingPopulatedToProbationCaseworkerNegative() throws IOException { final JsonObject hearing = stringToJsonObjectConverter.convert(Resources.toString(getResource("vep-non-hearing.json"), defaultCharset())); - final JsonObject payload = Json.createObjectBuilder().add("hearing", hearing).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("hearing", hearing).build(); final JsonEnvelope jsonEnvelope = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.events.vej-hearing-populated-to-probation-caseworker"), @@ -121,7 +121,7 @@ public void shouldProcessVejHearingPopulatedToProbationCaseworkerNegative() thro @Test public void shouldProcessVejDeletedHearingPopulatedToProbationCaseworkerNegative() throws IOException { final JsonObject hearing = stringToJsonObjectConverter.convert(Resources.toString(getResource("vep-non-hearing.json"), defaultCharset())); - final JsonObject payload = Json.createObjectBuilder().add("hearing", hearing).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("hearing", hearing).build(); when(referenceDataService.getPoliceFlag(anyString(), anyString(), eq(requester))).thenReturn(false); @@ -148,7 +148,7 @@ public void shouldProcessVejDeletedHearingPopulatedToProbationCaseworker() throw verify(restEasyClientService).post(eq(VEJ_HEARING_DELETED_URL), envelopeArgumentCaptor.capture(), any()); final String argumentCaptor = envelopeArgumentCaptor.getValue(); - final JsonReader jsonReader = Json.createReader(new StringReader(argumentCaptor)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(argumentCaptor)); final JsonObject externalPayload = jsonReader.readObject(); jsonReader.close(); final JsonObject hearingObj = (JsonObject) externalPayload.get(HEARING); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessorTest.java index fb2ab638b..ab3eff5d5 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentAddedProcessorTest.java @@ -3,8 +3,8 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertNull; @@ -46,7 +46,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -147,11 +147,11 @@ private static JsonObject buildMaterial() { } private static JsonObject buildDocumentTypeDataWithRBAC() { - return Json.createObjectBuilder() - .add("documentAccess", Json.createArrayBuilder().add("Listing Officer")) - .add("canCreateUserGroups", Json.createArrayBuilder().add("Listing Officer")) - .add("readUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates").add("Defence Lawyers")) - .add("canDownloadUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates")) + return JsonObjects.createObjectBuilder() + .add("documentAccess", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("canCreateUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("readUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates").add("Defence Lawyers")) + .add("canDownloadUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates")) .build(); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessorTest.java index 6c8e27916..48e03ebcc 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentReviewRequiredProcessorTest.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentSharedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentSharedProcessorTest.java index 61dbdd280..66007506d 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentSharedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentSharedProcessorTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.processor.document; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUpdatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUpdatedProcessorTest.java index 89b15a62b..d34b0712d 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUpdatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/CourtDocumentUpdatedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor.document; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessorTest.java index 927a7449f..f300563ee 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/document/DefendantBailDocumentCreatedProcessorTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor.document; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/helper/DataPreparedEventProcessorTestHelper.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/helper/DataPreparedEventProcessorTestHelper.java index 9a1127f8f..d6b647d29 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/helper/DataPreparedEventProcessorTestHelper.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/helper/DataPreparedEventProcessorTestHelper.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.processor.helper; import static com.google.common.collect.Lists.newArrayList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/CourtDocumentObjectServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/CourtDocumentObjectServiceTest.java index 891c0aaa9..5a6ba4e48 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/CourtDocumentObjectServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/CourtDocumentObjectServiceTest.java @@ -2,7 +2,7 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsHearingRequestServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsHearingRequestServiceTest.java index 7b02be40e..053409aa7 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsHearingRequestServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsHearingRequestServiceTest.java @@ -2,7 +2,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsServiceTest.java index 307157a3a..eb1941da5 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/summons/SummonsServiceTest.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -44,7 +44,7 @@ public void shouldPopulateProsecutorInformationFromReferenceData() { .withProsecutionAuthorityId(UUID.randomUUID()) .build(); - final JsonObject jsonObject = Json.createObjectBuilder().build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().build(); when(referenceDataService.getProsecutor(envelope, prosecutionCaseIdentifier.getProsecutionAuthorityId(), requester)).thenReturn(Optional.of(jsonObject)); summonsService.getProsecutor(envelope, prosecutionCaseIdentifier); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/util/FileUtil.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/util/FileUtil.java index 6965f469b..573798970 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/util/FileUtil.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/util/FileUtil.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.processor.util; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; import static org.junit.jupiter.api.Assertions.fail; @@ -10,7 +10,7 @@ import java.io.InputStream; import java.io.StringReader; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -38,7 +38,7 @@ public static String getPayload(final String path) { } public static JsonObject jsonFromString(String jsonObjectStr) { - JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CourtApplicationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CourtApplicationServiceTest.java index 33c67b3f6..b95f83724 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CourtApplicationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CourtApplicationServiceTest.java @@ -15,7 +15,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -53,11 +53,11 @@ public void setUp() { @Test public void shouldReturnCourtApplicationPartyWhenProsecutingAuthorityDataExists() { // Mocking the JSON response from referenceDataService - JsonObject prosecutorJson = Json.createObjectBuilder() + JsonObject prosecutorJson = JsonObjects.createObjectBuilder() .add("fullName", "John Doe") .add("nameWelsh", "Ioan Dda") .add("contactEmailAddress", "john.doe@test.com") - .add("address", Json.createObjectBuilder() + .add("address", JsonObjects.createObjectBuilder() .add("line1", "123 Main St") .add("line2", "Apt 4B") .add("postcode", "SW1A 1AA") diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsEmailNotificationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsEmailNotificationServiceTest.java index 621ef7cd0..d4621a755 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsEmailNotificationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsEmailNotificationServiceTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsRestNotificationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsRestNotificationServiceTest.java index 7c7574376..e26a40477 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsRestNotificationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/CpsRestNotificationServiceTest.java @@ -2,7 +2,7 @@ import static com.google.common.io.Resources.getResource; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentCaptor.forClass; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefenceNotificationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefenceNotificationServiceTest.java index eb5ee6e22..ddd10db8c 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefenceNotificationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefenceNotificationServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; @@ -26,7 +26,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -337,11 +337,11 @@ private static JsonObject buildMaterial() { } private static JsonObject buildDocumentTypeDataWithRBAC() { - return Json.createObjectBuilder() - .add("documentAccess", Json.createArrayBuilder().add("Listing Officer")) - .add("canCreateUserGroups", Json.createArrayBuilder().add("Listing Officer")) - .add("canReadUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates")) - .add("canDownloadUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates")) + return JsonObjects.createObjectBuilder() + .add("documentAccess", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("canCreateUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("canReadUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates")) + .add("canDownloadUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates")) .build(); } } \ No newline at end of file diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefendantUpdateDifferenceServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefendantUpdateDifferenceServiceTest.java index b2af44b3b..9b855871f 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefendantUpdateDifferenceServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DefendantUpdateDifferenceServiceTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import uk.gov.justice.core.courts.Defendant; import uk.gov.justice.core.courts.DefendantUpdate; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorServiceTest.java index 6d8fe5858..cfcf077b0 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/DocumentGeneratorServiceTest.java @@ -51,7 +51,7 @@ import java.util.Set; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -251,17 +251,17 @@ public void shouldGenerateNces() throws Exception { } private JsonObject createNowDocumentContent() { - return Json.createObjectBuilder() - .add("defendant", Json.createObjectBuilder().add("address", Json.createObjectBuilder().add("emailAddress1", "emailAddress1@test.com") + return JsonObjects.createObjectBuilder() + .add("defendant", JsonObjects.createObjectBuilder().add("address", JsonObjects.createObjectBuilder().add("emailAddress1", "emailAddress1@test.com") .add("emailAddress1", "emailAddress1@test.com").build()).build()) .add("financialOrderDetails", - Json.createObjectBuilder().add(ACCOUNTING_DIVISION_CODE, "77").build()) + JsonObjects.createObjectBuilder().add(ACCOUNTING_DIVISION_CODE, "77").build()) .build(); } private JsonObject createNcesDocumentContent() { - return Json.createObjectBuilder() - .add("defendant", Json.createObjectBuilder().add("address", Json.createObjectBuilder().add("emailAddress1", "emailAddress1@test.com") + return JsonObjects.createObjectBuilder() + .add("defendant", JsonObjects.createObjectBuilder().add("address", JsonObjects.createObjectBuilder().add("emailAddress1", "emailAddress1@test.com") .add("emailAddress1", "emailAddress1@test.com").build()).build()) .add(ACCOUNTING_DIVISION_CODE, "77") .build(); diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/EmailServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/EmailServiceTest.java index d9ec44de4..4b8a9e342 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/EmailServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/EmailServiceTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.service; import static java.lang.String.format; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; @@ -31,7 +31,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -386,11 +386,11 @@ private static JsonObject buildMaterial() { } private static JsonObject buildDocumentTypeDataWithRBAC() { - return Json.createObjectBuilder() - .add("documentAccess", Json.createArrayBuilder().add("Listing Officer")) - .add("canCreateUserGroups", Json.createArrayBuilder().add("Listing Officer")) - .add("canReadUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates")) - .add("canDownloadUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates")) + return JsonObjects.createObjectBuilder() + .add("documentAccess", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("canCreateUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("canReadUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates")) + .add("canDownloadUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates")) .build(); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/FileServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/FileServiceTest.java index cb9ea23c3..a265ccd7e 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/FileServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/FileServiceTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/HearingServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/HearingServiceTest.java index a3ac9c796..cd6aac2f2 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/HearingServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/HearingServiceTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ListingServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ListingServiceTest.java index 51544662b..ba5b802db 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ListingServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ListingServiceTest.java @@ -4,7 +4,7 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.core.Is.is; @@ -63,7 +63,7 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -148,11 +148,11 @@ public void shouldListUnscheduledHearings() { //given ListUnscheduledCourtHearing listCourtHearing = getListUnscheduledCourtHearing(); - final JsonObject listCourtHearingJson = Json.createObjectBuilder().build(); + final JsonObject listCourtHearingJson = JsonObjects.createObjectBuilder().build(); final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonEnvelope envelopeListCourtHearing = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()).withName(LISTING_COMMAND_SEND_UNSCHEDULED_COURT_HEARING).build(), diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/MaterialServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/MaterialServiceTest.java index 11b8c40e1..8c0c94e17 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/MaterialServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/MaterialServiceTest.java @@ -38,7 +38,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -116,7 +116,7 @@ public void shouldGetMaterialMetadata() { //given final UUID materialId = UUID.randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialId", materialId.toString()) .add("fileName", "abc.txt") .add("mimeType", "text") @@ -151,7 +151,7 @@ public void shouldGetMaterialMetadataV2() { //given final UUID materialId = UUID.randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialId", materialId.toString()) .add("fileName", "abc.txt") .add("mimeType", "text") @@ -176,7 +176,7 @@ public void shouldThrowcConditionTimeoutExceptionWhenMaterialMetadataV2ReturnsPa //given final UUID materialId = UUID.randomUUID(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialId", materialId.toString()) .add("fileName", "abc.txt") .add("mimeType", "text") diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationNotifyServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationNotifyServiceTest.java index 7e5a78964..4553fa975 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationNotifyServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationNotifyServiceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonassert.JsonAssert.with; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.fail; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationServiceTest.java index 58cedb509..57cb230bf 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/NotificationServiceTest.java @@ -4,7 +4,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/OpaNoticeServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/OpaNoticeServiceTest.java index 211d388c7..baddeb8c1 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/OpaNoticeServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/OpaNoticeServiceTest.java @@ -2,8 +2,8 @@ import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PostalServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PostalServiceTest.java index 05bda85ff..baeb3c6a0 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PostalServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PostalServiceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ProgressionServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ProgressionServiceTest.java index 062fdd1e4..d1391a87d 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ProgressionServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ProgressionServiceTest.java @@ -11,9 +11,9 @@ import static java.util.Optional.of; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -142,7 +142,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonReader; @@ -539,8 +539,7 @@ public void shouldSendUpdateCaseCommand() { final UUID hearingId = randomUUID(); final HearingType hearingType = HearingType.hearingType().withDescription("Trial").build(); - final List hearingDays = List.of(HearingDay.hearingDay().withSittingDay(ZonedDateTime.now()).build()); - final JsonObject jsonObject = Json.createObjectBuilder().add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCase)).add("courtApplications", listToJsonArrayConverter.convert(courtApplications)) + final List hearingDays = List.of(HearingDay.hearingDay().withSittingDay(ZonedDateTime.now()).build()); final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCase)).add("courtApplications", listToJsonArrayConverter.convert(courtApplications)) .add("defendantJudicialResults", resultListToJsonArrayConverter.convert(defendantJudicialResults)).add("courtCentre", objectToJsonObjectConverter.convert(courtCentre)) .add("hearingId", hearingId.toString()) .add("hearingDays", hearingDayListToJsonArrayConverter.convert(hearingDays)) @@ -1245,7 +1244,7 @@ public void shouldTransformProsecutionCaseInMultiCaseDefendantScenarioFromConfir final LocalDate earliestHearingDate = ProgressionService.getEarliestDate(confirmedHearing.getHearingDays()).toLocalDate(); final Optional prosecutionCaseJsonObject = Optional.of(getJsonObjectResponseFromJsonResource("progression.prosecution-case-11SS0342023.json")); - final JsonObject jsonObject = Json.createObjectBuilder().add("prosecutionCase", prosecutionCaseJsonObject.get()).build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("prosecutionCase", prosecutionCaseJsonObject.get()).build(); when(enveloper.withMetadataFrom(confirmedJsonEnvelope, PROGRESSION_QUERY_PROSECUTION_CASES)).thenReturn(enveloperFunction); when(enveloperFunction.apply(any())).thenReturn(confirmedJsonEnvelope); @@ -2001,7 +2000,7 @@ private JsonEnvelope getJsonEnvelop(final String commandName) { .withName(commandName) .withId(randomUUID()) .build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); } @Test @@ -2010,13 +2009,13 @@ public void shouldGetActiveApplicationsOnCase(){ final JsonEnvelope inputEnvelop = envelopeFrom(metadataBuilder() .withName("progression.event.prosecution-case-defendant-updated") .withId(randomUUID()) - .build(),Json.createObjectBuilder().build()); + .build(),JsonObjects.createObjectBuilder().build()); final JsonEnvelope outputEnvelop = envelopeFrom(metadataBuilder() .withName("progression.query.active-applications-on-case") .withId(randomUUID()) - .build(),Json.createObjectBuilder().add("linkedApplications", - Json.createArrayBuilder().add(Json.createObjectBuilder().add("applicationId", randomUUID().toString()).build()) - .add(Json.createObjectBuilder().add("applicationId", randomUUID().toString()).build()).build()).build()); + .build(),JsonObjects.createObjectBuilder().add("linkedApplications", + JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder().add("applicationId", randomUUID().toString()).build()) + .add(JsonObjects.createObjectBuilder().add("applicationId", randomUUID().toString()).build()).build()).build()); when(requester.request(any())).thenReturn(outputEnvelop); final Optional activeApplicationsOnCase = progressionService.getActiveApplicationsOnCase(inputEnvelop, caseId.toString()); @@ -2032,11 +2031,11 @@ public void shouldReturnEmptyWhenNoActiveApplicationsOnCase(){ final JsonEnvelope inputEnvelop = envelopeFrom(metadataBuilder() .withName("progression.event.prosecution-case-defendant-updated") .withId(randomUUID()) - .build(),Json.createObjectBuilder().build()); + .build(),JsonObjects.createObjectBuilder().build()); final JsonEnvelope outputEnvelop = envelopeFrom(metadataBuilder() .withName("progression.query.active-applications-on-case") .withId(randomUUID()) - .build(),Json.createObjectBuilder().build()); + .build(),JsonObjects.createObjectBuilder().build()); when(requester.request(any())).thenReturn(outputEnvelop); final Optional activeApplicationsOnCase = progressionService.getActiveApplicationsOnCase(inputEnvelop, caseId.toString()); @@ -2053,7 +2052,7 @@ void shouldGenerateTrialRecordSheetPayloadForApplication() { final JsonEnvelope inputEnvelop = envelopeFrom(metadataBuilder() .withName("progression.event.defendant-trial-record-sheet-requested-for-application") .withId(randomUUID()) - .build(), Json.createObjectBuilder().build()); + .build(), JsonObjects.createObjectBuilder().build()); final JsonArray payloads = createArrayBuilder().add(createObjectBuilder(). add("defendantId", randomUUID().toString()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListNotificationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListNotificationServiceTest.java index d85064963..ae60ab9f6 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListNotificationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListNotificationServiceTest.java @@ -3,7 +3,7 @@ import static java.util.Locale.UK; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsMapContaining.hasEntry; import static org.hamcrest.core.Is.is; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListPayloadBuilderServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListPayloadBuilderServiceTest.java index dcffea5ad..884b2d4ce 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListPayloadBuilderServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/PublishCourtListPayloadBuilderServiceTest.java @@ -4,8 +4,8 @@ import static java.util.Locale.UK; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.core.Is.is; @@ -44,7 +44,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -552,7 +552,7 @@ private AssociatedDefenceOrganisation prepareDefenceOrganisation1() { } private JsonObject prepareCorrespondenceCaseContacts() { - JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder() .add("caseContext", "HMCTS") .add("caseId", CASE_ID_1.toString()) .add("contactId", randomUUID().toString()) @@ -570,7 +570,7 @@ private JsonObject prepareCorrespondenceCaseContacts() { } private JsonObject prepareCorrespondenceCaseContacts_WithoutEmail() { - JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder() .add("caseContext", "HMCTS") .add("caseId", CASE_ID_1.toString()) .add("contactId", randomUUID().toString()) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ReferralDisqualificationWarningTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ReferralDisqualificationWarningTest.java index 089c0d615..3655c16d5 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ReferralDisqualificationWarningTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/ReferralDisqualificationWarningTest.java @@ -7,8 +7,8 @@ import static java.util.Arrays.asList; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; @@ -70,7 +70,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -150,14 +150,14 @@ public class ReferralDisqualificationWarningTest { .withPostcode("AS1 1DF").build()).build(); private static Optional buildDocumentTypeDataWithRBAC(final String documentCategory) { - return Optional.ofNullable(Json.createObjectBuilder().add("section", "orders & notices") + return Optional.ofNullable(JsonObjects.createObjectBuilder().add("section", "orders & notices") .add("documentCategory", "documentCategory") .add("documentTypeDescription", "Applications") .add("documentTypeId", documentCategory) .add("", "") .add("mimeType", "application/pdf") .add("courtDocumentTypeRBAC", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("uploadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer").build()).build()) .add("readUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()) .add("downloadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()).build()) @@ -166,7 +166,7 @@ private static Optional buildDocumentTypeDataWithRBAC(final String d } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } @Test diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecLetterServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecLetterServiceTest.java index 87f6c48e3..3229237ca 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecLetterServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecLetterServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecNotificationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecNotificationServiceTest.java index be5e325de..5428668fa 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecNotificationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/StatDecNotificationServiceTest.java @@ -3,7 +3,7 @@ import static java.time.format.DateTimeFormatter.ofPattern; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorServiceTest.java index 34a3207cd..548cc0eb0 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/SystemDocGeneratorServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.equalToObject; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/UsersGroupServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/UsersGroupServiceTest.java index 3719c653e..4e1a16ead 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/UsersGroupServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/UsersGroupServiceTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -219,8 +219,8 @@ private JsonObject buildJsonObjectWithNullAddressAndNullPhoneNumber() { private JsonObject buildGetOrganisationsDetailsForIds() { return createObjectBuilder() - .add("organisations", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + .add("organisations", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("organisationId", "1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType", "LEGAL_ORGANISATION") .add("organisationName", "Bodgit and Scarper LLP") @@ -233,7 +233,7 @@ private JsonObject buildGetOrganisationsDetailsForIds() { .add("email", "joe@example.com") .add("laaContractNumber", "LAA3482374WER") ) - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("organisationId", "1fc69990-bf59-4c4a-9489-d766b9abde9b") .add("organisationType", "LEGAL_ORGANISATION") .add("organisationName", "Bodgit and Scarper LLP") @@ -251,13 +251,13 @@ private JsonObject buildGetOrganisationsDetailsForIds() { private JsonObject buildGetOrganisationsDetailsForIdsWithNullEmail() { return createObjectBuilder() - .add("organisations", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + .add("organisations", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("organisationId", "1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType", "LEGAL_ORGANISATION") .add("organisationName", "Bodgit and Scarper LLP") ) - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("organisationId", "1fc69990-bf59-4c4a-9489-d766b9abde9a") .add("organisationType", "LEGAL_ORGANISATION") .add("organisationName", "Bodgit and Scarper LLP") diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationServiceTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationServiceTest.java index 7ad9b847d..fdc3c5ce1 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationServiceTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/hearingeventlog/HearingEventLogGenerationServiceTest.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; @@ -33,7 +33,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -154,14 +154,14 @@ public void shouldGenerateApplicationHearingEventLog() throws Exception { } private static Optional buildDocumentTypeDataWithRBAC(final String documentCategory) { - return Optional.ofNullable(Json.createObjectBuilder().add("section", "orders & notices") + return Optional.ofNullable(JsonObjects.createObjectBuilder().add("section", "orders & notices") .add("documentCategory", "documentCategory") .add("documentTypeDescription", "Applications") .add("documentTypeId", documentCategory) .add("", "") .add("mimeType", "application/pdf") .add("courtDocumentTypeRBAC", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("uploadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer").build()).build()) .add("readUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()) .add("downloadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()).build()) @@ -170,7 +170,7 @@ private static Optional buildDocumentTypeDataWithRBAC(final String d } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/utils/FileUtilTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/utils/FileUtilTest.java index 24e38d9c9..f91a8a7e4 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/utils/FileUtilTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/service/utils/FileUtilTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service.utils; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/task/RetryAddDefendantToCaseTaskTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/task/RetryAddDefendantToCaseTaskTest.java index 654f3d595..30f78ecaa 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/task/RetryAddDefendantToCaseTaskTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/task/RetryAddDefendantToCaseTaskTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.jobstore.api.task.ExecutionStatus.STARTED; import static uk.gov.moj.cpp.jobstore.persistence.Priority.MEDIUM; import static uk.gov.moj.cpp.progression.task.Task.TaskNames.RETRY_ADD_DEFENDANT_TO_CASE_TASK; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/CourtDocumentTransformerTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/CourtDocumentTransformerTest.java index 6bcf38688..b575bfae0 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/CourtDocumentTransformerTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/CourtDocumentTransformerTest.java @@ -38,7 +38,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -162,7 +162,7 @@ public void shouldTransformCourtDocumentMaterialWhenCourtDocumentProsecutionIdIs @Test public void shouldTransformCourtDocumentMaterialWhenProsecutionCaseHasNotHavingCaseURNAndCallRefDataToGetOuCode() { - final JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder(); objectBuilder.add("oucode", "OUCODE123"); final CourtDocument courtDocument = buildCourtDocument(materialId, prosecutionCaseDocumentId); @@ -181,7 +181,7 @@ public void shouldTransformCourtDocumentMaterialWhenProsecutionCaseHasNotHavingC @Test public void shouldTransformCourtDocumentMaterialWhenProsecutionCaseHasOuCodeOnly() { - final JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder(); objectBuilder.add("oucode", "OUCODE123"); final CourtDocument courtDocument = buildCourtDocument(materialId, prosecutionCaseDocumentId); @@ -262,7 +262,7 @@ public void shouldTransformCourtDocumentMaterialWithCourtApplicationSubjectWhenM final CourtDocument courtDocument = buildCourtDocumentWithApplication(materialId, applicationId); final Optional prosecutionCaseJsonOptional = getProsecutionJsonObjectWithoutProsecutorAuthorityRef(prosecutionCaseDocumentId); - final JsonObjectBuilder materialBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder materialBuilder = JsonObjects.createObjectBuilder(); materialBuilder.add("materialId", randomUUID().toString()); materialBuilder.add("fileName", "fileName.pdf"); materialBuilder.add("mimeType", "application/octet-stream"); @@ -345,7 +345,7 @@ private Optional getProsecutionJsonObject(final UUID prosecutionCase final ProsecutionCaseIdentifier.Builder prosecutionCaseIdentifierBuilder = ProsecutionCaseIdentifier.prosecutionCaseIdentifier(); prosecutionCaseIdentifierBuilder.withCaseURN("URN-123"); prosecutionCaseBuilder.withProsecutionCaseIdentifier(prosecutionCaseIdentifierBuilder.build()); - final JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder(); objectBuilder.add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCaseBuilder.build())); return ofNullable(objectBuilder.build()); } @@ -375,7 +375,7 @@ private Optional getProsecutionJsonObjectWithoutProsecutorAuthorityR final ProsecutionCaseIdentifier.Builder prosecutionCaseIdentifierBuilder = ProsecutionCaseIdentifier.prosecutionCaseIdentifier(); prosecutionCaseIdentifierBuilder.withCaseURN("URN-123"); prosecutionCaseBuilder.withProsecutionCaseIdentifier(prosecutionCaseIdentifierBuilder.build()); - final JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder(); objectBuilder.add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCaseBuilder.build())); return ofNullable(objectBuilder.build()); } @@ -397,7 +397,7 @@ private Optional getProsecutionJsonObjectWithoutCaseUrn(final UUID p prosecutionCaseIdentifierBuilder.withProsecutionAuthorityReference("prosecutorAuthorityRefNumber"); prosecutionCaseIdentifierBuilder.withProsecutionAuthorityOUCode("OUCODE_123"); prosecutionCaseBuilder.withProsecutionCaseIdentifier(prosecutionCaseIdentifierBuilder.build()); - final JsonObjectBuilder objectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder(); objectBuilder.add("prosecutionCase", objectToJsonObjectConverter.convert(prosecutionCaseBuilder.build())); return ofNullable(objectBuilder.build()); } diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/HearingHelperTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/HearingHelperTest.java index cd1680e2c..96abb84e7 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/HearingHelperTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/HearingHelperTest.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.transformer; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static uk.gov.moj.cpp.progression.transformer.HearingHelper.transformedHearing; diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ListCourtHearingTransformerTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ListCourtHearingTransformerTest.java index c2f3e945e..1d2e50453 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ListCourtHearingTransformerTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ListCourtHearingTransformerTest.java @@ -4,7 +4,7 @@ import static java.time.ZonedDateTime.now; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.hasSize; @@ -78,7 +78,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -140,15 +140,15 @@ void shouldTransformToListCourtHearing() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); - final JsonObject jsonObject = Json.createObjectBuilder().add("hearingDescription", "British").build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("hearingDescription", "British").build(); when(referenceDataService.getHearingType(any(), any(UUID.class), any())).thenReturn(Optional.of(jsonObject)); when(referenceDataService.getCourtsByPostCodeAndProsecutingAuthority(any(), any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder() + .thenReturn(Optional.of(JsonObjects.createObjectBuilder() .add("courts", createArrayBuilder() - .add(Json.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) + .add(JsonObjects.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) .build()) .build())); when(referenceDataService.getCourtCentre("Redditch", envelopeReferral,requester)) @@ -157,7 +157,7 @@ void shouldTransformToListCourtHearing() { .withName("South Western (Lavender Hill)") .withWelshName("welshName_Test").build()); when(referenceDataService.getReferralReasonByReferralReasonId(any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder().add("reason", "reason for referral").build())); + .thenReturn(Optional.of(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build())); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, List.of(getProsecutionCase()), courtReferral.getSjpReferral(), courtReferral.getListHearingRequests(), UUID.randomUUID()); @@ -182,12 +182,12 @@ void shouldTransformSJPReferToListCourtHearing() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final CourtCentre courtCentre = createCourtCentre(); when(progressionService.transformCourtCentre(any(), any())).thenReturn(courtCentre); when(referenceDataService.getReferralReasonByReferralReasonId(any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder().add("reason", "reason for referral").build())); + .thenReturn(Optional.of(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build())); final NextHearing nextHearing = createNextHearing(); final List listDefendantRequests = List.of(ListDefendantRequest.listDefendantRequest() @@ -238,7 +238,7 @@ void shouldTransformToListCourtHearingWithReferralReason() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, List.of(getProsecutionCase()), courtHearingRequests.get(0), UUID.randomUUID()); @@ -272,7 +272,7 @@ void shouldTransformToListCourtHearingWhenNullPostCode() { final SjpCourtReferral courtReferral = getCourtReferralWithPostCode(null); final JsonEnvelope envelopeReferral = createReferralEnvelope(); - final JsonObject hearingDescription = Json.createObjectBuilder().add("hearingDescription", "British").build(); + final JsonObject hearingDescription = JsonObjects.createObjectBuilder().add("hearingDescription", "British").build(); final JsonObject payload = createPayloadForOrgUnits(randomUUID().toString()); @@ -284,7 +284,7 @@ void shouldTransformToListCourtHearingWhenNullPostCode() { .withWelshName("welshName_Test").build()); when(referenceDataService.getReferralReasonByReferralReasonId(any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder().add("reason", "reason for referral").build())); + .thenReturn(Optional.of(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build())); //When final ListCourtHearing actual = listCourtHearingTransformer @@ -314,15 +314,15 @@ void shouldTransformToListCourtHearingWhenBlankPostCode() { final SjpCourtReferral courtReferral = getCourtReferralWithPostCode(""); final JsonEnvelope envelopeReferral = createReferralEnvelope(); - final JsonObject jsonObject = Json.createObjectBuilder().add("hearingDescription", "British").build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("hearingDescription", "British").build(); final JsonObject payload = createPayloadForOrgUnits(randomUUID().toString()); when(referenceDataService.getHearingType(any(), any(UUID.class), any())).thenReturn(Optional.of(jsonObject)); when(referenceDataService.getCourtsByPostCodeAndProsecutingAuthority(any(), any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder() + .thenReturn(Optional.of(JsonObjects.createObjectBuilder() .add("courts", createArrayBuilder() - .add(Json.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) + .add(JsonObjects.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) .build()) .build())); when(referenceDataService.getCourtCentre("Redditch", envelopeReferral,requester)) @@ -332,7 +332,7 @@ void shouldTransformToListCourtHearingWhenBlankPostCode() { .withWelshName("welshName_Test").build()); when(referenceDataService.getReferralReasonByReferralReasonId(any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder().add("reason", "reason for referral").build())); + .thenReturn(Optional.of(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build())); final ListCourtHearing actual = listCourtHearingTransformer .transform(envelopeReferral, List.of(getProsecutionCaseWithPostCode("")), courtReferral.getSjpReferral(), courtReferral.getListHearingRequests(), UUID.randomUUID()); @@ -361,13 +361,13 @@ void shouldTransformToListCourtHearingWhenInvalidPostCode() { final SjpCourtReferral courtReferral = getCourtReferralWithPostCode("xxxxxxxxx"); final JsonEnvelope envelopeReferral = createReferralEnvelope(); - final JsonObject jsonObject = Json.createObjectBuilder().add("hearingDescription", "British").build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("hearingDescription", "British").build(); final JsonObject payload = createPayloadForOrgUnits(randomUUID().toString()); when(referenceDataService.getHearingType(any(), any(UUID.class), any())).thenReturn(Optional.of(jsonObject)); when(referenceDataService.getCourtsByPostCodeAndProsecutingAuthority(any(), any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder() + .thenReturn(Optional.of(JsonObjects.createObjectBuilder() .add("courts", createArrayBuilder() - .add(Json.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) + .add(JsonObjects.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) .build()) .build())); when(referenceDataService.getCourtCentre("Redditch", envelopeReferral,requester)) @@ -377,7 +377,7 @@ void shouldTransformToListCourtHearingWhenInvalidPostCode() { .withWelshName("welshName_Test").build()); when(referenceDataService.getReferralReasonByReferralReasonId(any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder().add("reason", "reason for referral").build())); + .thenReturn(Optional.of(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build())); //When final ListCourtHearing actual = listCourtHearingTransformer @@ -446,18 +446,18 @@ void shouldTransformToListCourtHearingWithLegalEntityDefendant() { final SjpCourtReferral courtReferral = getCourtReferralWithLegalDefendant(); final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); - final JsonObject jsonObject = Json.createObjectBuilder().add("hearingDescription", "British").build(); + final JsonObject jsonObject = JsonObjects.createObjectBuilder().add("hearingDescription", "British").build(); when(referenceDataService.getHearingType(any(), any(UUID.class), any())).thenReturn(Optional.of(jsonObject)); when(referenceDataService.getReferralReasonByReferralReasonId(any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder().add("reason", "reason for referral").build())); + .thenReturn(Optional.of(JsonObjects.createObjectBuilder().add("reason", "reason for referral").build())); when(referenceDataService.getCourtsByPostCodeAndProsecutingAuthority(any(), any(), any(), any())) - .thenReturn(Optional.of(Json.createObjectBuilder() + .thenReturn(Optional.of(JsonObjects.createObjectBuilder() .add("courts", createArrayBuilder() - .add(Json.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) + .add(JsonObjects.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) .build()) .build())); when(referenceDataService.getCourtCentre("Redditch", envelopeReferral,requester)) @@ -534,7 +534,7 @@ void shouldTransformSPICaseToListCourtHearing() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, List.of(getProsecutionCase()), listHearingRequest, UUID.randomUUID(), null); @@ -572,7 +572,7 @@ void shouldTransformSPICaseToListCourtHearingDefendantIsYouth() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, List.of(getProsecutionCase(LocalDate.now().minusYears(15))), listHearingRequest, UUID.randomUUID(), null); @@ -602,7 +602,7 @@ void shouldTransformSPICaseToListCourtHearingDefendantIsYouthWithWeekCommencingD final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, List.of(getProsecutionCase(LocalDate.now().minusYears(15))), listHearingRequest, UUID.randomUUID(), null); @@ -650,7 +650,7 @@ void shouldTransformToListCourtHearingWithReferralReasonAndProsecutor() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, List.of(getProsecutionCaseWithProsecutor()), courtHearingRequests.get(0), UUID.randomUUID()); @@ -698,7 +698,7 @@ void shouldTransformToListCourtHearingForMultiHearing() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, @@ -729,7 +729,7 @@ void shouldTransformToListCourtHearingWhenNoHearingExist() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, @@ -753,7 +753,7 @@ void shouldTransformToListCourtHearingForMultiHearingWithWeekCommencingDate() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, @@ -804,7 +804,7 @@ void shouldTransformToListCourtHearingForUnscheduledHearing() { final JsonEnvelope envelopeReferral = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final ListCourtHearing listCourtHearing = listCourtHearingTransformer .transform(envelopeReferral, @@ -1223,9 +1223,9 @@ private List getCourtHearingRequest() { } private JsonObject createPayloadForOrgUnits(final String id) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("organisationunits", createArrayBuilder() - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("id", id) .add("oucodeL3Name", "South Western (Lavender Hill)") .add("oucodeL3WelshName", "welshName_Test") @@ -1237,7 +1237,7 @@ private JsonObject createPayloadForOrgUnits(final String id) { private JsonEnvelope createReferralEnvelope() { return JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("referral").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); } private List createRotaSlot() { diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredCourtDocumentTransformerTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredCourtDocumentTransformerTest.java index 43c40e2d5..3affb6a2b 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredCourtDocumentTransformerTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredCourtDocumentTransformerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.transformer; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -21,7 +21,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -52,11 +52,11 @@ public void testTransform() { final ReferredCourtDocument referredCourtDocument = buildCourtDocument(documentTypeId); final JsonEnvelope jsonEnvelope = buildJsonEnvelope(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("section", CASE_DOCUMENT) .add("seqNum", 10) .add("courtDocumentTypeRBAC", - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("uploadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer").build()).build()) .add("readUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()) .add("downloadUserGroups", createArrayBuilder().add(buildUserGroup("Listing Officer")).add(buildUserGroup("Magistrates")).build()).build() @@ -79,7 +79,7 @@ public void testTransform() { } private static JsonObjectBuilder buildUserGroup(final String userGroupName) { - return Json.createObjectBuilder().add("cppGroup", Json.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); + return JsonObjects.createObjectBuilder().add("cppGroup", JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("groupName", userGroupName)); } @Test diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformerTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformerTest.java index 778f7643e..fca2f4160 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformerTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/transformer/ReferredProsecutionCaseTransformerTest.java @@ -62,7 +62,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -153,15 +153,15 @@ private static ReferredOffence getReferredOffence() { //Offence private static JsonObject getNationalityObject() { - return Json.createObjectBuilder().add(NATIONALITY_CODE, "N12").add(NATIONALITY, "UK").build(); + return JsonObjects.createObjectBuilder().add(NATIONALITY_CODE, "N12").add(NATIONALITY, "UK").build(); } private static JsonObject getProsecutor() { - return Json.createObjectBuilder().add(PROSECUTOR, "TFL").build(); + return JsonObjects.createObjectBuilder().add(PROSECUTOR, "TFL").build(); } private static JsonObject getOffence(final String modeoftrial) { - return Json.createObjectBuilder().add(LEGISLATION, "E12") + return JsonObjects.createObjectBuilder().add(LEGISLATION, "E12") .add(LEGISLATION_WELSH, "123") .add(OFFENCE_TITLE, "title-of-offence") .add(WELSH_OFFENCE_TITLE, "welsh-title") @@ -170,7 +170,7 @@ private static JsonObject getOffence(final String modeoftrial) { } private static JsonObject getEthnicityObject() { - return Json.createObjectBuilder().add(ETHNICITY_CODE, "E12").add(ETHNICITY, "British").build(); + return JsonObjects.createObjectBuilder().add(ETHNICITY_CODE, "E12").add(ETHNICITY, "British").build(); } @Test diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/utils/FileUtil.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/utils/FileUtil.java index c29a07735..edc9ccafa 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/utils/FileUtil.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/utils/FileUtil.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.utils; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; import static org.junit.jupiter.api.Assertions.fail; @@ -10,7 +10,7 @@ import java.io.InputStream; import java.io.StringReader; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -38,7 +38,7 @@ public static String getPayload(final String path) { } public static JsonObject jsonFromString(String jsonObjectStr) { - JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); JsonObject object = jsonReader.readObject(); jsonReader.close(); return object; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ACourtHearingDaysIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ACourtHearingDaysIT.java index 8c84573c5..0bcdd1a21 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ACourtHearingDaysIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ACourtHearingDaysIT.java @@ -22,8 +22,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.http.HttpStatus.SC_ACCEPTED; import org.hamcrest.CoreMatchers; import org.hamcrest.Matcher; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationExtractIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationExtractIT.java index b86d51d30..8cf4bbf2f 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationExtractIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationExtractIT.java @@ -76,6 +76,8 @@ public void shouldAddDocumentInStandAloneApplicationAndThenUpdateIt() throws Exc final String actualDocumentAfterUpdate = getCourtDocumentFor(docId, allOf( withJsonPath("$.courtDocument.courtDocumentId", equalTo(docId)), withJsonPath("$.courtDocument.containsFinancialMeans", equalTo(false)), + withJsonPath("$.courtDocument.documentTypeId", equalTo("a4e50dad-9e21-4b2b-903f-94176a443fca")), + withJsonPath("$.courtDocument.name", equalTo("Application Updated Notice")), withJsonPath("$.courtDocument.documentTypeDescription", equalTo("Applications")) )); final String expectedPayloadAfterUpdate = getPayload("expected/expected.progression.court-document-updated-for-standalone.json") diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationNoteIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationNoteIT.java index 281e6e609..c39b23282 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationNoteIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ApplicationNoteIT.java @@ -21,17 +21,22 @@ import static uk.gov.moj.cpp.progression.helper.AbstractTestHelper.getReadUrl; import static uk.gov.moj.cpp.progression.helper.AbstractTestHelper.getWriteUrl; import static uk.gov.moj.cpp.progression.helper.QueueUtil.retrieveMessageBody; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.TIMEOUT_IN_SECONDS; import static uk.gov.moj.cpp.progression.helper.RestHelper.postCommand; import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageConsumerClient; +import java.time.Duration; import java.util.Optional; import javax.json.JsonObject; import io.restassured.response.Response; import org.junit.jupiter.api.Test; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class ApplicationNoteIT extends AbstractIT { @@ -79,9 +84,10 @@ public void shouldEditApplicationNote() throws Exception { private String verifyApplicationNotesAndGetApplicationNoteId(final String applicationId, final Boolean isPinned) { String payload = poll(requestParams(getReadUrl(format("/applications/%s/notes", applicationId)), - "application/vnd.progression.query.application-notes+json") - .withHeader(USER_ID, randomUUID())) - .timeout(30, SECONDS) + "application/vnd.progression.query.application-notes+json").withHeader(USER_ID, randomUUID()) + .build(), + new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS)), + Duration.ofSeconds(TIMEOUT_IN_SECONDS)) .until( status().is(OK), payload().isJson(allOf( diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CPSNotificationIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CPSNotificationIT.java index 4e05fdfec..9778cbcb3 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CPSNotificationIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CPSNotificationIT.java @@ -27,6 +27,7 @@ import static uk.gov.moj.cpp.progression.helper.QueueUtil.buildMetadata; import static uk.gov.moj.cpp.progression.stub.NotificationServiceStub.verifyEmailNotificationIsRaisedWithoutAttachment; import static uk.gov.moj.cpp.progression.stub.UsersAndGroupsStub.stubGetOrganisationDetails; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; public class CPSNotificationIT extends AbstractIT { private static final String PUBLIC_DEFENCE_RECORD_INSTRUCTED = "public.defence.event.record-instruction-details"; @@ -71,7 +72,7 @@ public void shouldNotifyCPS() throws Exception { // Instruct final JsonObject recordInstructedPublicEvent = getInstructedJsonObject(PUBLIC_DEFENCE_RECORD_INSTRUCTED_FILE, caseId, hearingId, defendantId, courtCentreId, courtCentreName); - Thread.sleep(1000 * 5); + sleepToBeRefactored(); final JsonEnvelope publicEventInstructedEnvelope = envelopeFrom(buildMetadata(PUBLIC_DEFENCE_RECORD_INSTRUCTED, userId), recordInstructedPublicEvent); messageProducerClientPublic.sendMessage(PUBLIC_DEFENCE_RECORD_INSTRUCTED, publicEventInstructedEnvelope); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtApplicationSubjectCustodialEstablishmentUpdatedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtApplicationSubjectCustodialEstablishmentUpdatedIT.java index d2ec5bc70..cdcd6ad08 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtApplicationSubjectCustodialEstablishmentUpdatedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtApplicationSubjectCustodialEstablishmentUpdatedIT.java @@ -53,7 +53,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -257,7 +257,7 @@ private void verifyInMessagingQueueForProsecutionCaseCreated(final JmsMessageCon } public static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtProceedingsInitiatedForGroupCasesIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtProceedingsInitiatedForGroupCasesIT.java index 03ee5bb8a..85ac7e4f7 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtProceedingsInitiatedForGroupCasesIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/CourtProceedingsInitiatedForGroupCasesIT.java @@ -31,13 +31,19 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.notNullValue; + import org.hamcrest.Matcher; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; + import org.json.JSONException; + import static org.junit.Assert.assertTrue; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageConsumerClientProvider.newPublicJmsMessageConsumerClientProvider; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -309,15 +315,17 @@ private UUID verifyCasesAndGetGroupMasterId(final Set caseIds, final List< UUID groupMasterId = null; for (final UUID caseId : caseIds) { - final String payload = pollProsecutionCasesProgressionFor(caseId.toString(), withJsonPath("$.prosecutionCase.id", is(caseId.toString()))); + final String payload; + if (removedCaseIds.contains(caseId)) + payload = pollProsecutionCasesProgressionFor(caseId.toString(), withJsonPath("$.prosecutionCase.id", is(caseId.toString())), + withJsonPath("$.prosecutionCase.isGroupMember", is(false)), + withJsonPath("$.prosecutionCase.isGroupMaster", is(false))); + else + payload = pollProsecutionCasesProgressionFor(caseId.toString(), withJsonPath("$.prosecutionCase.id", is(caseId.toString())), + withJsonPath("$.prosecutionCase.isGroupMember", is(true)), + withJsonPath("$.prosecutionCase.isGroupMaster", notNullValue())); final JsonObject prosecutionCase = stringToJsonObjectConverter.convert(payload).getJsonObject("prosecutionCase"); - if (removedCaseIds.contains(caseId)) { - assertThat(prosecutionCase.getBoolean("isGroupMember"), is(false)); - assertThat(prosecutionCase.getBoolean("isGroupMaster"), is(false)); - } else { - assertThat(prosecutionCase.getBoolean("isGroupMember"), is(true)); - assertThat(prosecutionCase.containsKey("isGroupMaster"), is(true)); - + if (!removedCaseIds.contains(caseId)) { if (prosecutionCase.getBoolean("isGroupMaster")) { if (nonNull(groupMasterId)) { assertThat(format("Only one case can be a group master. {}, {}", groupMasterId, caseId), false); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DefenceFlowIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DefenceFlowIT.java index 959cfb843..7b20f96ac 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DefenceFlowIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DefenceFlowIT.java @@ -9,7 +9,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -178,7 +178,7 @@ private void verifyInMessagingQueueForDefendantLegalAidStatusUpdated() { } private JsonObject createPayloadForDisassociation(final boolean isLAA) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("userId", userId) .add("defendantId", defendantId) .add("organisationId", organisationId) @@ -189,7 +189,7 @@ private JsonObject createPayloadForDisassociation(final boolean isLAA) { } private JsonObject createPayloadForAssociation(final boolean isLAA, final String laaContractNumber) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("defendantId", defendantId) .add("organisationId", organisationId) .add("organisationName", organisationName) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DeleteFinancialMeansIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DeleteFinancialMeansIT.java index 2dbca2135..db63b3d76 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DeleteFinancialMeansIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/DeleteFinancialMeansIT.java @@ -1,7 +1,22 @@ package uk.gov.moj.cpp.progression; +import io.restassured.response.Response; +import org.apache.http.HttpStatus; +import org.hamcrest.Matcher; +import org.json.JSONException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.Customization; +import org.skyscreamer.jsonassert.JSONAssert; +import org.skyscreamer.jsonassert.comparator.CustomComparator; + +import java.io.IOException; +import java.util.UUID; + +import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.skyscreamer.jsonassert.JSONCompareMode.STRICT; import static uk.gov.moj.cpp.progression.helper.AbstractTestHelper.getWriteUrl; @@ -15,18 +30,6 @@ import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; import static uk.gov.moj.cpp.progression.util.ReferProsecutionCaseToCrownCourtHelper.getProsecutionCaseMatchers; -import java.io.IOException; -import java.util.UUID; - -import io.restassured.response.Response; -import org.apache.http.HttpStatus; -import org.json.JSONException; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.skyscreamer.jsonassert.Customization; -import org.skyscreamer.jsonassert.JSONAssert; -import org.skyscreamer.jsonassert.comparator.CustomComparator; - public class DeleteFinancialMeansIT extends AbstractIT { private String caseId; @@ -72,12 +75,7 @@ private void setUpProsecutionCaseWithDefendantCourtDocument() throws IOException private void assertCourtDocumentRemoved() { - final String actualPayload = getCourtDocumentsByCase(UUID.randomUUID().toString(), caseId); - - final String expectedPayload = "{\"documentIndices\":[]}"; - - assertThat(expectedPayload, equalTo(actualPayload)); - + getCourtDocumentsByCase(UUID.randomUUID().toString(), caseId, new Matcher[]{withJsonPath("$.documentIndices.length()", is(0))}); } private void addCourtDocumentToProsecutionCase() { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/EditCivilApplicationFeeIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/EditCivilApplicationFeeIT.java index 3c31f41af..d7777403f 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/EditCivilApplicationFeeIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/EditCivilApplicationFeeIT.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ExtendHearingIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ExtendHearingIT.java index 13cd8a202..8150a8c8a 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ExtendHearingIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ExtendHearingIT.java @@ -18,8 +18,8 @@ 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.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 org.hamcrest.CoreMatchers; import static org.hamcrest.CoreMatchers.is; import org.hamcrest.Matcher; @@ -49,6 +49,7 @@ import static uk.gov.moj.cpp.progression.it.framework.ContextNameProvider.CONTEXT_NAME; import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; import static uk.gov.moj.cpp.progression.util.ReferProsecutionCaseToCrownCourtHelper.getProsecutionCaseMatchers; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; @SuppressWarnings("squid:S1607") public class ExtendHearingIT extends AbstractIT { @@ -127,6 +128,7 @@ public void shouldAddNewCaseToUnallocatedHearingWhenExtending() throws Exception .build(); final JsonEnvelope publicEventEnvelope2 = envelopeFrom(buildMetadata("public.events.listing.offences-removed-from-unallocated-hearing", userId), payload2); + sleepToBeRefactored(); messageProducerClientPublic.sendMessage("public.events.listing.offences-removed-from-unallocated-hearing", publicEventEnvelope2); LOGGER.info("*** Existing Hearing : {} | caseId : {} | defendant id : {} | offenceId : {}", existingHearingId, caseId1, defendantId1, offenceId1); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/FormIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/FormIT.java index a55e2221f..deda76077 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/FormIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/FormIT.java @@ -12,8 +12,8 @@ import static java.nio.charset.Charset.defaultCharset; 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 org.apache.http.HttpStatus.SC_OK; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingDeletedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingDeletedIT.java index 561b30828..8a7ffe87e 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingDeletedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingDeletedIT.java @@ -11,7 +11,6 @@ import static com.google.common.collect.Lists.newArrayList; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static java.lang.Thread.sleep; import static java.util.UUID.randomUUID; import static org.hamcrest.CoreMatchers.equalTo; import org.hamcrest.Matcher; @@ -35,6 +34,7 @@ import static uk.gov.moj.cpp.progression.helper.QueueUtil.buildMetadata; import static uk.gov.moj.cpp.progression.stub.ProbationCaseworkerStub.verifyProbationHearingDeletedCommandInvoked; import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; public class HearingDeletedIT extends AbstractIT { @@ -135,7 +135,7 @@ public void shouldReopenCaseWhenAnewApplicationAddedAndHasFutureHearingsAndDelet pollForApplication(applicationId); //FIXME not sure why this sleep is required - sleep(1000 * 5); + sleepToBeRefactored(); final JsonEnvelope publicEventConfirmedEnvelope = JsonEnvelope.envelopeFrom(buildMetadata(PUBLIC_LISTING_HEARING_CONFIRMED, userId), getHearingJsonObject("public.listing.hearing-confirmed-case-reopen.json", caseId, hearingId, defendantId, courtCentreId, courtCentreName, applicationId)); messageProducerClientPublic.sendMessage(PUBLIC_LISTING_HEARING_CONFIRMED, publicEventConfirmedEnvelope); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingEventLogIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingEventLogIT.java index 82f170a83..48d64ef5c 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingEventLogIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingEventLogIT.java @@ -33,6 +33,8 @@ import static uk.gov.moj.cpp.progression.helper.PreAndPostConditionHelper.pollProsecutionCasesProgressionFor; import static uk.gov.moj.cpp.progression.helper.QueueUtil.buildMetadata; import static uk.gov.moj.cpp.progression.helper.QueueUtil.retrieveMessageBody; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; import static uk.gov.moj.cpp.progression.helper.RestHelper.pollForResponse; import static uk.gov.moj.cpp.progression.helper.RestHelper.postCommand; import static uk.gov.moj.cpp.progression.helper.StubUtil.setupHmctsUsersGroupQueryStub; @@ -55,6 +57,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import java.io.IOException; +import java.time.Duration; import java.util.Optional; import java.util.UUID; @@ -68,6 +71,7 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class HearingEventLogIT extends AbstractIT { @@ -521,7 +525,7 @@ private void verifyApplicationDocIndices(final String applicationId, final Strin } private void verifyHearingEventsLogsDocumentGenerated(final String TEMPLATE_NAME) { - await().with().timeout(30, SECONDS) + await().atMost(Duration.ofSeconds(15)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))) .until(() -> { try { final Optional documentGenerationRequest = getHearingEventTemplate(TEMPLATE_NAME); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingResultedCaseUpdatedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingResultedCaseUpdatedIT.java index 5b1fcabb5..1e0de81f4 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingResultedCaseUpdatedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingResultedCaseUpdatedIT.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -150,7 +150,7 @@ public void shouldNotUpdateCaseAfterHearingIsResulted() throws Exception { private void ejectCase(final String prosecutionCaseId, final String removalReason) { - JsonObject payload = Json.createObjectBuilder() + JsonObject payload = JsonObjects.createObjectBuilder() .add("prosecutionCaseId", prosecutionCaseId) .add("removalReason", removalReason) .build(); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingTrialVacatedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingTrialVacatedIT.java index 8ff7c8dd8..8390ec7ef 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingTrialVacatedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/HearingTrialVacatedIT.java @@ -9,7 +9,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.Matchers.is; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ListNewHearingIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ListNewHearingIT.java index b714bb70c..a14b1c129 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ListNewHearingIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ListNewHearingIT.java @@ -6,8 +6,8 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/NowDocumentRequestIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/NowDocumentRequestIT.java index fd7aeeb30..c6cdc8fac 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/NowDocumentRequestIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/NowDocumentRequestIT.java @@ -5,7 +5,7 @@ import static java.lang.String.join; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; import static org.hamcrest.CoreMatchers.anyOf; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PartialAllocationOfHearingIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PartialAllocationOfHearingIT.java index 14cc17f48..39ad64b69 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PartialAllocationOfHearingIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PartialAllocationOfHearingIT.java @@ -16,6 +16,7 @@ import static uk.gov.moj.cpp.progression.helper.PreAndPostConditionHelper.pollCaseAndGetHearingForDefendant; import static uk.gov.moj.cpp.progression.stub.ProbationCaseworkerStub.verifyProbationHearingCommandInvoked; import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClient; @@ -59,6 +60,7 @@ public void shouldPartiallyAllocateForOneDefendantWithTwoOffencesToExistingHeari addProsecutionCaseToCrownCourtWithOneDefendantAndTwoOffences(caseId1, defendantId1); final String existingHearingId = pollCaseAndGetHearingForDefendant(caseId1, defendantId1); + sleepToBeRefactored(); // Extending hearing for one offence doHearingConfirmed(existingHearingId, caseId1, defendantId1, courtCentreId1, userId1, firstHearingId); @@ -91,6 +93,7 @@ public void shouldPartiallyAllocateForOneProsecutionCaseWithTwoDefendantsToExist final String existingHearingId = pollCaseAndGetHearingForDefendant(caseId2, defendantId3); // Extending hearing for one offence + Thread.sleep(250); doHearingConfirmed(existingHearingId, caseId2, defendantId3, courtCentreId1, userId1, extendedHearingId); pollAndVerifyHearingIsExtended(extendedHearingId, 2); } @@ -104,7 +107,7 @@ public void shouldPartiallyAllocateTwoProsecutionCasesToExistingHearing() throws final String defendantId2 = randomUUID().toString(); final String courtCentreId = randomUUID().toString(); final String userId = randomUUID().toString(); - + sleepToBeRefactored(); addProsecutionCaseToCrownCourtWithTwoProsecutionCases(caseId1, caseId2, defendantId1, defendantId2); final String extendedHearingId = pollCaseAndGetHearingForDefendant(caseId1, defendantId1); @@ -120,6 +123,7 @@ public void shouldPartiallyAllocateTwoProsecutionCasesToExistingHearing() throws addProsecutionCaseToCrownCourtWithTwoProsecutionCases(caseId3, caseId4, defendantId3, defendantId4); final String existingHearingId = pollCaseAndGetHearingForDefendant(caseId3, defendantId3); + sleepToBeRefactored(); // Extending hearing for one offence doHearingConfirmed(existingHearingId, caseId3, defendantId3, courtCentreId1, userId1, extendedHearingId); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PetFormIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PetFormIT.java index 05ebdf313..cd42cf7c2 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PetFormIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PetFormIT.java @@ -7,8 +7,8 @@ import static java.nio.charset.Charset.defaultCharset; 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 javax.ws.rs.core.Response.Status.ACCEPTED; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PrisonCourtRegisterDocumentRequestIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PrisonCourtRegisterDocumentRequestIT.java index 8cb515a7d..a32f634cc 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PrisonCourtRegisterDocumentRequestIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PrisonCourtRegisterDocumentRequestIT.java @@ -73,7 +73,7 @@ public void shouldGeneratePrisonCourtDocumentAsynchronously() throws JSONExcepti body); assertThat(writeResponse.getStatusCode(), equalTo(HttpStatus.SC_ACCEPTED)); - final List jsonObjectsList = SysDocGeneratorStub.pollSysDocGenerationRequestsWithOriginatingSourceAndSourceCorrelationId(Matchers.hasSize(2), "PRISON_COURT_REGISTER", prisonCourtRegisterStreamId.toString()); + final List jsonObjectsList = SysDocGeneratorStub.pollSysDocGenerationRequestsForPrisonCourtRegisterWithSourceCorrelationId(Matchers.hasSize(2), "PRISON_COURT_REGISTER", prisonCourtRegisterStreamId.toString()); final JSONObject jsonObject1 = jsonObjectsList.stream().filter(request -> !request.toString().contains(documentFileServiceId.toString())).findFirst().get(); final UUID payloadFileServiceId1 = fromString(jsonObject1.getString("payloadFileServiceId")); final UUID documentFileServiceId1 = randomUUID(); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseRelatedCasesIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseRelatedCasesIT.java index de2a68501..72c473c08 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseRelatedCasesIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseRelatedCasesIT.java @@ -30,6 +30,7 @@ import static uk.gov.moj.cpp.progression.stub.ListingStub.stubListingSearchHearingsQuery; import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; import static uk.gov.moj.cpp.progression.util.ReferProsecutionCaseToCrownCourtHelper.getProsecutionCaseMatchers; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; public class ProsecutionCaseRelatedCasesIT extends AbstractIT { private static final String PUBLIC_HEARING_RESULTED = "public.hearing.resulted"; @@ -97,6 +98,10 @@ public void shouldVerifyRelatedCasesWhenAllCasesInActive() throws Exception { prosecutionCaseMatchers = getProsecutionCaseMatchers(prosecutionCaseId_2, defendantId_2_forMasterDefendantId_1, emptyList()); pollProsecutionCasesProgressionFor(prosecutionCaseId_2, prosecutionCaseMatchers); + /* todo as we have faster event processing, some parts of viewstore are not settling yet. + This needs to be fixed with proper matchers in previous steps + */ + sleepToBeRefactored(); // match defendantId_2_forMasterDefendantId_1 associated to case 2 matchDefendant(prosecutionCaseId_2, defendantId_2_forMasterDefendantId_1, prosecutionCaseId_1, defendantId_1_forMasterDefendantId_1, masterDefendantId_1); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseUpdateOffencesIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseUpdateOffencesIT.java index c3a2fbbe4..98103634e 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseUpdateOffencesIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ProsecutionCaseUpdateOffencesIT.java @@ -1,6 +1,9 @@ package uk.gov.moj.cpp.progression; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageConsumerClient; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; import uk.gov.moj.cpp.progression.util.ProsecutionCaseUpdateOffencesHelper; import java.time.Duration; @@ -14,20 +17,26 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.notNullValue; + import org.hamcrest.Matcher; import org.json.JSONException; import org.json.JSONObject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageConsumerClientProvider.newPublicJmsMessageConsumerClientProvider; import static uk.gov.moj.cpp.progression.helper.PreAndPostConditionHelper.addProsecutionCaseToCrownCourt; import static uk.gov.moj.cpp.progression.helper.PreAndPostConditionHelper.getHearingForDefendant; import static uk.gov.moj.cpp.progression.helper.PreAndPostConditionHelper.pollProsecutionCasesProgressionFor; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; import static uk.gov.moj.cpp.progression.util.ProsecutionCaseUpdateOffencesHelper.OFFENCE_CODE; import static uk.gov.moj.cpp.progression.util.ReferProsecutionCaseToCrownCourtHelper.getProsecutionCaseMatchers; @SuppressWarnings("java:S2699") public class ProsecutionCaseUpdateOffencesIT extends AbstractIT { + private static final Logger LOGGER = LoggerFactory.getLogger(ProsecutionCaseUpdateOffencesIT.class); + private final JmsMessageConsumerClient publicEventsConsumerForOffencesUpdated = newPublicJmsMessageConsumerClientProvider().withEventNames("public.progression.defendant-offences-changed").getMessageConsumerClient(); @@ -109,34 +118,41 @@ public void shouldUpdateAndClearVerdictForOffence() throws Exception { // given addProsecutionCaseToCrownCourt(caseId, defendantId); - await().atMost(Duration.ofMinutes(1)).pollInterval(Duration.ofMillis(500)).until(() -> { - final Matcher[] caseWithOffenceMatchers = getProsecutionCaseMatchers(caseId, defendantId, - singletonList(withJsonPath("$.prosecutionCase.defendants[0].offences[0].offenceCode", is("TTH105HY"))) - ); - final String payload = pollProsecutionCasesProgressionFor(caseId, caseWithOffenceMatchers); - final JSONObject jsonObjectPayload = new JSONObject(payload); - final int orderIndex = Integer.parseInt(jsonObjectPayload.getJSONObject("prosecutionCase").getJSONArray("defendants").getJSONObject(0).getJSONArray("offences").getJSONObject(0).get("orderIndex").toString()); - final String hearingId = jsonObjectPayload.getJSONObject("hearingsAtAGlance").getJSONArray("defendantHearings").getJSONObject(0).getJSONArray("hearingIds").get(0).toString(); - // Add new offence and check orderIndex is incremented - updateOffenceVerdictAndVerify(hearingId, orderIndex, offenceId, 0); + await().atMost(Duration.ofSeconds(15)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { + try { + final Matcher[] caseWithOffenceMatchers = getProsecutionCaseMatchers(caseId, defendantId, + singletonList(withJsonPath("$.prosecutionCase.defendants[0].offences[0].offenceCode", is("TTH105HY"))) + ); + final String payload = pollProsecutionCasesProgressionFor(caseId, caseWithOffenceMatchers); + final JSONObject jsonObjectPayload = new JSONObject(payload); + final int orderIndex = Integer.parseInt(jsonObjectPayload.getJSONObject("prosecutionCase").getJSONArray("defendants").getJSONObject(0).getJSONArray("offences").getJSONObject(0).get("orderIndex").toString()); + final String hearingId = jsonObjectPayload.getJSONObject("hearingsAtAGlance").getJSONArray("defendantHearings").getJSONObject(0).getJSONArray("hearingIds").get(0).toString(); + // Add new offence and check orderIndex is incremented + updateOffenceVerdictAndVerify(hearingId, orderIndex, offenceId, 0); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + } return true; }); - await().atMost(Duration.ofMinutes(1)).pollInterval(Duration.ofMillis(500)).until(() -> { - final Matcher[] caseWithOffenceMatchers = getProsecutionCaseMatchers(caseId, defendantId, - singletonList(withJsonPath("$.prosecutionCase.defendants[0].offences[0].offenceCode", is("TTH105HY"))) - ); - final String payload = pollProsecutionCasesProgressionFor(caseId, caseWithOffenceMatchers); - final JSONObject jsonObjectPayload = new JSONObject(payload); - final int orderIndex = Integer.parseInt(jsonObjectPayload.getJSONObject("prosecutionCase").getJSONArray("defendants").getJSONObject(0).getJSONArray("offences").getJSONObject(0).get("orderIndex").toString()); - final String hearingId = jsonObjectPayload.getJSONObject("hearingsAtAGlance").getJSONArray("defendantHearings").getJSONObject(0).getJSONArray("hearingIds").get(0).toString(); - // Add new offence and check orderIndex is incremented - updateOffenceClearVerdictAndVerify(hearingId, orderIndex, offenceId); + await().atMost(Duration.ofSeconds(15)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { + try { + final Matcher[] caseWithOffenceMatchers = getProsecutionCaseMatchers(caseId, defendantId, + singletonList(withJsonPath("$.prosecutionCase.defendants[0].offences[0].offenceCode", is("TTH105HY"))) + ); + final String payload = pollProsecutionCasesProgressionFor(caseId, caseWithOffenceMatchers); + final JSONObject jsonObjectPayload = new JSONObject(payload); + final int orderIndex = Integer.parseInt(jsonObjectPayload.getJSONObject("prosecutionCase").getJSONArray("defendants").getJSONObject(0).getJSONArray("offences").getJSONObject(0).get("orderIndex").toString()); + final String hearingId = jsonObjectPayload.getJSONObject("hearingsAtAGlance").getJSONArray("defendantHearings").getJSONObject(0).getJSONArray("hearingIds").get(0).toString(); + // Add new offence and check orderIndex is incremented + updateOffenceClearVerdictAndVerify(hearingId, orderIndex, offenceId); + } catch (Exception e) { + LOGGER.error(e.getMessage(), e); + } return true; }); - } @Test diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicHearingResultedWithFeatureToggleEnabledIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicHearingResultedWithFeatureToggleEnabledIT.java index d0cf7cc8a..e670cb89d 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicHearingResultedWithFeatureToggleEnabledIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicHearingResultedWithFeatureToggleEnabledIT.java @@ -23,8 +23,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withoutJsonPath; import io.restassured.response.Response; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import org.hamcrest.Matcher; @@ -66,6 +66,7 @@ import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; import static uk.gov.moj.cpp.progression.util.ProsecutionCaseUpdateOffencesHelper.OFFENCE_CODE; import static uk.gov.moj.cpp.progression.util.ReferProsecutionCaseToCrownCourtHelper.getProsecutionCaseMatchers; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; @SuppressWarnings("squid:S1607") public class PublicHearingResultedWithFeatureToggleEnabledIT extends AbstractIT { @@ -375,6 +376,7 @@ public void shouldMoveNewOffenceToNewNextHearingWhenHearingAmended() throws Exce final JsonObject publicEvent = createObjectBuilder().add("newHearingId", newHearingId).add("seedingHearingId", hearingId) .add("oldHearingIds", createArrayBuilder().add(nextHearingId)).build(); publicEventEnvelope = envelopeFrom(buildMetadata("public.listing.offences-moved-to-next-hearing", userId), publicEvent); + sleepToBeRefactored(); messageProducerClientPublic.sendMessage("public.listing.offences-moved-to-next-hearing", publicEventEnvelope); assertTrue(retrieveMessageBody(messageConsumerPublicEvent1).isPresent()); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicNowNotificationGeneratedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicNowNotificationGeneratedIT.java index 86713e930..e15e12d7b 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicNowNotificationGeneratedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/PublicNowNotificationGeneratedIT.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/QueryFormDirectionIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/QueryFormDirectionIT.java index cf7874e0e..70750abf1 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/QueryFormDirectionIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/QueryFormDirectionIT.java @@ -4,12 +4,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import java.io.IOException; 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.moj.cpp.progression.DMConstants.CASE_ID; import static uk.gov.moj.cpp.progression.DMConstants.DIRECTION_REF_DATA_ID; import static uk.gov.moj.cpp.progression.helper.DirectionVerificationHelper.verifyTransformedQueryFormDirection; @@ -28,11 +28,11 @@ public class QueryFormDirectionIT extends AbstractIT { public static final String PTPH = "PTPH"; public static final String CATEGORIES = "pet_witness,pet_part_5"; - static final JsonObject jsonObject = Json.createObjectBuilder() - .add("data", Json.createObjectBuilder() - .add("prosecution", Json.createObjectBuilder() - .add("witnesses", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + static final JsonObject jsonObject = JsonObjects.createObjectBuilder() + .add("data", JsonObjects.createObjectBuilder() + .add("prosecution", JsonObjects.createObjectBuilder() + .add("witnesses", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("id", "84ec2958-8ab2-4b90-b32f-f3d5534d5ec9") .add("firstName", "Firstname") .add("lastName", "Lastname") @@ -41,14 +41,14 @@ public class QueryFormDirectionIT extends AbstractIT { .add("collarNumber", "Theofficercollar/shouldernumber") .add("rank", "Theofficerrank") .add("relevantDisputedIssue", "Relevantdisputedissue") - .add("details", Json.createArrayBuilder() + .add("details", JsonObjects.createArrayBuilder() .add("INTERMEDIARY") .add("POLICE_OFFICER") ) ) ) ) - .add("defence", Json.createObjectBuilder()) + .add("defence", JsonObjects.createObjectBuilder()) ) .add("lastUpdated", "2021-01-13T00:00Z[UTC]").build(); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReadCourtDocumentIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReadCourtDocumentIT.java index 71cc30699..bd0c69900 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReadCourtDocumentIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReadCourtDocumentIT.java @@ -3,7 +3,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.http.HttpStatus.SC_FORBIDDEN; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReceiveRepresentationOrderForApplicationIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReceiveRepresentationOrderForApplicationIT.java index 1b0c6eb41..053b42a3b 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReceiveRepresentationOrderForApplicationIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReceiveRepresentationOrderForApplicationIT.java @@ -36,6 +36,7 @@ import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; import static uk.gov.moj.cpp.progression.util.FileUtil.getPayloadAsJsonObject; import static uk.gov.moj.cpp.progression.util.ReferProsecutionCaseToCrownCourtHelper.getProsecutionCaseMatchers; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageConsumerClient; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClient; @@ -95,7 +96,7 @@ public static void setup() { } @Test - void shouldRaisePublicEventWhenApplicationIsFoundForReceiveRepresentationOrderForApplicationWithOrganisation() throws IOException, JSONException { + void shouldRaisePublicEventWhenApplicationIsFoundForReceiveRepresentationOrderForApplicationWithOrganisation() throws IOException, JSONException, InterruptedException { applicationId = randomUUID().toString(); subjectId = randomUUID().toString(); hearingId = randomUUID().toString(); @@ -141,6 +142,7 @@ void shouldRaisePublicEventWhenApplicationIsFoundForReceiveRepresentationOrderFo final JmsMessageConsumerClient messageConsumerClientPrivateForLaaReferenceUpdatedForHearing = newPrivateJmsMessageConsumerClientProvider(CONTEXT_NAME).withEventNames(PROGRESSION_APPLICATION_OFFENCES_UPDATED_FOR_HEARING).getMessageConsumerClient(); final JmsMessageConsumerClient messageConsumerClientPrivateForRepOrcerUpdatedForHearing = newPrivateJmsMessageConsumerClientProvider(CONTEXT_NAME).withEventNames(PROGRESSION_APPLICATION_REPORDER_UPDATED_FOR_HEARING).getMessageConsumerClient(); //When + sleepToBeRefactored(); receiveRepresentationOrderForApplication(applicationId, subjectId, offenceId, statusCode, laaContractNumber, applicationReference, userId); //Then diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReferProsecutionCaseToCrownCourtIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReferProsecutionCaseToCrownCourtIT.java index 1a718f7b3..b4b4120f7 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReferProsecutionCaseToCrownCourtIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ReferProsecutionCaseToCrownCourtIT.java @@ -175,7 +175,7 @@ public void shouldRemoveAndAddDocuments() throws Exception { addRemoveCourtDocument(courtDocumentId, materialIdActive, true, supportUserGroup); //read document - assertThat(getCourtDocumentsByCase(randomUUID().toString(), caseId).contains("{\"documentIndices\":[]}"), is(true)); + getCourtDocumentsByCase(randomUUID().toString(), caseId, new Matcher[]{withJsonPath("$.documentIndices.length()", is(0))}); } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UpdateCourtDocumentIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UpdateCourtDocumentIT.java index 52ed28adb..ab5da4370 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UpdateCourtDocumentIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UpdateCourtDocumentIT.java @@ -5,7 +5,7 @@ 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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UploadCourtDocumentIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UploadCourtDocumentIT.java index 5569ad9f2..16f700f6e 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UploadCourtDocumentIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/UploadCourtDocumentIT.java @@ -1,5 +1,32 @@ package uk.gov.moj.cpp.progression; +import com.google.common.io.Resources; +import io.restassured.response.Response; +import org.apache.http.HttpStatus; +import org.hamcrest.CoreMatchers; +import org.hamcrest.Matcher; +import org.json.JSONException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.Customization; +import org.skyscreamer.jsonassert.comparator.CustomComparator; +import uk.gov.justice.core.courts.CourtDocument; +import uk.gov.justice.core.courts.Material; +import uk.gov.justice.courts.progression.query.ApplicationDocument; +import uk.gov.justice.courts.progression.query.DocumentCategory; +import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageConsumerClient; +import uk.gov.moj.cpp.progression.helper.MultipartFileUploadHelper; +import uk.gov.moj.cpp.progression.stub.ReferenceDataStub; +import uk.gov.moj.cpp.progression.util.Utilities; + +import javax.json.JsonObject; +import java.io.IOException; +import java.nio.charset.Charset; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; @@ -54,9 +81,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.Customization; -import org.skyscreamer.jsonassert.comparator.CustomComparator; - -public class UploadCourtDocumentIT extends AbstractIT { +import org.skyscreamer.jsonassert.comparator.CustomComparator;public class UploadCourtDocumentIT extends AbstractIT { private MultipartFileUploadHelper helper; @@ -229,7 +254,8 @@ public void uploadApplicationDocument() throws Exception { private void assertCourtDocumentByApplication(String documentId, String documentTypeId, String materialId, String applicationId) throws JSONException { - final String courtDocumentsByApplication = getCourtDocumentsByApplication(USER_ID_VALUE.toString(), applicationId); + final String courtDocumentsByApplication = getCourtDocumentsByApplication(USER_ID_VALUE.toString(), applicationId, + new Matcher[]{withJsonPath("$.documentIndices[0].document.courtDocumentId", is(documentId))}); final String expectedPayload = getPayload("expected/expected.progression.upload.court-document-1.json") .replace("%DOCUMENT_ID%", documentId) .replace("%APPLICATION_ID%", applicationId) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/CourtAppealApplicationIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/CourtAppealApplicationIT.java index 4f7ed2fe4..ff3baa90f 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/CourtAppealApplicationIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/CourtAppealApplicationIT.java @@ -1,11 +1,21 @@ package uk.gov.moj.cpp.progression.applications; +import com.google.common.io.Resources; +import org.hamcrest.Matcher; +import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.skyscreamer.jsonassert.Customization; +import org.skyscreamer.jsonassert.comparator.CustomComparator; +import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; +import uk.gov.moj.cpp.progression.AbstractIT; + +import java.nio.charset.Charset; + import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; 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.skyscreamer.jsonassert.JSONAssert.assertEquals; import static org.skyscreamer.jsonassert.JSONCompareMode.STRICT; import static uk.gov.moj.cpp.progression.applications.applicationHelper.ApplicationHelper.initiateCourtProceedingsForCourtApplication; @@ -15,19 +25,6 @@ import static uk.gov.moj.cpp.progression.stub.IdMapperStub.stubForApplicationShortId; import static uk.gov.moj.cpp.progression.stub.ListingStub.getPostListCourtHearing; -import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; -import uk.gov.moj.cpp.progression.AbstractIT; - -import java.nio.charset.Charset; - -import javax.json.JsonObject; - -import com.google.common.io.Resources; -import org.hamcrest.Matcher; -import org.junit.jupiter.api.Test; -import org.skyscreamer.jsonassert.Customization; -import org.skyscreamer.jsonassert.comparator.CustomComparator; - public class CourtAppealApplicationIT extends AbstractIT { @Test @@ -93,12 +90,11 @@ public void shouldGertApplicationStatusByApplicationIds() throws Exception { initiateCourtProceedingsForCourtApplication(applicationId, "applications/progression.initiate-court-proceedings-for-stand-alone-court-appeal-application.json"); pollForCourtApplication(applicationId, withJsonPath("$.courtApplication.id", is(applicationId))); - final String response = pollForApplicationStatus(applicationId); - final JsonObject applicationStatusResponse = new StringToJsonObjectConverter().convert(response); - assertThat(applicationStatusResponse.getJsonArray("applicationsWithStatus").size(), equalTo(1)); - assertThat(applicationStatusResponse.getJsonArray("applicationsWithStatus").getJsonObject(0).getString("applicationId"), equalTo(applicationId)); - assertThat(applicationStatusResponse.getJsonArray("applicationsWithStatus").getJsonObject(0).getString("applicationStatus"), equalTo("UN_ALLOCATED")); - + pollForApplicationStatus(applicationId, + withJsonPath("$.applicationsWithStatus.length()", is(1)), + withJsonPath("$.applicationsWithStatus[0].applicationId", is(applicationId)), + withJsonPath("$.applicationsWithStatus[0].applicationStatus", is("UN_ALLOCATED"))); + Assertions.assertTrue(true); } private CustomComparator getCustomComparator(String applicationId, String applicationReference) { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/GenericSummonsApplicationIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/GenericSummonsApplicationIT.java index c6d756c0d..553beb7c2 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/GenericSummonsApplicationIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/GenericSummonsApplicationIT.java @@ -4,8 +4,8 @@ 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.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.allOf; @@ -45,7 +45,7 @@ import java.util.List; import java.util.Optional; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonString; @@ -257,7 +257,7 @@ private JsonObject createPublicHearingResultedV2(final JsonObject hearing, final final JsonObject courtApplication = courtApplicationsArray.getJsonObject(0); final JsonString sittingDay = hearing.getJsonArray("hearingDays").getJsonObject(0).getJsonString("sittingDay"); final String hearingDay = ZonedDateTimes.fromJsonString(sittingDay).toLocalDate().toString(); - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("isReshare", true) .add("hearingDay", hearingDay) .add("hearing", createObjectBuilder() diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/ReferBoxWorkApplicationIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/ReferBoxWorkApplicationIT.java index ba13b6ebc..a5590e434 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/ReferBoxWorkApplicationIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/ReferBoxWorkApplicationIT.java @@ -4,7 +4,7 @@ import static com.google.common.io.Resources.getResource; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/applicationHelper/ApplicationHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/applicationHelper/ApplicationHelper.java index c24727b1e..272f5229b 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/applicationHelper/ApplicationHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/applications/applicationHelper/ApplicationHelper.java @@ -5,6 +5,7 @@ import static java.util.UUID.randomUUID; import static javax.ws.rs.core.Response.Status.OK; import static org.apache.commons.lang3.StringUtils.isNotBlank; +import static org.eclipse.jetty.util.NanoTime.until; import static org.hamcrest.CoreMatchers.allOf; import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; @@ -13,15 +14,20 @@ import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; import static uk.gov.moj.cpp.progression.helper.AbstractTestHelper.getReadUrl; import static uk.gov.moj.cpp.progression.helper.AbstractTestHelper.getWriteUrl; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.TIMEOUT_IN_SECONDS; import static uk.gov.moj.cpp.progression.helper.RestHelper.pollForResponse; import static uk.gov.moj.cpp.progression.helper.RestHelper.postCommand; import java.io.IOException; import java.nio.charset.Charset; +import java.time.Duration; import com.google.common.io.Resources; import io.restassured.response.Response; import org.hamcrest.Matcher; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class ApplicationHelper { @@ -106,14 +112,18 @@ public static String pollForCourtApplication(final String applicationId, final M public static String pollForCourtApplicationOnly(final String applicationId, final Matcher... matchers) { return poll(requestParams(getReadUrl("/applications/" + applicationId), - "application/vnd.progression.query.application-only+json").withHeader(USER_ID, randomUUID())) + "application/vnd.progression.query.application-only+json").withHeader(USER_ID, randomUUID()).build(), + new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS)), + Duration.ofSeconds(TIMEOUT_IN_SECONDS)) .until(status().is(OK), payload().isJson(allOf(matchers))) .getPayload(); } public static String pollCourtApplicationForLaa(final String applicationId, final Matcher... matchers) { return poll(requestParams(getReadUrl("/applications/" + applicationId), - "application/vnd.progression.query.application-laa+json").withHeader(USER_ID, randomUUID())) + "application/vnd.progression.query.application-laa+json").withHeader(USER_ID, randomUUID()).build(), + new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS)), + Duration.ofSeconds(TIMEOUT_IN_SECONDS)) .until(status().is(OK), payload().isJson(allOf(matchers))).getPayload(); } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrIT.java index 331d71ba1..dd8e839f5 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/cotr/CotrIT.java @@ -39,8 +39,8 @@ import static java.lang.String.format; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.ACCEPTED; import org.hamcrest.CoreMatchers; import static org.hamcrest.CoreMatchers.anyOf; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/CourtRegisterDocumentRequestHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/CourtRegisterDocumentRequestHelper.java index 4dc27de61..4ac22722d 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/CourtRegisterDocumentRequestHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/CourtRegisterDocumentRequestHelper.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.apache.commons.lang3.StringUtils; @@ -62,7 +62,7 @@ public void sendSystemDocGeneratorPublicEvent(final UUID userId, final UUID cour } private JsonObject documentAvailablePayload(final UUID templatePayloadId, final String templateIdentifier, final String reportId, final UUID generatedDocumentId) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("payloadFileServiceId", templatePayloadId.toString()) .add("templateIdentifier", templateIdentifier) .add("conversionFormat", "pdf") @@ -76,7 +76,7 @@ private JsonObject documentAvailablePayload(final UUID templatePayloadId, final } private Metadata getMetadataFrom(final String userId, final UUID courtCentreId) { - return metadataFrom(Json.createObjectBuilder() + return metadataFrom(JsonObjects.createObjectBuilder() .add(ORIGINATOR, courtCentreId.toString()) .add(ID, randomUUID().toString()) .add(HeaderConstants.USER_ID, userId) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/MaterialHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/MaterialHelper.java index aff9cf09a..cb32c344a 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/MaterialHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/MaterialHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.helper; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider.newPublicJmsMessageProducerClientProvider; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonMetadata.ID; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/NowsDocumentRequestHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/NowsDocumentRequestHelper.java index 91c6f8f1b..e845b9135 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/NowsDocumentRequestHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/NowsDocumentRequestHelper.java @@ -16,20 +16,24 @@ import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; import static uk.gov.moj.cpp.progression.helper.EventSelector.EVENT_SELECTOR_PRISON_COURT_REGISTER_DOCUMENT_REQUEST_FAILED; import static uk.gov.moj.cpp.progression.helper.QueueUtil.retrieveMessageAsJsonPath; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.TIMEOUT_IN_SECONDS; import uk.gov.justice.services.common.http.HeaderConstants; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageConsumerClient; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClient; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClientProvider; import uk.gov.justice.services.messaging.Metadata; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; import uk.gov.moj.cpp.progression.it.framework.ContextNameProvider; +import java.time.Duration; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.UUID; import java.util.concurrent.TimeUnit; - -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -95,7 +99,7 @@ public void sendSystemDocGeneratorPublicFailedEvent(final UUID userId, final UUI } private JsonObject documentAvailablePayload(final UUID payloadFileServiceId, final String templateIdentifier, final String reportId, final UUID generatedDocumentId) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("payloadFileServiceId", payloadFileServiceId.toString()) .add("templateIdentifier", templateIdentifier) .add("conversionFormat", "pdf") @@ -109,7 +113,7 @@ private JsonObject documentAvailablePayload(final UUID payloadFileServiceId, fin } private JsonObject documentFailedPayload(final UUID payloadFileServiceId, final String templateIdentifier, final String reportId) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("payloadFileServiceId", payloadFileServiceId.toString()) .add("templateIdentifier", templateIdentifier) .add("conversionFormat", "pdf") @@ -122,7 +126,7 @@ private JsonObject documentFailedPayload(final UUID payloadFileServiceId, final } private Metadata getMetadataFrom(final String userId, final UUID courtCentreId, String name) { - return metadataFrom(Json.createObjectBuilder() + return metadataFrom(JsonObjects.createObjectBuilder() .add(ORIGINATOR, courtCentreId.toString()) .add(ID, randomUUID().toString()) .add(HeaderConstants.USER_ID, userId) @@ -133,8 +137,9 @@ private Metadata getMetadataFrom(final String userId, final UUID courtCentreId, private String getPrisonCourtRegisterDocumentRequests(final String requestStatus, final Matcher... matchers) { return poll(requestParams(getReadUrl(StringUtils.join("/prison-court-register/request/", requestStatus)), "application/vnd.progression.query.prison-court-register-document-by-court-centre+json") - .withHeader(HeaderConstants.USER_ID, USER_ID)) - .timeout(40, TimeUnit.SECONDS) + .withHeader(HeaderConstants.USER_ID, USER_ID).build(), + new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS)), + Duration.ofSeconds(TIMEOUT_IN_SECONDS)) .until( status().is(Response.Status.OK), payload().isJson(allOf( diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PreAndPostConditionHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PreAndPostConditionHelper.java index 094e1e0f2..a23af5a6b 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PreAndPostConditionHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PreAndPostConditionHelper.java @@ -2,6 +2,7 @@ import uk.gov.justice.services.common.converter.ZonedDateTimes; import uk.gov.justice.services.common.http.HeaderConstants; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; import uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher; import uk.gov.justice.services.test.utils.core.rest.RestClient; import uk.gov.moj.cpp.progression.helper.CourtApplicationsHelper.CourtApplicationRandomValues; @@ -10,6 +11,7 @@ import java.io.IOException; import java.nio.charset.Charset; import java.text.MessageFormat; +import java.time.Duration; import java.time.LocalDate; import java.util.List; import java.util.Map; @@ -17,8 +19,7 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.TimeUnit; - -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.core.MultivaluedMap; @@ -36,7 +37,7 @@ import static java.util.Arrays.asList; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.FORBIDDEN; import org.apache.commons.lang3.RandomStringUtils; @@ -52,8 +53,11 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; + +import static uk.gov.justice.services.messaging.JsonObjects.getJsonBuilderFactory; import static uk.gov.moj.cpp.progression.helper.AbstractTestHelper.getWriteUrl; import static uk.gov.moj.cpp.progression.helper.CaseHearingsQueryHelper.pollForHearing; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; import static uk.gov.moj.cpp.progression.helper.RestHelper.TIMEOUT_IN_SECONDS; import static uk.gov.moj.cpp.progression.helper.RestHelper.getJsonObject; @@ -108,7 +112,7 @@ public static Response addProsecutionCaseToMagsCourt(final String caseId, final public static Response addRemoveCourtDocument(final String courtDocumentId, final String materialId, final boolean isRemoved, final UUID userId) { return postCommandWithUserId(getWriteUrl(String.format("/courtdocument/%s/material/%s", courtDocumentId, materialId)), "application/vnd.progression.remove-court-document+json", - Json.createObjectBuilder().add("isRemoved", isRemoved).build().toString(), userId.toString()); + JsonObjects.createObjectBuilder().add("isRemoved", isRemoved).build().toString(), userId.toString()); } public static Response recordLAAReference(final String caseId, final String defendantId, final String offenceId, final String statusCode) { @@ -386,7 +390,7 @@ public static Response initiateCourtProceedings(final String resourceLocation, f public static Response deleteRelatedReference(final String caseId, final String relatedReferenceId) { return postCommand(getWriteUrl("/prosecutioncases/" + caseId), "application/vnd.progression.delete-related-reference+json", - Json.createObjectBuilder().add("relatedReferenceId", relatedReferenceId).build().toString()); + getJsonBuilderFactory().createObjectBuilder().add("relatedReferenceId", relatedReferenceId).build().toString()); } @@ -1201,7 +1205,7 @@ public static List pollCaseAndGetHearingsForDefendant(final String caseI @SafeVarargs public static String pollCaseAndGetHearingForDefendant(final String caseId, final String defendantId, final Matcher... additionalMatchers) { return await() - .pollInterval(INTERVAL_IN_MILLISECONDS, TimeUnit.MILLISECONDS) + .pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))) .timeout(TIMEOUT_IN_SECONDS, TimeUnit.SECONDS) .until(() -> { try { @@ -1280,6 +1284,10 @@ public static String getCourtDocumentsByCase(final String userId, final String c return pollForResponse(MessageFormat.format("/courtdocumentsearch?caseId={0}", caseId), "application/vnd.progression.query.courtdocuments+json", userId); } + public static String getCourtDocumentsByCase(final String userId, final String caseId, final Matcher[] matchers) { + return pollForResponse(MessageFormat.format("/courtdocumentsearch?caseId={0}", caseId), "application/vnd.progression.query.courtdocuments+json", userId, matchers); + } + public static String getCourtDocumentsPerCase(final String userId, final String caseId, final Matcher[] matchers) { return pollForResponse(MessageFormat.format("/courtdocumentsearch?caseId={0}", caseId), "application/vnd.progression.query.courtdocuments-all+json", userId, matchers); } @@ -1823,7 +1831,7 @@ public static String createReferSJPCaseToCrownCourtJsonBody(final String caseId, } public static Response removeCaseFromGroupCases(final UUID caseId, final UUID groupId) { - final JsonObject payload = createObjectBuilder() + final JsonObject payload = getJsonBuilderFactory().createObjectBuilder() .add("prosecutionCaseId", caseId.toString()) .add("groupId", groupId.toString()) .build(); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PrisonCourtRegisterDocumentRequestHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PrisonCourtRegisterDocumentRequestHelper.java index 460173379..9bd985049 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PrisonCourtRegisterDocumentRequestHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/PrisonCourtRegisterDocumentRequestHelper.java @@ -2,8 +2,8 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/RestHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/RestHelper.java index 1b7d2e0a2..75a244018 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/RestHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/RestHelper.java @@ -1,5 +1,25 @@ package uk.gov.moj.cpp.progression.helper; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; +import org.apache.http.HttpStatus; +import org.hamcrest.Matcher; +import uk.gov.justice.services.common.http.HeaderConstants; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; +import uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher; +import uk.gov.justice.services.test.utils.core.rest.RestClient; + +import javax.json.JsonObject; +import javax.json.JsonReader; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.MultivaluedHashMap; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Response.Status; +import java.io.StringReader; +import java.time.Duration; +import java.util.UUID; + import static io.restassured.RestAssured.given; import static java.util.UUID.randomUUID; import static javax.ws.rs.core.Response.Status.OK; @@ -7,44 +27,24 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; +import static uk.gov.justice.services.messaging.JsonObjects.getJsonReaderFactory; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; import static uk.gov.justice.services.test.utils.core.http.RestPoller.poll; import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; import static uk.gov.moj.cpp.progression.helper.AbstractTestHelper.getReadUrl; -import uk.gov.justice.services.common.http.HeaderConstants; -import uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher; -import uk.gov.justice.services.test.utils.core.rest.RestClient; - -import java.io.StringReader; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response.Status; - -import io.restassured.builder.RequestSpecBuilder; -import io.restassured.response.Response; -import io.restassured.specification.RequestSpecification; -import org.apache.http.HttpStatus; -import org.hamcrest.Matcher; - public class RestHelper { - public static final int TIMEOUT_IN_SECONDS = 30; - public static final int INTERVAL_IN_MILLISECONDS = 300; + public static final int TIMEOUT_IN_SECONDS = 15; + public static final int INTERVAL_IN_MILLISECONDS = 100; public static final String HOST = System.getProperty("INTEGRATION_HOST_KEY", "localhost"); private static final int PORT = 8080; private static final String BASE_URI = "http://" + HOST + ":" + PORT; private static final RestClient restClient = new RestClient(); private static final RequestSpecification REQUEST_SPECIFICATION = new RequestSpecBuilder().setBaseUri(BASE_URI).build(); + public static final int INITIAL_INTERVAL_IN_MILLISECONDS = 10; public static javax.ws.rs.core.Response getMaterialContentResponse(final String path, final UUID userId, final String mediaType) { final MultivaluedMap map = new MultivaluedHashMap<>(); @@ -71,9 +71,9 @@ public static String pollForResponse(final String path, final String mediaType, public static String pollForResponse(final String path, final String mediaType, final String userId, final ResponseStatusMatcher responseStatusMatcher, final Matcher... payloadMatchers) { return poll(requestParams(getReadUrl(path), mediaType) - .withHeader(USER_ID, userId).build()) - .pollInterval(INTERVAL_IN_MILLISECONDS, TimeUnit.MILLISECONDS) - .timeout(TIMEOUT_IN_SECONDS, TimeUnit.SECONDS) + .withHeader(USER_ID, userId).build(), + new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS)), + Duration.ofSeconds(TIMEOUT_IN_SECONDS)) .until( responseStatusMatcher, payload().isJson(allOf(payloadMatchers)) @@ -83,7 +83,7 @@ public static String pollForResponse(final String path, final String mediaType, public static JsonObject getJsonObject(final String jsonAsString) { final JsonObject payload; - try (final JsonReader jsonReader = Json.createReader(new StringReader(jsonAsString))) { + try (final JsonReader jsonReader = getJsonReaderFactory().createReader(new StringReader(jsonAsString))) { payload = jsonReader.readObject(); } return payload; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/StubUtil.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/StubUtil.java index 2ce4f1a0b..ce83647b4 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/StubUtil.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/helper/StubUtil.java @@ -9,7 +9,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_OK; import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/AddDefendantsToCourtProceedingsIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/AddDefendantsToCourtProceedingsIT.java index a00d2a32a..31fcc607a 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/AddDefendantsToCourtProceedingsIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/AddDefendantsToCourtProceedingsIT.java @@ -5,7 +5,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/EmbeddedCourtApplicationUpdatedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/EmbeddedCourtApplicationUpdatedIT.java index 35c7f1f83..cf834c90d 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/EmbeddedCourtApplicationUpdatedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/EmbeddedCourtApplicationUpdatedIT.java @@ -35,7 +35,7 @@ import java.io.IOException; import java.util.Optional; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonString; @@ -184,7 +184,7 @@ private DocumentContext documentContext(final String caseUrn) { final JsonObject commandJsonInputJson = jsonFromString(commandJson); final DocumentContext prosecutionCase = parse(commandJsonInputJson); final JsonObject prosecutionCaseJO = prosecutionCase.read("$.courtReferral.prosecutionCases[0]"); - final JsonObject prosecutionCaseEvent = Json.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); + final JsonObject prosecutionCaseEvent = JsonObjects.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); return parse(prosecutionCaseEvent); } } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingConfirmedForCourtApplicationsIngestIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingConfirmedForCourtApplicationsIngestIT.java index bb4fbb243..22bc6730e 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingConfirmedForCourtApplicationsIngestIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingConfirmedForCourtApplicationsIngestIT.java @@ -34,7 +34,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.jayway.jsonpath.DocumentContext; @@ -170,7 +170,7 @@ private DocumentContext initialCase() { final JsonObject commandJsonInputJson = jsonFromString(commandJson); final DocumentContext prosecutionCase = parse(commandJsonInputJson); final JsonObject prosecutionCaseJO = prosecutionCase.read("$.courtReferral.prosecutionCases[0]"); - final JsonObject prosecutionCaseEvent = Json.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); + final JsonObject prosecutionCaseEvent = JsonObjects.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); return parse(prosecutionCaseEvent); } } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingResultedCaseUpdatedIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingResultedCaseUpdatedIT.java index 15f2edbf2..135651354 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingResultedCaseUpdatedIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/HearingResultedCaseUpdatedIT.java @@ -21,6 +21,7 @@ import static uk.gov.moj.cpp.progression.ingester.verificationHelpers.IngesterUtil.getStringFromResource; import static uk.gov.moj.cpp.progression.ingester.verificationHelpers.IngesterUtil.jsonFromString; import static uk.gov.moj.cpp.progression.it.framework.ContextNameProvider.CONTEXT_NAME; +import static uk.gov.moj.cpp.progression.util.Utilities.sleepToBeRefactored; import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClient; @@ -32,8 +33,9 @@ import java.io.IOException; import java.util.Optional; import java.util.Random; +import uk.gov.justice.services.messaging.JsonObjects; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.jayway.jsonpath.DocumentContext; @@ -81,9 +83,11 @@ public void shouldIndexHearingResultedCaseUpdatedEvent() throws Exception { verifyInitialElasticSearchCase(inputProsecutionCase, initialElasticSearchCaseResponseJsonObject.get(), "ACTIVE"); + sleepToBeRefactored(); // not all events are processed immediately sendEventToMessageQueue(); - final Matcher[] postMatchers = {withJsonPath("$.caseStatus", equalTo("INACTIVE"))}; + final Matcher[] postMatchers = {withJsonPath("$.caseStatus", equalTo("INACTIVE")), + withJsonPath("$.parties[0].postCode", equalTo("GIR 0AA"))}; final Optional updatedElasticSearchCaseResponseJsonObject = findBy(postMatchers); assertTrue(updatedElasticSearchCaseResponseJsonObject.isPresent()); @@ -144,7 +148,7 @@ private DocumentContext initialCase() { final JsonObject commandJsonInputJson = jsonFromString(commandJson); final DocumentContext prosecutionCase = parse(commandJsonInputJson); final JsonObject prosecutionCaseJO = prosecutionCase.read("$.courtReferral.prosecutionCases[0]"); - final JsonObject prosecutionCaseEvent = Json.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); + final JsonObject prosecutionCaseEvent = JsonObjects.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); return parse(prosecutionCaseEvent); } } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/InitiateCourtProceedingsIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/InitiateCourtProceedingsIT.java index 4937d873e..848da584f 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/InitiateCourtProceedingsIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/InitiateCourtProceedingsIT.java @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.io.Resources; @@ -130,7 +130,7 @@ private DocumentContext documentContext(final String caseUrn) throws IOException final JsonObject commandJsonInputJson = jsonFromString(commandJson); final DocumentContext prosecutionCase = parse(commandJsonInputJson); final JsonObject prosecutionCaseJO = prosecutionCase.read("$.initiateCourtProceedings.prosecutionCases[0]"); - final JsonObject prosecutionCaseEvent = Json.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); + final JsonObject prosecutionCaseEvent = JsonObjects.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); return parse(prosecutionCaseEvent); } } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/MultipleLinkedApplicationWithCaseIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/MultipleLinkedApplicationWithCaseIT.java index 0a7ec0042..65d62e9d6 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/MultipleLinkedApplicationWithCaseIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/MultipleLinkedApplicationWithCaseIT.java @@ -26,7 +26,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonString; @@ -153,7 +153,7 @@ private DocumentContext documentContext(final String caseUrn) { final JsonObject commandJsonInputJson = jsonFromString(commandJson); final DocumentContext prosecutionCase = parse(commandJsonInputJson); final JsonObject prosecutionCaseJO = prosecutionCase.read("$.courtReferral.prosecutionCases[0]"); - final JsonObject prosecutionCaseEvent = Json.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); + final JsonObject prosecutionCaseEvent = JsonObjects.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); return parse(prosecutionCaseEvent); } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantListingStatusChangedEventIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantListingStatusChangedEventIT.java index b15095876..db6e0cb2f 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantListingStatusChangedEventIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantListingStatusChangedEventIT.java @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.progression.ingester; +import uk.gov.justice.services.messaging.JsonObjects; + import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import uk.gov.justice.services.integrationtest.utils.jms.JmsMessageProducerClient; import uk.gov.justice.services.messaging.JsonEnvelope; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantUpdatedIngesterIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantUpdatedIngesterIT.java index 47bbdde93..b9a7a0659 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantUpdatedIngesterIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/ProsecutionCaseDefendantUpdatedIngesterIT.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.util.Optional; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.ws.rs.core.Response; @@ -155,7 +155,7 @@ private DocumentContext documentContextForProsecutionCase() { final JsonObject commandJsonInputJson = jsonFromString(commandJson); final DocumentContext prosecutionCase = parse(commandJsonInputJson); final JsonObject prosecutionCaseJO = prosecutionCase.read("$.courtReferral.prosecutionCases[0]"); - final JsonObject prosecutionCaseEvent = Json.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); + final JsonObject prosecutionCaseEvent = JsonObjects.createObjectBuilder().add("prosecutionCase", prosecutionCaseJO).build(); return parse(prosecutionCaseEvent); } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/CourtApplicationVerificationHelper.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/CourtApplicationVerificationHelper.java index 7a2b6f4ea..9bc376f89 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/CourtApplicationVerificationHelper.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/CourtApplicationVerificationHelper.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.ingester.verificationHelpers; -import static javax.json.Json.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertNotNull; import static uk.gov.moj.cpp.progression.ingester.verificationHelpers.PersonVerificationHelper.assertApplicantDetails; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/IngesterUtil.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/IngesterUtil.java index 21a69035f..0b575a05b 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/IngesterUtil.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/ingester/verificationHelpers/IngesterUtil.java @@ -7,7 +7,7 @@ import java.io.StringReader; import java.nio.charset.Charset; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -17,7 +17,7 @@ public class IngesterUtil { private static final Poller poller = new Poller(1000, 10L); public static JsonObject jsonFromString(final String jsonObjectStr) { - JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/AuthorisationServiceStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/AuthorisationServiceStub.java index 50f23dcfc..1b34b36f3 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/AuthorisationServiceStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/AuthorisationServiceStub.java @@ -10,9 +10,7 @@ import uk.gov.moj.cpp.progression.helper.StubUtil; import java.util.UUID; - -import javax.json.Json; - +import uk.gov.justice.services.messaging.JsonObjects; public class AuthorisationServiceStub extends StubUtil { private static final String CAPABILITY_ENABLEMENT_QUERY_URL = "/authorisation-service-server/rest/capabilities/%s"; @@ -23,7 +21,7 @@ public static void stubEnableAllCapabilities() { } private static void stubEnableCapabilities(final String stubUrl, final boolean statusToReturn) { - final String responsePayload = Json.createObjectBuilder().add("enabled", statusToReturn).build().toString(); + final String responsePayload = JsonObjects.createObjectBuilder().add("enabled", statusToReturn).build().toString(); stubFor(get(urlMatching(stubUrl)) .willReturn(aResponse().withStatus(SC_OK) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/DocumentGeneratorStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/DocumentGeneratorStub.java index bae07d863..e3f9b1e77 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/DocumentGeneratorStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/DocumentGeneratorStub.java @@ -18,21 +18,24 @@ import static org.hamcrest.Matchers.not; import static uk.gov.justice.services.test.utils.core.random.RandomGenerator.STRING; import static uk.gov.moj.cpp.progression.helper.PdfTestHelper.asPdf; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; import java.io.StringReader; +import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.function.Predicate; import java.util.stream.Collectors; - -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.github.tomakehurst.wiremock.verification.LoggedRequest; import org.awaitility.core.ConditionTimeoutException; import org.json.JSONException; import org.json.JSONObject; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class DocumentGeneratorStub { @@ -87,7 +90,7 @@ public static Optional getCrownCourtExtractDocumentRequestByDefendan public static Optional getSummonsTemplate(final String templateName, final String... contains) { final List documentRequests = getDocumentRequestsAsStream(); return documentRequests.stream() - .map(s -> Json.createReader(new StringReader(s)).readObject()) + .map(s -> JsonObjects.createReader(new StringReader(s)).readObject()) .filter(request -> Arrays.stream(contains).allMatch(request.toString()::contains)) .filter(json -> json.getString("templateName").equals(templateName)) .map(json -> json.getJsonObject("templatePayload")) @@ -105,7 +108,7 @@ private static List getDocumentRequestsAsStream() { public static Optional getHearingEventTemplate(final String templateName) { final List documentRequests = getDocumentRequestsAsStream(); return documentRequests.stream() - .map(s -> Json.createReader(new StringReader(s)).readObject()) + .map(s -> JsonObjects.createReader(new StringReader(s)).readObject()) .filter(json -> json.getString("templateName").equals(templateName)) .map(json -> json.getJsonObject("templatePayload")) .findFirst(); @@ -113,7 +116,7 @@ public static Optional getHearingEventTemplate(final String template public static Optional pollDocumentGenerationRequest(final Predicate requestPayloadPredicate) { try { - return await().timeout(30, SECONDS).pollInterval(500, MILLISECONDS).until(() -> findAll(postRequestedFor(urlPathMatching(PATH))) + return await().timeout(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> findAll(postRequestedFor(urlPathMatching(PATH))) .stream() .map(LoggedRequest::getBodyAsString) .map(t -> { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/HearingStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/HearingStub.java index 77fc9d96e..9ded86329 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/HearingStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/HearingStub.java @@ -15,6 +15,8 @@ import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.apache.http.HttpStatus.SC_OK; import static org.awaitility.Awaitility.waitAtMost; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; import java.time.Duration; import java.util.stream.Stream; @@ -22,6 +24,7 @@ import com.github.tomakehurst.wiremock.verification.LoggedRequest; import org.json.JSONException; import org.json.JSONObject; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class HearingStub { @@ -39,7 +42,7 @@ public static void stubInitiateHearing() { } public static void verifyPostInitiateCourtHearing(final String hearingId) { - waitAtMost(Duration.ofSeconds(10)).pollInterval(500, MILLISECONDS).until(() -> { + waitAtMost(Duration.ofSeconds(10)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final Stream listCourtHearingRequestsAsStream = getListCourtHearingRequestsAsStream(); return listCourtHearingRequestsAsStream.anyMatch( payload -> { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/IdMapperStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/IdMapperStub.java index 572c7783e..8b5a959b6 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/IdMapperStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/IdMapperStub.java @@ -10,7 +10,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.ws.rs.core.Response; import org.apache.http.HttpHeaders; @@ -96,7 +96,7 @@ public static void stubForIdMapperSuccess(final Response.Status status, final UU .withHeader(HttpHeaders.CONTENT_TYPE, equalTo(mime)) .willReturn(aResponse() .withStatus(status.getStatusCode()) - .withBody(Json.createObjectBuilder().add("id", id.toString()).build().toString()) + .withBody(JsonObjects.createObjectBuilder().add("id", id.toString()).build().toString()) ) ); } diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/LaaAPIMServiceStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/LaaAPIMServiceStub.java index 9b6f3f888..e1af75573 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/LaaAPIMServiceStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/LaaAPIMServiceStub.java @@ -16,7 +16,10 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static javax.ws.rs.core.Response.Status.OK; import static org.awaitility.Awaitility.await; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; +import java.time.Duration; import java.util.List; import com.github.tomakehurst.wiremock.client.CountMatchingStrategy; @@ -24,6 +27,7 @@ import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class LaaAPIMServiceStub { private static final Logger LOGGER = LoggerFactory.getLogger(LaaAPIMServiceStub.class); @@ -47,7 +51,7 @@ public static void verifyLaaProceedingsConcludedCommandInvoked(final int count, } private static void verifyLaaProceedingsConcludedCommandInvoked(final String commandEndPoint, final CountMatchingStrategy countMatchingStrategy, final List expectedValues) { - await().atMost(30, SECONDS).pollInterval(500, MILLISECONDS).until(() -> { + await().atMost(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final RequestPatternBuilder requestPatternBuilder = postRequestedFor(urlPathMatching(commandEndPoint)); expectedValues.forEach( expectedValue -> requestPatternBuilder.withRequestBody(containing(expectedValue)) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ListingStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ListingStub.java index 524926d66..c3511e6ac 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ListingStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ListingStub.java @@ -30,11 +30,16 @@ import static org.awaitility.Awaitility.waitAtMost; import org.json.JSONException; import org.json.JSONObject; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; + import static uk.gov.justice.services.common.http.HeaderConstants.ID; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; public class ListingStub { + private static final String LISTING_ANY_ALLOCATION_PATH = "/listing-service/query/api/rest/listing/hearings/any-allocation"; private static final String LISTING_COMMAND = "/listing-service/command/api/rest/listing/cases"; private static final String LISTING_HEARING_COMMAND_V2 = "/listing-service/command/api/rest/listing/hearings/.*"; private static final String LISTING_DELETE_HEARING_COMMAND = "/listing-command-api/command/api/rest/listing/delete-hearing/"; @@ -102,7 +107,7 @@ public static void stubListCourtHearing() { public static void verifyPostListCourtHearing(final String caseId, final String defendantId) { try { - waitAtMost(ofMinutes(1)).until(() -> + waitAtMost(Duration.ofSeconds(20)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> getListCourtHearingRequestsAsStream() .anyMatch( payload -> { @@ -129,7 +134,7 @@ public static void verifyPostListCourtHearing(final String caseId, final String public static void verifyPostListCourtHearing(final String caseId, final String defendantId, final String courtScheduleId) { try { - waitAtMost(ofMinutes(1)).until(() -> + waitAtMost(Duration.ofSeconds(20)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> getListCourtHearingRequestsAsStream() .anyMatch( payload -> { @@ -165,7 +170,7 @@ public static void verifyPostListCourtHearing(final String caseId, final String public static String verifyPostListCourtHearingForGroupCase(final String containsText) { try { - return waitAtMost(Duration.ofMinutes(1)).until(() -> { + return waitAtMost(Duration.ofSeconds(20)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final Stream listCourtHearingRequestsAsStream = getListCourtHearingRequestsAsStream(); return listCourtHearingRequestsAsStream .filter(payload -> { @@ -190,7 +195,7 @@ public static String verifyPostListCourtHearingForGroupCase(final String contain public static void verifyPostListCourtHearing(final String caseId, final String defendantId, final boolean isYouth) { try { - waitAtMost(ofMinutes(1)).pollInterval(500, MILLISECONDS).until(() -> + waitAtMost(ofMinutes(1)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> getListCourtHearingRequestsAsStream() .anyMatch( payload -> { @@ -221,7 +226,7 @@ public static void verifyPostListCourtHearing(final String caseId, final String public static void verifyPostListCourtHearing(final String applicationId) { try { - waitAtMost(ofSeconds(30)).pollInterval(500, MILLISECONDS).until(() -> + waitAtMost(ofSeconds(10)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> getListCourtHearingRequestsAsStream() .anyMatch( payload -> { @@ -251,7 +256,7 @@ public static void verifyPostListCourtHearing(final String applicationId) { public static void verifyPostListCourtHearingV2ForHmiSlots() { try { - waitAtMost(ofSeconds(30)).until(() -> + waitAtMost(ofSeconds(10)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> getListCourtHearingRequestsAsStreamV2() .anyMatch(payload -> payload.toString().contains("bookedSlots"))); } catch ( @@ -262,7 +267,7 @@ public static void verifyPostListCourtHearingV2ForHmiSlots() { public static void verifyPostListCourtHearingV2() { try { - waitAtMost(ofSeconds(30)).pollInterval(500, MILLISECONDS).until(() -> + waitAtMost(ofSeconds(10)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> getListCourtHearingRequestsAsStreamV2() .anyMatch( payload -> payload.has("hearings") @@ -275,7 +280,7 @@ public static void verifyPostListCourtHearingV2() { } public static void verifyListNextHearingRequestsAsStreamV2(final String hearingId, final String estimatedDuration) { - waitAtMost(ofSeconds(30)).pollInterval(500, MILLISECONDS).until(() -> { + waitAtMost(ofSeconds(10)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final Stream listCourtHearingRequestsAsStream = getListCourtHearingRequestsAsStreamV2(); return listCourtHearingRequestsAsStream.anyMatch( payload -> { @@ -299,7 +304,7 @@ public static void verifyListNextHearingRequestsAsStreamV2(final String hearingI public static String getPostListCourtHearing(final String applicationId) { try { - return waitAtMost(ofSeconds(30)).pollInterval(500, MILLISECONDS).until(() -> + return waitAtMost(Duration.ofSeconds(20)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final Stream listCourtHearingRequestsAsStream = getListCourtHearingRequestsAsStream(); return listCourtHearingRequestsAsStream @@ -329,8 +334,8 @@ public static String getPostListCourtHearing(final String applicationId) { public static void verifyListUnscheduledHearingRequestsAsStreamV2(final String hearingId, final String estimatedDuration) { - waitAtMost(ofSeconds(30)).pollInterval(500, MILLISECONDS).until(() -> { - final Stream listCourtHearingRequestsAsStream = getListUnscheduledHearingRequestsAsStreamV2(); + waitAtMost(Duration.ofSeconds(20)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { + final Stream listCourtHearingRequestsAsStream = getListUnscheduledHearingRequestsAsStreamV2(); return listCourtHearingRequestsAsStream.anyMatch( payload -> { try { @@ -409,8 +414,6 @@ private static Stream getListCourtHearingRequestsAsStreamV2() { }); } - private static final String LISTING_ANY_ALLOCATION_PATH = "/listing-service/query/api/rest/listing/hearings/any-allocation"; - public static void setupListingAnyAllocationQuery(final String caseUrn, final String startDate, final String resource) { stubFor(get(urlPathEqualTo(LISTING_ANY_ALLOCATION_PATH)) .willReturn(aResponse().withStatus(OK.getStatusCode()) @@ -429,7 +432,9 @@ public static void setupListingAnyFutureAllocationQuery(final String caseUrn, fi public static void stubListingSearchHearingsQuery(final String resource, final String hearingId) { - stubFor(get(urlPathEqualTo(LISTING_ANY_ALLOCATION_PATH)) + + final String urlPath = format("/listing-service/query/api/rest/listing/hearings/any-allocation"); + stubFor(get(urlPathEqualTo(urlPath)) .willReturn(aResponse().withStatus(OK.getStatusCode()) .withHeader(ID, randomUUID().toString()) .withHeader(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON) @@ -448,7 +453,7 @@ public static void stubListingCotrSearch(final String resource, final String hea public static void verifyPostListCourtHearingWithProsecutorInfo(final String caseId, final String defendantId, final String courtScheduleId) { try { - waitAtMost(ofSeconds(30)).pollInterval(500, MILLISECONDS).until(() -> getListCourtHearingRequestsAsStream() + waitAtMost(ofSeconds(30)).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> getListCourtHearingRequestsAsStream() .anyMatch( payload -> { try { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/MaterialStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/MaterialStub.java index 7876adff9..00c1c9de0 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/MaterialStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/MaterialStub.java @@ -12,18 +12,22 @@ import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.apache.http.HttpStatus.SC_OK; import static org.awaitility.Awaitility.await; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; +import java.time.Duration; import java.time.ZonedDateTime; import java.util.Arrays; import java.util.UUID; import com.github.tomakehurst.wiremock.client.VerificationException; import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class MaterialStub { @@ -77,7 +81,7 @@ public static void verifyMaterialCreated() { } public static void verifyMaterialCreated(String... expectedValues) { - await().atMost(30, SECONDS).pollInterval(500, MILLISECONDS).until(() -> { + await().atMost(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { RequestPatternBuilder requestPatternBuilder = postRequestedFor(urlPathMatching(UPLOAD_MATERIAL_COMMAND)); Arrays.stream(expectedValues).forEach( expectedValue -> requestPatternBuilder.withRequestBody(containing(expectedValue)) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/NotificationServiceStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/NotificationServiceStub.java index 967fa9a9c..77de46664 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/NotificationServiceStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/NotificationServiceStub.java @@ -21,7 +21,10 @@ import static org.apache.http.HttpStatus.SC_OK; import static org.awaitility.Awaitility.await; import static uk.gov.justice.services.common.http.HeaderConstants.ID; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; +import java.time.Duration; import java.util.List; import java.util.Optional; import java.util.UUID; @@ -29,6 +32,7 @@ import com.github.tomakehurst.wiremock.client.CountMatchingStrategy; import com.github.tomakehurst.wiremock.client.VerificationException; import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class NotificationServiceStub { public static final String NOTIFICATION_NOTIFY_ENDPOINT = "/notificationnotify-service/command/api/rest/notificationnotify/notifications/.*"; @@ -66,7 +70,7 @@ public static void stubPostCallsNotificationNotify() { } public static void verifyEmailNotificationIsRaisedWithoutAttachment(final List expectedValues, CountMatchingStrategy expectedCount) { - await().atMost(30, SECONDS).pollInterval(500, MILLISECONDS).until(() -> { + await().atMost(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final RequestPatternBuilder requestPatternBuilder = postRequestedFor(urlPathMatching(NOTIFICATION_NOTIFY_ENDPOINT)); expectedValues.forEach( expectedValue -> requestPatternBuilder.withRequestBody(containing(expectedValue)) @@ -94,7 +98,7 @@ public static void verifyEmailNotificationIsRaisedWithAttachment(final List expectedValues, Optional materialId) { - await().atMost(30, SECONDS).pollInterval(500, MILLISECONDS).until(() -> { + await().atMost(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final RequestPatternBuilder requestPatternBuilder = postRequestedFor(urlPathMatching(NOTIFICATION_NOTIFY_ENDPOINT)); expectedValues.forEach( expectedValue -> requestPatternBuilder.withRequestBody(containing(expectedValue)) @@ -111,7 +115,7 @@ public static void verifyEmailNotificationIsRaisedWithAttachment(final List expectedValues) { - await().atMost(30, SECONDS).pollInterval(500, MILLISECONDS).until(() -> { + await().atMost(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { RequestPatternBuilder requestPatternBuilder = postRequestedFor(urlPathMatching(NOTIFICATION_NOTIFY_ENDPOINT)); expectedValues.forEach( expectedValue -> requestPatternBuilder.withRequestBody(containing(expectedValue)) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ProbationCaseworkerStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ProbationCaseworkerStub.java index d334e48fc..c1fa8e0b2 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ProbationCaseworkerStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ProbationCaseworkerStub.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.progression.stub; +import java.time.Duration; import java.util.List; import com.github.tomakehurst.wiremock.client.VerificationException; @@ -17,8 +18,12 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.awaitility.Awaitility.await; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class ProbationCaseworkerStub { public static final String PROBATION_HEARING_COMMAND = "/probation/api/v1/hearing/details"; @@ -45,7 +50,7 @@ public static void verifyProbationHearingDeletedCommandInvoked(final List expectedValues) { - await().atMost(30, SECONDS).pollInterval(500, MILLISECONDS).until(() -> { + await().atMost(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final RequestPatternBuilder requestPatternBuilder = postRequestedFor(urlPathMatching(commandEndPoint)); expectedValues.forEach( expectedValue -> requestPatternBuilder.withRequestBody(containing(expectedValue)) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataOffenceStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataOffenceStub.java index f31b6353f..daff30d8c 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataOffenceStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataOffenceStub.java @@ -10,13 +10,13 @@ import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static org.apache.http.HttpStatus.SC_OK; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class ReferenceDataOffenceStub { public static void stubReferenceDataOffencesGetOffenceById(final String resourceName) { - final JsonObject offenceResponsePayLoad = Json.createReader(ReferenceDataOffenceStub.class + final JsonObject offenceResponsePayLoad = JsonObjects.createReader(ReferenceDataOffenceStub.class .getResourceAsStream(resourceName)).readObject(); final String urlPath = "/referencedataoffences-service/query/api/rest/referencedataoffences/offences/.*"; @@ -29,7 +29,7 @@ public static void stubReferenceDataOffencesGetOffenceById(final String resource } public static void stubReferenceDataOffencesGetOffenceByOffenceCode(final String resourceName) { - final JsonObject offenceResponsePayLoad = Json.createReader(ReferenceDataOffenceStub.class + final JsonObject offenceResponsePayLoad = JsonObjects.createReader(ReferenceDataOffenceStub.class .getResourceAsStream(resourceName)).readObject(); final String urlPath = "/referencedataoffences-service/query/api/rest/referencedataoffences/offences"; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataStub.java index adfb7010c..afead3698 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/ReferenceDataStub.java @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.collect.Lists; @@ -51,7 +51,7 @@ public static void stubPleaTypes() { } public static void stubQueryLocalJusticeArea(final String resourceName) { - final JsonObject jsonObject = Json.createReader(ReferenceDataStub.class + final JsonObject jsonObject = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -76,7 +76,7 @@ public static void stubReferenceDataResultDefinitionWithCategory() { } public static void stubQueryOrganisation(final String resourceName) { - final JsonObject judge = Json.createReader(ReferenceDataStub.class + final JsonObject judge = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -104,7 +104,7 @@ public static void stubQueryProsecutorsByOucode(final String resourceName, final } public static void stubQueryCourtsCodeData(final String resourceName) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -117,7 +117,7 @@ public static void stubQueryCourtsCodeData(final String resourceName) { } public static void stubQueryOrganisationUnitsData(final String resourceName) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -130,7 +130,7 @@ public static void stubQueryOrganisationUnitsData(final String resourceName) { } public static void stubQueryAllResultDefinitions(final String resourceName) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -143,7 +143,7 @@ public static void stubQueryAllResultDefinitions(final String resourceName) { } public static void stubQueryDocumentTypeData(final String resourceName) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -156,7 +156,7 @@ public static void stubQueryDocumentTypeData(final String resourceName) { } public static void stubQueryDocumentTypeAccessQueryData(final String resourceName) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -169,7 +169,7 @@ public static void stubQueryDocumentTypeAccessQueryData(final String resourceNam } public static void stubQueryDocumentTypeData(final String resourceName, final String documentTypeId) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -183,7 +183,7 @@ public static void stubQueryDocumentTypeData(final String resourceName, final St public static void stubGetDocumentsTypeAccess(final String filePath) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(filePath)) .readObject(); @@ -195,7 +195,7 @@ public static void stubGetDocumentsTypeAccess(final String filePath) { } public static void stubCourtApplicationTypes(final String resourceName) { - final JsonObject applicationTypesResponse = Json.createReader(ReferenceDataStub.class + final JsonObject applicationTypesResponse = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); final String urlPath = "/referencedata-service/query/api/rest/referencedata/application-types"; @@ -209,7 +209,7 @@ public static void stubCourtApplicationTypes(final String resourceName) { } public static void stubQueryReferralReasons(final String resourceName, final UUID referralReasonId) { - final JsonObject referralReasonsJson = Json.createReader(ReferenceDataStub.class + final JsonObject referralReasonsJson = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -225,7 +225,7 @@ public static void stubQueryReferralReasons(final String resourceName, final UUI } public static void stubQueryJudiciaries(final String resourceName) { - final JsonObject referralReasonsJson = Json.createReader(ReferenceDataStub.class + final JsonObject referralReasonsJson = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -240,7 +240,7 @@ public static void stubQueryJudiciaries(final String resourceName) { } public static void stubQueryPrisonSuites(final String resourceName) { - final JsonObject referralReasonsJson = Json.createReader(ReferenceDataStub.class + final JsonObject referralReasonsJson = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -255,7 +255,7 @@ public static void stubQueryPrisonSuites(final String resourceName) { } public static void stubQueryEthinicityData(final String resourceName, final UUID id) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)).readObject(); final String urlPath = "/referencedata-service/query/api/rest/referencedata/ethnicities"; @@ -267,7 +267,7 @@ public static void stubQueryEthinicityData(final String resourceName, final UUID } public static void stubQueryNationalityData(final String resourceName, final UUID id) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -280,7 +280,7 @@ public static void stubQueryNationalityData(final String resourceName, final UUI } public static void stubQueryHearingTypeData(final String resourceName, final UUID id) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)).readObject(); final String urlPath = "/referencedata-service/query/api/rest/referencedata/hearing-types"; @@ -305,7 +305,7 @@ public static void stubQueryProsecutorDataForGivenProsecutionAuthorityId(final S } public static void stubQueryProsecutorData(final String resourceName, final UUID id) { - final JsonObject responsePayload = Json.createReader(ReferenceDataStub.class + final JsonObject responsePayload = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)).readObject(); final String urlPath = "/referencedata-service/query/api/rest/referencedata/prosecutors.*"; @@ -326,7 +326,7 @@ public static void stubQueryProsecutorData(final JsonObject payload, final UUID } public static void stubQueryCpsProsecutorData(final String resourceName, final UUID id, int returnStatus) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)).readObject(); final String urlPath = "/referencedata-service/query/api/rest/referencedata/prosecutors.*oucode.*"; @@ -339,7 +339,7 @@ public static void stubQueryCpsProsecutorData(final String resourceName, final U public static void stubQueryPetFormData(final String resourceName, final UUID id, int returnStatus) { - final JsonObject documentType = Json.createReader(ReferenceDataStub.class + final JsonObject documentType = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)).readObject(); final String urlPath = "/referencedata-service/query/api/rest/referencedata/latest-pet-form"; @@ -353,7 +353,7 @@ public static void stubQueryPetFormData(final String resourceName, final UUID id public static void stubQueryCourtOURoom() { COURT_ID_LIST.forEach(cid -> { - final JsonObject courtCentre = Json.createReader(ReferenceDataStub.class + final JsonObject courtCentre = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(cid.getV())) .readObject(); @@ -368,7 +368,7 @@ public static void stubQueryCourtOURoom() { } public static void stubEnforcementArea(final String resourceName) { - final JsonObject enforcementArea = Json.createReader(ReferenceDataStub.class + final JsonObject enforcementArea = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -381,7 +381,7 @@ public static void stubEnforcementArea(final String resourceName) { } public static void stubLegalStatus(final String resourceName, final String statusCode) { - final JsonObject legalStatuses = Json.createReader(ReferenceDataStub.class + final JsonObject legalStatuses = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -394,7 +394,7 @@ public static void stubLegalStatus(final String resourceName, final String statu } public static void stubLegalStatusWithStatusDescription(final String resourceName, final String statusCode, final String statusDescription) { - final JsonObject legalStatuses = Json.createReader(ReferenceDataStub.class + final JsonObject legalStatuses = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); @@ -408,7 +408,7 @@ public static void stubLegalStatusWithStatusDescription(final String resourceNam public static void stubGetOrganisationById(final String resourceName) { - final JsonObject judge = Json.createReader(ReferenceDataStub.class + final JsonObject judge = JsonObjects.createReader(ReferenceDataStub.class .getResourceAsStream(resourceName)) .readObject(); diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/SysDocGeneratorStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/SysDocGeneratorStub.java index 17a154396..6def626e0 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/SysDocGeneratorStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/SysDocGeneratorStub.java @@ -7,20 +7,30 @@ import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; +import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; +import static java.util.stream.Collectors.toList; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.awaitility.Awaitility.await; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; import uk.gov.justice.services.common.http.HeaderConstants; +import java.time.Duration; import java.util.ArrayList; import java.util.Collection; import java.util.List; import com.github.tomakehurst.wiremock.verification.LoggedRequest; +import org.awaitility.core.ConditionTimeoutException; import org.hamcrest.Matcher; +import org.json.JSONException; import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; public class SysDocGeneratorStub { @@ -28,6 +38,8 @@ public class SysDocGeneratorStub { private static final String GENERATE_DOCUMENT_MEDIA_TYPE = "application/vnd.systemdocgenerator.generate-document+json"; + private final static Logger LOGGER = LoggerFactory.getLogger(SysDocGeneratorStub.class); + public static void stubAsyncDocumentGeneratorEndPoint() { stubFor(post(urlPathMatching(SYS_DOC_GENERATOR_URL)) .withHeader(CONTENT_TYPE, equalTo(GENERATE_DOCUMENT_MEDIA_TYPE)) @@ -37,8 +49,72 @@ public static void stubAsyncDocumentGeneratorEndPoint() { )); } + + public static List pollSysDocGenerationRequests(final Matcher> matcher) { + try { + + return await().pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> + findAll(postRequestedFor(urlPathMatching(SYS_DOC_GENERATOR_URL))) + .stream() + .map(LoggedRequest::getBodyAsString) + .map(t -> { + try { + return new JSONObject(t); + } catch (JSONException e) { + return null; + } + }) + .collect(toList()), matcher); + } catch (final ConditionTimeoutException timeoutException) { + LOGGER.info("Exception while finding the captured requests in wire mock:" + timeoutException); + return emptyList(); + } + } + + public static List pollSysDocGenerationRequestsForPrisonCourtRegister(final Matcher> matcher, final String originatingSource) { + try { + + return await().pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> + { + List list = new ArrayList<>(); + for (LoggedRequest loggedRequest : findAll(postRequestedFor(urlPathMatching(SYS_DOC_GENERATOR_URL)))) { + String bodyAsString = loggedRequest.getBodyAsString(); + JSONObject j = new JSONObject(bodyAsString); + if (j.getString("originatingSource").equals(originatingSource)) { + list.add(j); + } + } + return list; + }, matcher); + } catch (final ConditionTimeoutException timeoutException) { + LOGGER.info("Exception while finding the captured requests in wire mock:" + timeoutException); + return emptyList(); + } + } + + public static List pollSysDocGenerationRequestsForPrisonCourtRegisterWithSourceCorrelationId(final Matcher> matcher, final String originatingSource, final String courtCentreId) { + try { + + return await().pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> + { + List list = new ArrayList<>(); + for (LoggedRequest loggedRequest : findAll(postRequestedFor(urlPathMatching(SYS_DOC_GENERATOR_URL)))) { + String bodyAsString = loggedRequest.getBodyAsString(); + JSONObject j = new JSONObject(bodyAsString); + if (j.getString("originatingSource").equals(originatingSource) && j.getString("sourceCorrelationId").contains(courtCentreId)) { + list.add(j); + } + } + return list; + }, matcher); + } catch (final ConditionTimeoutException timeoutException) { + LOGGER.info("Exception while finding the captured requests in wire mock:" + timeoutException); + return emptyList(); + } + } + public static List pollSysDocGenerationRequestsWithOriginatingSourceAndSourceCorrelationId(final Matcher> matcher, final String originatingSource, final String sourceCorrelationId) { - return await().until(() -> + return await().pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { List list = new ArrayList<>(); for (LoggedRequest loggedRequest : findAll(postRequestedFor(urlPathMatching(SYS_DOC_GENERATOR_URL)))) { diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/UsersAndGroupsStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/UsersAndGroupsStub.java index ff4e7860e..74f82b281 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/UsersAndGroupsStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/UsersAndGroupsStub.java @@ -16,9 +16,7 @@ import static uk.gov.moj.cpp.progression.util.FileUtil.getPayload; import java.util.List; - -import javax.json.Json; - +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.http.HttpHeaders; public class UsersAndGroupsStub { @@ -130,7 +128,7 @@ public static void stubGetOrganisationDetailForLAAContractNumber(final String la public static void stubGetOrganisationDetailForLAAContractNumberAsEmpty(final String laaContractNumber) { - String body = Json.createObjectBuilder().build().toString(); + String body = JsonObjects.createObjectBuilder().build().toString(); stubFor(get(urlPathEqualTo(format(GET_ORGANISATION_DETAIL_QUERY, laaContractNumber))) .willReturn(aResponse().withStatus(OK.getStatusCode()) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/VejHearingStub.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/VejHearingStub.java index 5e7a3aaaf..b0ec2df09 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/VejHearingStub.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/stub/VejHearingStub.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.progression.stub; +import java.time.Duration; import java.util.List; import com.github.tomakehurst.wiremock.client.VerificationException; @@ -13,10 +14,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static com.github.tomakehurst.wiremock.client.WireMock.verify; import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder; +import uk.gov.justice.services.test.utils.core.http.FibonacciPollWithStartAndMax; + import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.http.HttpStatus.SC_ACCEPTED; import static org.awaitility.Awaitility.await; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INITIAL_INTERVAL_IN_MILLISECONDS; +import static uk.gov.moj.cpp.progression.helper.RestHelper.INTERVAL_IN_MILLISECONDS; public class VejHearingStub { @@ -46,7 +51,7 @@ public static void verifyHearingDeletedCommandInvoked(final List expecte } public static void verifyVejHearingStubCommandInvoked(final String commandEndPoint, final List expectedValues) { - await().atMost(30, SECONDS).pollInterval(1000, MILLISECONDS).until(() -> { + await().atMost(30, SECONDS).pollInterval(new FibonacciPollWithStartAndMax(Duration.ofMillis(INITIAL_INTERVAL_IN_MILLISECONDS), Duration.ofMillis(INTERVAL_IN_MILLISECONDS))).until(() -> { final RequestPatternBuilder requestPatternBuilder = postRequestedFor(urlPathMatching(commandEndPoint)); expectedValues.forEach( expectedValue -> requestPatternBuilder.withRequestBody(containing(expectedValue)) diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestApplicationSummonsIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestApplicationSummonsIT.java index dcc0a294e..7ccc71353 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestApplicationSummonsIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestApplicationSummonsIT.java @@ -7,8 +7,8 @@ import static java.lang.String.format; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.hasItems; @@ -60,7 +60,7 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonString; @@ -199,7 +199,7 @@ private Hearing givenApplicationInitiatedInBoxWork(final SummonsTemplateType sum private JsonObject createPublicHearingResultedV2(final JsonObject hearing, final JsonObject summonResultJsonObject) { final JsonObject courtApplication = hearing.getJsonArray("courtApplications").getJsonObject(0); final JsonString sittingDay = hearing.getJsonArray("hearingDays").getJsonObject(0).getJsonString("sittingDay"); - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("isReshare", true) .add("hearingDay", fromJsonString(sittingDay).toLocalDate().toString()) .add("hearing", createObjectBuilder() diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java index 1ecc9dc84..79fa4ee05 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/summons/RequestFirstHearingCaseSummonsIT.java @@ -7,7 +7,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; import static org.hamcrest.CoreMatchers.hasItems; diff --git a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/util/Utilities.java b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/util/Utilities.java index 37b11ed8c..834c04078 100644 --- a/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/util/Utilities.java +++ b/progression-integration-test/src/test/java/uk/gov/moj/cpp/progression/util/Utilities.java @@ -75,4 +75,16 @@ public static String toJsonString(final Object o) throws JsonProcessingException } } + /** + * todo this needs to be refactored for each usage with correct polling conditions, it's just placeholder for now + */ + @SuppressWarnings("java:S2925") + public static void sleepToBeRefactored(){ + try { + Thread.sleep(250); + } catch (InterruptedException e) { + // ignore + } + } + } diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdDefendantsDefendantIdExtractResource.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdDefendantsDefendantIdExtractResource.java index 4fb0abbc4..b47479bdc 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdDefendantsDefendantIdExtractResource.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdDefendantsDefendantIdExtractResource.java @@ -4,7 +4,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.OK; import static javax.ws.rs.core.Response.status; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdExtractResource.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdExtractResource.java index c9612b30a..8d05fb48a 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdExtractResource.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiApplicationsApplicationIdExtractResource.java @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.OK; import static javax.ws.rs.core.Response.status; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResource.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResource.java index 849ff0044..12e9d351a 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResource.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResource.java @@ -1,14 +1,18 @@ package uk.gov.justice.api.resource; +import static java.util.Objects.nonNull; import static java.util.Optional.of; +import static java.util.UUID.randomUUID; import static javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.FORBIDDEN; import static javax.ws.rs.core.Response.Status.OK; import static javax.ws.rs.core.Response.status; 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 uk.gov.moj.cpp.progression.query.api.service.CourtlistQueryService; +import uk.gov.justice.api.resource.service.ReferenceDataService; import uk.gov.justice.api.resource.service.StagingPubHubService; import uk.gov.justice.services.adapter.rest.mapping.ActionMapper; import uk.gov.justice.services.core.annotation.Adapter; @@ -28,7 +32,9 @@ import javax.ejb.Stateless; import javax.inject.Inject; import javax.inject.Named; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; +import javax.json.JsonObjectBuilder; import javax.json.JsonValue; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Context; @@ -74,9 +80,6 @@ public class DefaultQueryApiCourtlistResource implements QueryApiCourtlistResour @Inject private ServiceContextSystemUserProvider serviceContextSystemUserProvider; - @Inject - private CourtlistQueryService courtlistQueryService; - @Inject private InterceptorChainProcessor interceptorChainProcessor; @@ -86,6 +89,9 @@ public class DefaultQueryApiCourtlistResource implements QueryApiCourtlistResour @Inject private StagingPubHubService stagingPubHubService; + @Inject + private ReferenceDataService referenceDataService; + @Override public Response getCourtlist(final String courtCentreId, final String courtRoomId, final String listId, final String startDate, final String endDate, final boolean restricted, final UUID userId) { @@ -101,14 +107,45 @@ public Response getPrisonCourtlist(final String courtCentreId, final String cour } private Response getCourtListInternal(final String courtCentreId, final String courtRoomId, final String listId, final String startDate, final String endDate, final boolean restricted, final UUID userId, final String courtListAction) { - final JsonEnvelope queryEnvelope = courtlistQueryService.buildCourtlistQueryEnvelope( - courtCentreId, courtRoomId, listId, startDate, endDate, restricted, userId, courtListAction); - final JsonEnvelope document = interceptorChainProcessor.process(interceptorContextWithInput(queryEnvelope)).get(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder() + .add("courtCentreId", courtCentreId) + .add("listId", listId) + .add("startDate", startDate) + .add("endDate", endDate) + .add("restricted", restricted); + + if (nonNull(courtRoomId)) { + payloadBuilder.add("courtRoomId", courtRoomId); + } - final JsonObject enrichedPayload = courtlistQueryService.buildEnrichedPayload(document); + final JsonEnvelope documentQuery = envelopeFrom( + metadataBuilder() + .withId(randomUUID()) + .withName(courtListAction) + .withUserId(userId.toString()) + .build(), + payloadBuilder.build()); + + final JsonEnvelope document = interceptorChainProcessor.process(interceptorContextWithInput(documentQuery)).get(); + + final JsonObjectBuilder standardListJsonObjectBuilder = JsonObjects.createObjectBuilder(); + + document + .payloadAsJsonObject() + .keySet() + .forEach(key -> standardListJsonObjectBuilder + .add(key, document.payloadAsJsonObject().get(key)) + ); + + final Optional courtCentreDataOptional = referenceDataService.getCourtCenterDataByCourtName(document, document.payloadAsJsonObject().getString("courtCentreName")); + if (courtCentreDataOptional.isPresent()) { + final JsonObject courtCentreData = courtCentreDataOptional.get(); + standardListJsonObjectBuilder.add("ouCode", courtCentreData.getJsonString("oucode")); + standardListJsonObjectBuilder.add("courtId", courtCentreData.getJsonString("id")); + } if (!PRISON_COURT_LIST.equalsIgnoreCase(listId)) { - stagingPubHubService.publishStandardList(enrichedPayload, userId); + stagingPubHubService.publishStandardList(standardListJsonObjectBuilder.build(), userId); } return getDocumentContent(document); diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResource.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResource.java index 368d5d16f..f0cdddec2 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResource.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResource.java @@ -5,7 +5,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.FORBIDDEN; import static javax.ws.rs.core.Response.Status.NOT_FOUND; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResource.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResource.java index aaf9dafad..881e81032 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResource.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResource.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.Response.Status.NOT_FOUND; import static javax.ws.rs.core.Response.status; import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdEjectcaseResource.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdEjectcaseResource.java index 62ec09fb4..9dc99278c 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdEjectcaseResource.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdEjectcaseResource.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.OK; import static javax.ws.rs.core.Response.status; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResource.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResource.java index 5d6632cc8..808c8dc22 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResource.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResource.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.NULL; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static javax.ws.rs.core.Response.Status.OK; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/CourtDocumentProvider.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/CourtDocumentProvider.java index 3804a6d80..c7f43e89f 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/CourtDocumentProvider.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/CourtDocumentProvider.java @@ -11,7 +11,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObjectBuilder; @@ -23,7 +23,7 @@ public class CourtDocumentProvider { public Action getDocumentTypeId(final Action action) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder().add("courtDocumentId", action.envelope().payloadAsJsonObject().getString("courtDocumentId")); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder().add("courtDocumentId", action.envelope().payloadAsJsonObject().getString("courtDocumentId")); final MetadataBuilder metadataBuilder = metadataFrom(action.metadata()).withName("progression.query.courtdocument"); final JsonEnvelope requestEnvelope = envelopeFrom(metadataBuilder, jsonObjectBuilder.build()); final JsonEnvelope response = courtDocumentQueryView.getCourtDocument(requestEnvelope); diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/DefenceQueryService.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/DefenceQueryService.java index a2d07632c..a679cd389 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/DefenceQueryService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/DefenceQueryService.java @@ -7,7 +7,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/HearingQueryService.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/HearingQueryService.java index e08fd6427..f0bd8931a 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/HearingQueryService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/HearingQueryService.java @@ -4,7 +4,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.json.JsonValue.EMPTY_JSON_OBJECT; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; @@ -28,7 +28,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue.ValueType; @@ -84,7 +84,7 @@ private DraftResultsWrapper filterResultsForValidAmendments(final JsonObject dra private JsonObject getDraftResults(final JsonEnvelope jsonEnvelope, final UUID hearingId, final LocalDate hearingDay) { final Metadata metadata = metadataWithNewActionName(jsonEnvelope.metadata(), HEARING_GET_DRAFT_RESULT_V2); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("hearingDay", hearingDay.toString()) .build(); diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ListingQueryService.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ListingQueryService.java index 550e909bd..102fec943 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ListingQueryService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ListingQueryService.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.spi.DefaultJsonMetadata.metadataBuilder; @@ -18,7 +18,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class ListingQueryService { @@ -31,7 +31,7 @@ public class ListingQueryService { public Hearing searchHearing(final UUID userId, final UUID hearingId) { final Metadata metadata = metadataWithNewActionName(getListingQueryJsonEnvelop(userId).metadata(), LISTING_SEARCH_HEARING); - final JsonObject jsonPayLoad = Json.createObjectBuilder() + final JsonObject jsonPayLoad = JsonObjects.createObjectBuilder() .add("id", hearingId.toString()) .build(); return requester.requestAsAdmin(envelopeFrom(metadata, jsonPayLoad), Hearing.class).payload(); diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ReferenceDataService.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ReferenceDataService.java index ec5a15576..eab0c2464 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ReferenceDataService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/ReferenceDataService.java @@ -4,7 +4,7 @@ import static java.util.Optional.empty; import static java.util.Optional.of; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isBlank; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/StagingPubHubService.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/StagingPubHubService.java index 30f319671..90dc2021b 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/StagingPubHubService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/StagingPubHubService.java @@ -13,7 +13,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.slf4j.Logger; @@ -40,7 +40,7 @@ public void publishStandardList(final JsonObject standardList, final UUID userId .withName(PUBHUB_PUBLISH_STANDARD_LIST) .withUserId(userId.toString()) .build(), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("standardList", standardList) .build()); diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/UsersAndGroupsService.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/UsersAndGroupsService.java index 8dea4de64..be0637e61 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/UsersAndGroupsService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/service/UsersAndGroupsService.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource.service; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -19,7 +19,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -38,7 +38,7 @@ public class UsersAndGroupsService { public JsonObject getOrganisationDetails(final JsonEnvelope envelope) { - final JsonObject organisationDetail = Json.createObjectBuilder().add("organisationId", + final JsonObject organisationDetail = JsonObjects.createObjectBuilder().add("organisationId", envelope.payloadAsJsonObject().getJsonString("organisationId").getString()).build(); final Envelope requestEnvelope = Enveloper.envelop(organisationDetail) .withName("usersgroups.get-organisation-details").withMetadataFrom(envelope); diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/ResultTextHelper.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/ResultTextHelper.java index ac88fdcc4..bad9038f2 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/ResultTextHelper.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/ResultTextHelper.java @@ -8,7 +8,6 @@ import static java.util.Comparator.nullsLast; import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createValue; import static javax.json.JsonValue.ValueType.STRING; import static uk.gov.justice.api.resource.utils.ResultPromptValueHelper.getValue; @@ -27,6 +26,7 @@ import javax.json.JsonObject; import org.apache.commons.lang3.StringUtils; +import uk.gov.justice.services.messaging.JsonObjects; public class ResultTextHelper { private static final String EXCLUDED_PROMPT_REFERENCE = "hmiSlots"; @@ -100,7 +100,7 @@ private static ResultPrompt jsonArrayToResultPrompt(final ResultPrompt resultPro .withPromptRef(resultPrompt.getPromptRef()) .withType(resultPrompt.getType()) .withLabel(resultPrompt.getLabel()) - .withValue(createValue(value)) + .withValue(JsonObjects.getProvider().createValue(value)) .build(); } diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/TransformationHelper.java b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/TransformationHelper.java index 21161b7a6..8e58fba88 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/TransformationHelper.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/justice/api/resource/utils/TransformationHelper.java @@ -5,7 +5,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static org.apache.commons.lang3.StringUtils.SPACE; import static org.apache.commons.lang3.StringUtils.isNotBlank; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApi.java index bf40074b1..d51c1bafe 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApi.java @@ -3,7 +3,7 @@ import static java.lang.String.format; import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApi.java index 7505dd81d..33fdefc67 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApi.java @@ -6,8 +6,8 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -50,7 +50,7 @@ import uk.gov.moj.cpp.progression.query.api.service.ListingService; import uk.gov.moj.cpp.progression.query.api.service.ProgressionService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -163,7 +163,7 @@ public JsonEnvelope searchTrialReadiness(final JsonEnvelope envelope) { .build(); return envelopeFrom(envelope.metadata(), responsePayload); } - return envelopeFrom(envelope.metadata(), Json.createObjectBuilder().build()); + return envelopeFrom(envelope.metadata(), JsonObjects.createObjectBuilder().build()); } @Handles("progression.query.trial-readiness-details") diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApi.java index 218f775a2..819237329 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApi.java @@ -7,7 +7,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApi.java index ca4023d84..724f89fb8 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApi.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.progression.query.api.service.CourtlistQueryService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -57,7 +57,7 @@ private JsonEnvelope enrichCourtListJsonData(final JsonEnvelope query, final Jso * Ensures includeApplications is in the payload for listing. Uses optional query param when present, otherwise defaults to true. */ private static JsonEnvelope ensureIncludeApplications(final JsonEnvelope query) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); final JsonObject payload = query.payloadAsJsonObject(); payload.keySet().forEach(key -> builder.add(key, payload.get(key))); final boolean includeApplications = payload.containsKey(INCLUDE_APPLICATIONS) diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApi.java index 4ef3a0208..739c4e9f7 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApi.java @@ -21,7 +21,7 @@ import uk.gov.moj.cpp.progression.service.RefDataService; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -37,7 +37,7 @@ import java.util.stream.IntStream; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -110,7 +110,7 @@ public JsonEnvelope getPetCaseDirections(final JsonEnvelope envelope) { .filter(d -> !Collections.disjoint(Arrays.asList(d.getCategory().split(",")), categories)) .collect(Collectors.toList()); } - final JsonArrayBuilder refDataDirectionsInJson = Json.createArrayBuilder(); + final JsonArrayBuilder refDataDirectionsInJson = JsonObjects.createArrayBuilder(); if (!directionManagementTypes.isEmpty()) { final List refDataDirections = transformDirection(envelope, directionManagementTypes); @@ -128,7 +128,7 @@ public JsonEnvelope getPetCaseDirections(final JsonEnvelope envelope) { } return envelopeFrom(envelope.metadata(), - Json.createObjectBuilder().add("directions", refDataDirectionsInJson.build()).build()); + JsonObjects.createObjectBuilder().add("directions", refDataDirectionsInJson.build()).build()); } private RefDataDirection buildRefDataDirection(final List refDataDirectionsSortedOnSequence, final int idx, final String formType) { diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/FormQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/FormQueryApi.java index a9eded4d6..193e26124 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/FormQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/FormQueryApi.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/HearingDetailsLoader.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/HearingDetailsLoader.java index 105ee9a6d..a600b2aa6 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/HearingDetailsLoader.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/HearingDetailsLoader.java @@ -13,7 +13,7 @@ import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/PetQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/PetQueryApi.java index 6135ed329..5cddebf2c 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/PetQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/PetQueryApi.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApi.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApi.java index 61ad00678..f5a332a53 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApi.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApi.java @@ -15,7 +15,7 @@ import uk.gov.moj.cpp.systemusers.ServiceContextSystemUserProvider; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -27,7 +27,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; import static uk.gov.moj.cpp.progression.query.api.helper.ProgressionQueryHelper.addProperty; @@ -99,7 +99,7 @@ public JsonEnvelope getCaseProsecutionCase(final JsonEnvelope query) { if (nonNull(prosecutionCase)) { final JsonArray defendants = prosecutionCase.getJsonArray(DEFENDANTS); - final JsonArrayBuilder activeCourtOrdersArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder activeCourtOrdersArrayBuilder = JsonObjects.createArrayBuilder(); final Set uniqueMasterDefendantIds = defendants.stream() .map(defendant -> UUID.fromString(((JsonObject) defendant).getString(MASTER_DEFENDANT_ID))) @@ -110,7 +110,7 @@ public JsonEnvelope getCaseProsecutionCase(final JsonEnvelope query) { if (nonNull(courtOrders) && courtOrders.containsKey(COURT_ORDERS)) { final JsonArray activeCourtOrders = courtOrders.getJsonArray(COURT_ORDERS); if (!activeCourtOrders.isEmpty()) { - final JsonObjectBuilder objectBuilder = Json.createObjectBuilder() + final JsonObjectBuilder objectBuilder = JsonObjects.createObjectBuilder() .add(MASTER_DEFENDANT_ID, masterDefendantId.toString()) .add(COURT_ORDERS, activeCourtOrders); activeCourtOrdersArrayBuilder.add(objectBuilder.build()); @@ -136,7 +136,7 @@ public JsonEnvelope getProsecutionCaseForCaseAtAGlance(final JsonEnvelope query) final JsonEnvelope appQueryResponse = prosecutionCaseQuery.getProsecutionCaseForCaseAtAGlance(query); final JsonObject payload = appQueryResponse.payloadAsJsonObject(); final JsonArray defendants = payload.getJsonArray(DEFENDANTS); - final JsonArrayBuilder caagDefendantsBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder caagDefendantsBuilder = JsonObjects.createArrayBuilder(); if (nonNull(defendants)) { final JsonObject associatedCaseDefendants = organisationService.getAssociatedCaseDefendantsWithOrganisationAddress(query, payload.getString(CASE_ID), requester); final JsonArray associatedDefendants = associatedCaseDefendants.getJsonArray(DEFENDANTS); @@ -293,8 +293,8 @@ public JsonEnvelope getCaseAllHearingTypes(final JsonEnvelope query) { private JsonObject createOrganisation(final JsonObject completeOrganisationDetails) { final JsonObject address = completeOrganisationDetails.getJsonObject(ORGANISATION_ADDRESS); - return Json.createObjectBuilder().add(ORGANISATION_NAME, completeOrganisationDetails.getString("organisationName")) - .add("address", Json.createObjectBuilder() + return JsonObjects.createObjectBuilder().add(ORGANISATION_NAME, completeOrganisationDetails.getString("organisationName")) + .add("address", JsonObjects.createObjectBuilder() .add(ADDRESS_LINE_1, address.getString("address1")) .add(ADDRESS_LINE_2, address.getString("address2")) .add(ADDRESS_LINE_3, address.getString("address3")) diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/accesscontrol/PermissionConstants.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/accesscontrol/PermissionConstants.java index 583fe460e..48cabd61f 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/accesscontrol/PermissionConstants.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/accesscontrol/PermissionConstants.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.query.api.accesscontrol; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; public class PermissionConstants { static final String COTR_DEFENCE_ACCESS = "defence-access"; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PermissionRuleConstants.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PermissionRuleConstants.java index 68121e874..b1f887c49 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PermissionRuleConstants.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PermissionRuleConstants.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.query.api.helper; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; public class PermissionRuleConstants { diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelper.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelper.java index b26bc5408..201777974 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelper.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelper.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.query.api.helper; import static java.util.Objects.nonNull; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import uk.gov.justice.services.core.requester.Requester; @@ -14,7 +14,7 @@ import java.util.Optional; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -95,7 +95,7 @@ private JsonObject convertToPetForDefendant(final Requester requester, final Jso final JsonObject defendantPetData = buildDefendantPetData(petData, defendantId); final JsonArray offences = getOffencesOfDefendant(petDefendantOffence, defendantId); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); if (!defendantPetData.isEmpty()) { jsonObjectBuilder .add(PET_ID, petId) diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/ProgressionQueryHelper.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/ProgressionQueryHelper.java index 8d1ceeccd..1589d8730 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/ProgressionQueryHelper.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/ProgressionQueryHelper.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -29,7 +29,7 @@ private ProgressionQueryHelper() { } public static JsonObject removeProperty(final JsonObject origin, final String key){ - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()){ if (!entry.getKey().equals(key)){ builder.add(entry.getKey(), entry.getValue()); @@ -51,7 +51,7 @@ public static JsonObject addProperty(final JsonObject origin, final String key, } public static JsonObjectBuilder buildJsonBuilder(final JsonObject origin) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); for (final Map.Entry entry : origin.entrySet()) { builder.add(entry.getKey(), entry.getValue()); } diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/RuleConstants.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/RuleConstants.java index 7e2f306e1..9bf008e5b 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/RuleConstants.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/helper/RuleConstants.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.query.api.helper; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; public class RuleConstants { diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiService.java index 84e9aae8d..7bc78e5a5 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiService.java @@ -5,7 +5,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.apache.commons.lang3.StringUtils.EMPTY; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderService.java index 9a4a7ecde..44b2c2c7f 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderService.java @@ -6,7 +6,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class CourtOrderService { @@ -15,7 +15,7 @@ public class CourtOrderService { public JsonObject getCourtOrdersByDefendant(final Envelope envelope, final UUID defendantId, final Requester requester) { - final JsonObject request = Json.createObjectBuilder() + final JsonObject request = JsonObjects.createObjectBuilder() .add("defendantId", defendantId.toString()) .build(); final Envelope requestEnvelope = Enveloper.envelop(request) diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryService.java index ff10c61a4..ab817c372 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryService.java @@ -13,7 +13,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -34,7 +34,7 @@ public class CourtlistQueryService { public JsonEnvelope buildCourtlistQueryEnvelope(final String courtCentreId, final String courtRoomId, final String listId, final String startDate, final String endDate, final boolean restricted, final UUID userId, final String courtListAction) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder() + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId) .add("listId", listId) .add("startDate", startDate) @@ -59,7 +59,7 @@ public JsonEnvelope buildCourtlistQueryEnvelope(final String courtCentreId, fina * when available from reference data. courtIdNumeric is taken from reference data field "courtId", default "0". */ public JsonObject buildEnrichedPayload(final JsonEnvelope document) { - final JsonObjectBuilder builder = Json.createObjectBuilder(); + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder(); document.payloadAsJsonObject().keySet().forEach(key -> builder.add(key, document.payloadAsJsonObject().get(key))); diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/DefenceService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/DefenceService.java index 769666a35..31d83cb1e 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/DefenceService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/DefenceService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api.service; import static java.util.Optional.ofNullable; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import uk.gov.justice.services.core.requester.Requester; diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/MaterialService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/MaterialService.java index 1cbbac6d6..9887d72ec 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/MaterialService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/MaterialService.java @@ -5,7 +5,7 @@ import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; public class MaterialService { diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationService.java index 67a4e626c..8c4b33cd0 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationService.java @@ -5,7 +5,7 @@ import javax.json.JsonObject; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; public class OrganisationService { diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/ProgressionService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/ProgressionService.java index c7aba68c7..df84bb76c 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/ProgressionService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/ProgressionService.java @@ -2,7 +2,7 @@ import static java.lang.String.format; import static java.util.Objects.isNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -20,7 +20,7 @@ import uk.gov.moj.cpp.progression.query.view.service.exception.ProgressionServiceException; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import java.util.UUID; @@ -131,7 +131,7 @@ public JsonObject getPetForm(final UUID petFormId, final Requester requester, fi return responseEnvelope.payloadAsJsonObject(); }catch(Exception e){ LOGGER.error("PET form Not Found or Error while fetching {}",e); - return Json.createObjectBuilder().build(); + return JsonObjects.createObjectBuilder().build(); } } @@ -150,7 +150,7 @@ public JsonObject getPtphForm(final UUID caseId, final UUID courtFormId, final R return responseEnvelope.payloadAsJsonObject(); }catch(Exception e){ LOGGER.error("PTPH form Not Found or Error while fetching {}",e); - return Json.createObjectBuilder().build(); + return JsonObjects.createObjectBuilder().build(); } } } diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetService.java index 57e1458a1..d70a1e651 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetService.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -16,7 +16,7 @@ import java.util.UUID; import static java.util.Collections.emptyList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; public class RecordSheetService { public static final String DEFENDANT_ID = "defendantId"; @@ -57,7 +57,7 @@ public JsonEnvelope getTrialRecordSheetPayload(final JsonEnvelope envelope, fina } public JsonEnvelope getTrialRecordSheetPayloadForApplication(final JsonEnvelope envelope, final JsonEnvelope document, final UUID userId) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final JsonObject payloadAsJsonObject = envelope.payloadAsJsonObject(); final String caseId = payloadAsJsonObject.getString(CASE_ID); final List offenceIds = Arrays.stream(payloadAsJsonObject.getString(OFFENCE_IDS).split(",")).toList(); @@ -70,7 +70,7 @@ public JsonEnvelope getTrialRecordSheetPayloadForApplication(final JsonEnvelope JsonObject result = reportsTransformer.getTransformedPayload(document, defendantId, RECORD_SHEET, emptyList(), userId); LOGGER.info("Successfully fetched transformed payload for defendantId: {} and caseId: {}", defendantId, caseId); - jsonArrayBuilder.add(Json.createObjectBuilder() + jsonArrayBuilder.add(JsonObjects.createObjectBuilder() .add(PAYLOAD, result) .add(DEFENDANT_NAME, getDefendantName(result)) .build()); @@ -81,7 +81,7 @@ public JsonEnvelope getTrialRecordSheetPayloadForApplication(final JsonEnvelope return JsonEnvelope.envelopeFrom( envelope.metadata(), - Json.createObjectBuilder().add(PAYLOADS, jsonArrayBuilder.build()).build()); + JsonObjects.createObjectBuilder().add(PAYLOADS, jsonArrayBuilder.build()).build()); } private static String getDefendantName(final JsonObject result) { diff --git a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryService.java b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryService.java index 711818f6a..6586df542 100644 --- a/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryService.java +++ b/progression-query/progression-query-api/src/main/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryService.java @@ -15,7 +15,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; public class UsersGroupQueryService { @@ -32,7 +32,7 @@ public class UsersGroupQueryService { public JsonObject getUserGroups(final Metadata metadata, final UUID userId) { - final JsonObject getGroupsForUserRequest = Json.createObjectBuilder().add("userId", userId.toString()).build(); + final JsonObject getGroupsForUserRequest = JsonObjects.createObjectBuilder().add("userId", userId.toString()).build(); final Metadata metadataWithActionName = metadataFrom(metadata).withName("usersgroups.get-logged-in-user-groups").build(); final JsonEnvelope requestEnvelope = envelopeFrom(metadataWithActionName, getGroupsForUserRequest); final Envelope response = requester.request(requestEnvelope, JsonObject.class); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResourceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResourceTest.java index 32af487fc..56a6316f4 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResourceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiCourtlistResourceTest.java @@ -11,7 +11,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static java.util.Optional.of; @@ -31,7 +30,7 @@ import static uk.gov.justice.services.test.utils.core.random.RandomGenerator.STRING; import uk.gov.justice.services.core.interceptor.InterceptorChainProcessor; -import uk.gov.moj.cpp.progression.query.api.service.CourtlistQueryService; +import uk.gov.justice.api.resource.service.ReferenceDataService; import uk.gov.justice.api.resource.service.StagingPubHubService; import uk.gov.justice.api.resource.utils.FileUtil; import uk.gov.justice.services.core.requester.Requester; @@ -80,7 +79,7 @@ public class DefaultQueryApiCourtlistResourceTest { private final String endDate = STRING.next(); @Mock - private CourtlistQueryService courtlistQueryService; + private ReferenceDataService referenceDataService; @Mock private InterceptorChainProcessor interceptorChainProcessor; @@ -126,11 +125,8 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocument() throws IOExcepti when(serviceContextSystemUserProvider.getContextSystemUserId()).thenReturn(Optional.of(systemUserId)); - when(courtlistQueryService.buildCourtlistQueryEnvelope(any(), any(), any(), any(), any(), anyBoolean(), any(), any())) - .thenReturn(envelopeFrom(metadataWithRandomUUID(COURT_LIST_QUERY_NAME), FileUtil.jsonFromPath("stub-data/progression.search.court.list.json"))); when(interceptorChainProcessor.process(any())).thenReturn(of(interceptorResponse)); - when(courtlistQueryService.buildEnrichedPayload(interceptorResponse)) - .thenReturn(FileUtil.jsonFromPath("stub-data/stagingpubhub.command.publish-standard-list.json")); + when(referenceDataService.getCourtCenterDataByCourtName(any(), anyString())).thenReturn(Optional.empty()); when(documentGeneratorClientProducer.documentGeneratorClient()).thenReturn(documentGeneratorClient); assert interceptorResponse != null; when(documentGeneratorClient.generatePdfDocument(eq(interceptorResponse.payloadAsJsonObject()), anyString(), eq(systemUserId))) @@ -144,13 +140,12 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocument() throws IOExcepti assertThat(actual.getStatus(), is(SC_OK)); assertThat(actual.getHeaders(), is(headers)); assertThat(pdfContent.getBytes(), is(IOUtils.toByteArray(inputStream))); - verifyCourtlistQueryServiceExecution(); + verifyInterceptorChainExecution(); verify(stagingPubHubService).publishStandardList(jsonObjectArgumentCaptor.capture(), uuidArgumentCaptor.capture()); - final JsonObject expectedJson = FileUtil.jsonFromPath("stub-data/stagingpubhub.command.publish-standard-list.json"); assertEquals(userId, uuidArgumentCaptor.getValue()); - assertEquals(expectedJson, jsonObjectArgumentCaptor.getValue()); + assertEquals(interceptorResponse.payloadAsJsonObject(), jsonObjectArgumentCaptor.getValue()); } @Test @@ -163,11 +158,8 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocumentForWord() throws IO final MultivaluedMap headers = new MultivaluedHashMap<>(ImmutableMap.of(CONTENT_TYPE, WORD_CONTENT_TYPE, CONTENT_DISPOSITION, WORD_DISPOSITION)); when(serviceContextSystemUserProvider.getContextSystemUserId()).thenReturn(Optional.of(systemUserId)); - when(courtlistQueryService.buildCourtlistQueryEnvelope(any(), any(), any(), any(), any(), anyBoolean(), any(), any())) - .thenReturn(envelopeFrom(metadataWithRandomUUID(COURT_LIST_QUERY_NAME), FileUtil.jsonFromPath("stub-data/progression.search.usher.list.json"))); when(interceptorChainProcessor.process(any())).thenReturn(of(interceptorResponse)); - when(courtlistQueryService.buildEnrichedPayload(interceptorResponse)) - .thenReturn(FileUtil.jsonFromPath("stub-data/stagingpubhub.command.ushers-standard-list.json")); + when(referenceDataService.getCourtCenterDataByCourtName(any(), anyString())).thenReturn(Optional.empty()); when(documentGeneratorClientProducer.documentGeneratorClient()).thenReturn(documentGeneratorClient); assert interceptorResponse != null; when(documentGeneratorClient.generateWordDocument(eq(interceptorResponse.payloadAsJsonObject()), anyString(), eq(systemUserId))) @@ -181,13 +173,12 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocumentForWord() throws IO assertThat(actual.getStatus(), is(SC_OK)); assertThat(actual.getHeaders(), is(headers)); assertThat(wordContent.getBytes(), is(IOUtils.toByteArray(inputStream))); - verifyCourtlistQueryServiceExecution(); + verifyInterceptorChainExecution(); verify(stagingPubHubService).publishStandardList(jsonObjectArgumentCaptor.capture(), uuidArgumentCaptor.capture()); - final JsonObject expectedJson = FileUtil.jsonFromPath("stub-data/stagingpubhub.command.ushers-standard-list.json"); assertEquals(userId, uuidArgumentCaptor.getValue()); - assertEquals(expectedJson, jsonObjectArgumentCaptor.getValue()); + assertEquals(interceptorResponse.payloadAsJsonObject(), jsonObjectArgumentCaptor.getValue()); } @Test @@ -212,11 +203,8 @@ public void shouldReturnDocumentWhenGetPrisonCourtlist() throws IOException { final byte[] documentGeneratorClientResponse = pdfContent.getBytes(); when(serviceContextSystemUserProvider.getContextSystemUserId()).thenReturn(Optional.of(systemUserId)); - when(courtlistQueryService.buildCourtlistQueryEnvelope(any(), any(), any(), any(), any(), anyBoolean(), any(), any())) - .thenReturn(envelopeFrom(metadataWithRandomUUID(PRISON_COURT_LIST_QUERY_NAME), FileUtil.jsonFromPath("stub-data/progression.search.court.list.json"))); when(interceptorChainProcessor.process(any())).thenReturn(of(interceptorResponse)); - when(courtlistQueryService.buildEnrichedPayload(interceptorResponse)) - .thenReturn(FileUtil.jsonFromPath("stub-data/stagingpubhub.command.publish-standard-list.json")); + when(referenceDataService.getCourtCenterDataByCourtName(any(), anyString())).thenReturn(Optional.empty()); when(documentGeneratorClientProducer.documentGeneratorClient()).thenReturn(documentGeneratorClient); when(documentGeneratorClient.generatePdfDocument(any(), anyString(), eq(systemUserId))) .thenReturn(documentGeneratorClientResponse); @@ -226,18 +214,11 @@ public void shouldReturnDocumentWhenGetPrisonCourtlist() throws IOException { assertThat(actual.getStatus(), is(SC_OK)); assertThat(IOUtils.toByteArray((InputStream) actual.getEntity()), is(pdfContent.getBytes())); - verify(courtlistQueryService).buildCourtlistQueryEnvelope( - eq(courtCentreId.toString()), eq(courtRoomId.toString()), eq(PRISON_COURT_LIST), eq(startDate), eq(endDate), - eq(false), eq(userId), eq(PRISON_COURT_LIST_QUERY_NAME)); verify(stagingPubHubService, never()).publishStandardList(any(), any()); } - private void verifyCourtlistQueryServiceExecution() { - verify(courtlistQueryService).buildCourtlistQueryEnvelope( - eq(courtCentreId.toString()), eq(courtRoomId.toString()), eq(listId.toString()), - eq(startDate), eq(endDate), eq(false), eq(userId), eq(COURT_LIST_QUERY_NAME)); + private void verifyInterceptorChainExecution() { verify(interceptorChainProcessor).process(org.mockito.ArgumentMatchers.any()); - verify(courtlistQueryService).buildEnrichedPayload(org.mockito.ArgumentMatchers.any(JsonEnvelope.class)); } } \ No newline at end of file diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResourceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResourceTest.java index 57feeb9f0..8bf508cf0 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResourceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialMaterialIdContentResourceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_FORBIDDEN; @@ -49,7 +49,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; import javax.ws.rs.core.MultivaluedHashMap; @@ -127,7 +127,7 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocumentWhenUserHasPermissi final MultivaluedMap headers = new MultivaluedHashMap(ImmutableMap.of(CONTENT_TYPE, JSON_CONTENT_TYPE)); - final JsonObject json = Json.createObjectBuilder() + final JsonObject json = JsonObjects.createObjectBuilder() .add("url", documentUrl) .build(); @@ -214,7 +214,7 @@ public void shouldRunAllInterceptorsAndFetchAndStreamDocumentWhenDocumentIsNotAp final MultivaluedMap headers = new MultivaluedHashMap(ImmutableMap.of(CONTENT_TYPE, JSON_CONTENT_TYPE)); - final JsonObject json = Json.createObjectBuilder() + final JsonObject json = JsonObjects.createObjectBuilder() .add("url", documentUrl) .build(); @@ -313,7 +313,7 @@ public void shouldRunInterceptorsAndFetchDocumentWhenQueryMaterialByIdForProsecu final MultivaluedMap headers = new MultivaluedHashMap(ImmutableMap.of(CONTENT_TYPE, JSON_CONTENT_TYPE)); - final JsonObject json = Json.createObjectBuilder() + final JsonObject json = JsonObjects.createObjectBuilder() .add("url", documentUrl) .build(); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResourceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResourceTest.java index 364dbb1df..25fc82594 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResourceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiMaterialNowsMaterialIdContentResourceTest.java @@ -2,7 +2,7 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; import static org.apache.http.HttpStatus.SC_OK; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResourceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResourceTest.java index bb399b079..6d44e3824 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResourceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/DefaultQueryApiProsecutioncasesCaseIdDefendantsDefendantIdExtractTemplateResourceTest.java @@ -40,7 +40,7 @@ import javax.inject.Inject; import javax.inject.Named; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -128,11 +128,11 @@ public void shouldGetCourtExtractByCaseIdContent() throws Exception { final DocumentGeneratorClient documentGeneratorClient = mock(DocumentGeneratorClient.class); final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream("resulted.json"); - final JsonReader jsonReader = Json.createReader(stream)) { + final JsonReader jsonReader = JsonObjects.createReader(stream)) { final JsonObject payload = jsonReader.readObject(); final String newPayload = Resources.toString(getResource("payload-with-plea-description.json"), Charset.defaultCharset()); - final JsonReader reader = Json.createReader(new StringReader(newPayload)); + final JsonReader reader = JsonObjects.createReader(new StringReader(newPayload)); JsonObject res = reader.readObject(); when(documentGeneratorClientProducer.documentGeneratorClient()).thenReturn(documentGeneratorClient); @@ -160,10 +160,10 @@ public void shouldGetRecordSheetByCaseIdContent() throws Exception { final DocumentGeneratorClient documentGeneratorClient = mock(DocumentGeneratorClient.class); final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream("resulted.json"); - final JsonReader jsonReader = Json.createReader(stream)) { + final JsonReader jsonReader = JsonObjects.createReader(stream)) { final JsonObject payload = jsonReader.readObject(); final String newPayload = Resources.toString(getResource("record-sheet-payload-with-plea-description.json"), Charset.defaultCharset()); - final JsonReader reader = Json.createReader(new StringReader(newPayload)); + final JsonReader reader = JsonObjects.createReader(new StringReader(newPayload)); JsonObject res = reader.readObject(); when(documentGeneratorClientProducer.documentGeneratorClient()).thenReturn(documentGeneratorClient); when(documentGeneratorClient.generatePdfDocument(any(), anyString(), any())).thenReturn(newPayload.getBytes()); @@ -190,10 +190,10 @@ public void shouldGetCourtExtractWithAppealApplicationByCaseIdContent() throws E final DocumentGeneratorClient documentGeneratorClient = mock(DocumentGeneratorClient.class); final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream("progression.query.prosecutioncase-with-appeal-application-hearing.json"); - final JsonReader jsonReader = Json.createReader(stream)) { + final JsonReader jsonReader = JsonObjects.createReader(stream)) { final JsonObject payload = jsonReader.readObject(); final String newPayload = Resources.toString(getResource("court-extract-payload-with-plea-description.json"), Charset.defaultCharset()); - final JsonReader reader = Json.createReader(new StringReader(newPayload)); + final JsonReader reader = JsonObjects.createReader(new StringReader(newPayload)); JsonObject res = reader.readObject(); when(documentGeneratorClientProducer.documentGeneratorClient()).thenReturn(documentGeneratorClient); when(documentGeneratorClient.generatePdfDocument(any(), anyString(), any())).thenReturn(newPayload.getBytes()); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/DefenceQueryServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/DefenceQueryServiceTest.java index f20a04966..49c8248ee 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/DefenceQueryServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/DefenceQueryServiceTest.java @@ -2,8 +2,8 @@ import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/ReferenceDataServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/ReferenceDataServiceTest.java index 2f388f37e..f1b01f412 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/ReferenceDataServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/ReferenceDataServiceTest.java @@ -2,8 +2,8 @@ import java.util.Set; 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 org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/StagingPubHubServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/StagingPubHubServiceTest.java index 8c1bd5a4f..493cb4df4 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/StagingPubHubServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/StagingPubHubServiceTest.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -41,7 +41,7 @@ public void shouldReturnOrganisationDetails() throws IOException { //when stagingPubHubService.publishStandardList(standardList, userId); - final JsonObject expectedJson = Json.createObjectBuilder() + final JsonObject expectedJson = JsonObjects.createObjectBuilder() .add("standardList", standardList) .build(); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/UsersAndGroupsServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/UsersAndGroupsServiceTest.java index 2f5960592..24eac8c3c 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/UsersAndGroupsServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/service/UsersAndGroupsServiceTest.java @@ -15,7 +15,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -47,7 +47,7 @@ public void shouldReturnOrganisationDetails() { final UUID organisationId = randomUUID(); final MetadataBuilder metadataBuilder = getMetadataBuilder(userId); final JsonEnvelope query = JsonEnvelopeBuilder.envelope().with(metadataBuilder).withPayloadOf(organisationId.toString(), "organisationId").build(); - final JsonObjectBuilder associationBuilder = Json.createObjectBuilder().add("organisationId", organisationId.toString()); + final JsonObjectBuilder associationBuilder = JsonObjects.createObjectBuilder().add("organisationId", organisationId.toString()); final JsonEnvelope response = JsonEnvelope.envelopeFrom(metadataBuilder, associationBuilder); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ApplicationExtractTransformerTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ApplicationExtractTransformerTest.java index ce266b842..214f0d62b 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ApplicationExtractTransformerTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ApplicationExtractTransformerTest.java @@ -4,8 +4,8 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.SPACE; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; @@ -57,7 +57,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -594,7 +594,7 @@ private Organisation createOrganisation() { } private JsonObject createJudiciaryJsonObject() { - final JsonObjectBuilder judiciaryBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder judiciaryBuilder = JsonObjects.createObjectBuilder(); judiciaryBuilder.add("value", "desc"); return judiciaryBuilder.build(); } diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CertificateTransformerTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CertificateTransformerTest.java index 24de90197..d516665d3 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CertificateTransformerTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CertificateTransformerTest.java @@ -95,7 +95,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CourtExtractTransformerTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CourtExtractTransformerTest.java index 587eaa67d..b5fcaca29 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CourtExtractTransformerTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/CourtExtractTransformerTest.java @@ -132,7 +132,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -2825,7 +2825,7 @@ private Organisation createOrganisation() { } private JsonObject createJudiciaryJsonObject() { - final JsonObjectBuilder judiciaryBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder judiciaryBuilder = JsonObjects.createObjectBuilder(); judiciaryBuilder.add("requestedNameValue", "requestedNameDesc"); return judiciaryBuilder.build(); } diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/FileUtil.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/FileUtil.java index 4ddcce089..ee168c5fb 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/FileUtil.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/FileUtil.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource.utils; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; @@ -9,7 +9,7 @@ import java.io.StringReader; import java.util.Objects; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -36,7 +36,7 @@ public static String getPayload(final String path) { public static JsonObject jsonFromString(final String jsonObjectStr) { - JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ReportsTransformerTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ReportsTransformerTest.java index 34c6674d0..da3e33d08 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ReportsTransformerTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ReportsTransformerTest.java @@ -131,7 +131,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -2160,7 +2160,7 @@ private Organisation createOrganisation() { } private JsonObject createJudiciaryJsonObject() { - final JsonObjectBuilder judiciaryBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder judiciaryBuilder = JsonObjects.createObjectBuilder(); judiciaryBuilder.add("requestedNameValue", "requestedNameDesc"); return judiciaryBuilder.build(); } diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/RequestedNameMapperTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/RequestedNameMapperTest.java index 745443501..7effe8558 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/RequestedNameMapperTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/RequestedNameMapperTest.java @@ -6,7 +6,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -46,7 +46,7 @@ public void shouldNotReturnRequestedNameAsJudgeName() { private JsonObject createJudiciaryWithRequestedName() { - final JsonObjectBuilder judiciaryBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder judiciaryBuilder = JsonObjects.createObjectBuilder(); judiciaryBuilder.add(REQUESTED_NAME, REQUESTED_NAME); judiciaryBuilder.add(SURNAME, SURNAME); judiciaryBuilder.add(TITLE_SUFFIX, TITLE_SUFFIX); @@ -56,7 +56,7 @@ private JsonObject createJudiciaryWithRequestedName() { } private JsonObject createJudiciaryWithoutRequestedName() { - final JsonObjectBuilder judiciaryBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder judiciaryBuilder = JsonObjects.createObjectBuilder(); judiciaryBuilder.add(SURNAME, SURNAME); judiciaryBuilder.add(TITLE_SUFFIX, TITLE_SUFFIX); judiciaryBuilder.add(TITLE_JUDICIAL_PREFIX, TITLE_JUDICIAL_PREFIX); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultAmendmentHelperTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultAmendmentHelperTest.java index f50e6b9cb..f650d983c 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultAmendmentHelperTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultAmendmentHelperTest.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -77,7 +77,7 @@ public void shouldReturnSharedAmendmentsDueToSlipRule() { .withAmendmentDate(ZonedDateTime.now()) .withAmendmentReason(slipRuleAmendmentReason) .withResultPromptsRecord(List.of(ResultPrompt.prompt().withId(promptId) - .withPromptRef("promptRef").withLabel("End Date").withValue(Json.createValue("2024-03-21")).build())) + .withPromptRef("promptRef").withLabel("End Date").withValue(JsonObjects.getProvider().createValue("2024-03-21")).build())) .build(), AmendmentRecord.amendmentRecord() .withAmendmentDate(ZonedDateTime.now()) diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultPromptValueHelperTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultPromptValueHelperTest.java index c868e49dc..3aee651b2 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultPromptValueHelperTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/ResultPromptValueHelperTest.java @@ -4,7 +4,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static uk.gov.justice.api.resource.utils.ResultPromptValueHelper.getValue; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonValue; import org.junit.jupiter.api.Test; @@ -23,13 +23,13 @@ public void shouldConvertYesBoxTypePromptValueToStringValue() { @Test public void shouldConvertCurrencyTypePromptValueToStringValue() { - assertThat(getValue("CURR", Json.createValue(1200.00)), is("1200.00")); + assertThat(getValue("CURR", JsonObjects.getProvider().createValue(1200.00)), is("1200.00")); } @Test public void shouldConvertDurationTypePromptValueToStringValue() { - assertThat(getValue("DURATION", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + assertThat(getValue("DURATION", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("label", "MINUTES") .add("value", 30) .build()) @@ -38,12 +38,12 @@ public void shouldConvertDurationTypePromptValueToStringValue() { @Test public void shouldConvertDurationTypePromptWithMultipleValuesToStringValue() { - assertThat(getValue("DURATION", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + assertThat(getValue("DURATION", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("label", "HOURS") .add("value", 2) .build()) - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("label", "MINUTES") .add("value", 30) .build()) @@ -52,14 +52,14 @@ public void shouldConvertDurationTypePromptWithMultipleValuesToStringValue() { @Test public void shouldConvertFixedListMultipleTypePromptValueToStringValue() { - assertThat(getValue("FIXLM", Json.createArrayBuilder() + assertThat(getValue("FIXLM", JsonObjects.createArrayBuilder() .add("Offence while on bail") .build()), is("Offence while on bail")); } @Test public void shouldConvertFixedListMultipleTypePromptMultipleValuesToStringValue() { - assertThat(getValue("FIXLM", Json.createArrayBuilder() + assertThat(getValue("FIXLM", JsonObjects.createArrayBuilder() .add("Offence while on bail") .add("Second element") .build()), is("Offence while on bail###Second element")); @@ -67,14 +67,14 @@ public void shouldConvertFixedListMultipleTypePromptMultipleValuesToStringValue( @Test public void shouldConvertFixedListOtherMultipleTypePromptValueToStringValue() { - assertThat(getValue("FIXLOM", Json.createArrayBuilder() + assertThat(getValue("FIXLOM", JsonObjects.createArrayBuilder() .add("Broken bail conditions") .build()), is("Broken bail conditions")); } @Test public void shouldConvertFixedListOtherMultipleTypePromptMultipleValuesToStringValue() { - assertThat(getValue("FIXLOM", Json.createArrayBuilder() + assertThat(getValue("FIXLOM", JsonObjects.createArrayBuilder() .add("Broken bail conditions") .add("Offended on bail") .build()), is("Broken bail conditions###Offended on bail")); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/payload/PleaValueDescriptionBuilderTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/payload/PleaValueDescriptionBuilderTest.java index 18ad22490..e2a8df2d3 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/payload/PleaValueDescriptionBuilderTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/justice/api/resource/utils/payload/PleaValueDescriptionBuilderTest.java @@ -1,7 +1,7 @@ package uk.gov.justice.api.resource.utils.payload; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.Map; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -47,10 +47,10 @@ public void setUp() { public void shouldRebuildWithPleaValueDescription() throws Exception { final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream("payload.json"); - final JsonReader jsonReader = Json.createReader(stream); + final JsonReader jsonReader = JsonObjects.createReader(stream); final InputStream streamResult = loader.getResourceAsStream("payload-with-description.json"); - final JsonReader jsonResultReader = Json.createReader(streamResult)) { + final JsonReader jsonResultReader = JsonObjects.createReader(streamResult)) { final JsonObject result = jsonResultReader.readObject(); final JsonObject payload = jsonReader.readObject(); @@ -76,10 +76,10 @@ public void shouldRebuildAnyObjectAsIs() throws Exception { public void shouldRebuildWithPleaValueDescriptionForCourtOrderOffencePlea() throws Exception { final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream("payload-courtapplications-courtorder-courtorderoffence-plea.json"); - final JsonReader jsonReader = Json.createReader(stream); + final JsonReader jsonReader = JsonObjects.createReader(stream); final InputStream streamResult = loader.getResourceAsStream("payload-courtapplications-courtorder-courtorderoffence-plea-with-description.json"); - final JsonReader jsonResultReader = Json.createReader(streamResult)) { + final JsonReader jsonResultReader = JsonObjects.createReader(streamResult)) { final JsonObject result = jsonResultReader.readObject(); final JsonObject payload = jsonReader.readObject(); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApiTest.java index 9d87ab680..1271d9ece 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ApplicationQueryApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.query.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -34,7 +34,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -205,7 +205,7 @@ public void shouldThrowForbiddenRequestExceptionWhenGetApplicationAtAGlanceForDe final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, jsonObjectPayload); when(applicationQueryView.getCourtApplicationForApplicationAtAGlance(any())).thenReturn(envelope); - when(usersGroupQueryService.getUserGroups(any(), any())).thenReturn(Json.createObjectBuilder() + when(usersGroupQueryService.getUserGroups(any(), any())).thenReturn(JsonObjects.createObjectBuilder() .add("groups", createArrayBuilder() .add(createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) .build()) @@ -219,7 +219,7 @@ public void shouldThrowForbiddenRequestExceptionWhenGetApplicationAtAGlanceForDe String caseId = randomUUID().toString(); final JsonArrayBuilder jsonArrayBuilder = createArrayBuilder(); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add("prosecutionCaseId", caseId); final JsonObject jsonObjectPayload = createObjectBuilder().add("linkedCases", jsonArrayBuilder.add(jsonObjectBuilder).build()).build(); final Metadata metadata = QueryClientTestBase.metadataFor(APPLICATION_AT_GLANCE_DEFENCE); @@ -227,7 +227,7 @@ public void shouldThrowForbiddenRequestExceptionWhenGetApplicationAtAGlanceForDe when(applicationQueryView.getCourtApplicationForApplicationAtAGlance(any())).thenReturn(envelope); when(defenceQueryService.isUserProsecutingOrDefendingCase(envelope, caseId)).thenReturn(false); - when(usersGroupQueryService.getUserGroups(any(), any())).thenReturn(Json.createObjectBuilder() + when(usersGroupQueryService.getUserGroups(any(), any())).thenReturn(JsonObjects.createObjectBuilder() .add("groups", createArrayBuilder() .build()) .build()); @@ -240,14 +240,14 @@ public void shouldReturnApplicationDetailsWhenGetApplicationAtAGlanceForDefenceA ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(JsonEnvelope.class); String caseId = randomUUID().toString(); final JsonArrayBuilder jsonArrayBuilder = createArrayBuilder(); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add("prosecutionCaseId", caseId); final JsonObject jsonObjectPayload = createObjectBuilder().add("linkedCases", jsonArrayBuilder.add(jsonObjectBuilder).build()).build(); final Metadata metadata = QueryClientTestBase.metadataFor(APPLICATION_AT_GLANCE_DEFENCE); final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, jsonObjectPayload); when(applicationQueryView.getCourtApplicationForApplicationAtAGlance(any())).thenReturn(envelope); - when(usersGroupQueryService.getUserGroups(any(), any())).thenReturn(Json.createObjectBuilder() + when(usersGroupQueryService.getUserGroups(any(), any())).thenReturn(JsonObjects.createObjectBuilder() .add("groups", createArrayBuilder() .add(createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) .build()) diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CaseMaterialApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CaseMaterialApiTest.java index e2d64130d..46dcbe557 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CaseMaterialApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CaseMaterialApiTest.java @@ -9,7 +9,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.progression.query.MaterialBulkQueryView; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import java.util.UUID; @@ -38,12 +38,12 @@ void shouldReturnEnvelopeForBulkMaterialQuery() { final UUID metadataId = UUID.randomUUID(); final String metadataName = "progression.query.material-content-bulk"; - final JsonArray materialIdsArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("materialId", UUID.randomUUID().toString())) - .add(Json.createObjectBuilder().add("materialId", UUID.randomUUID().toString())) + final JsonArray materialIdsArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("materialId", UUID.randomUUID().toString())) + .add(JsonObjects.createObjectBuilder().add("materialId", UUID.randomUUID().toString())) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsArray) .build(); @@ -77,12 +77,12 @@ void shouldPreserveEnvelopeMetadataAndPayload() { final UUID materialId1 = UUID.fromString("a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d"); final UUID materialId2 = UUID.fromString("f6a7b8c9-d0e1-4f2a-3b4c-5d6e7f8a9b0c"); - final JsonArray materialIdsArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("materialId", materialId1.toString())) - .add(Json.createObjectBuilder().add("materialId", materialId2.toString())) + final JsonArray materialIdsArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("materialId", materialId1.toString())) + .add(JsonObjects.createObjectBuilder().add("materialId", materialId2.toString())) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsArray) .build(); @@ -91,14 +91,14 @@ void shouldPreserveEnvelopeMetadataAndPayload() { payload ); - final JsonObject responsePayload = Json.createObjectBuilder() - .add("materialIds", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + final JsonObject responsePayload = JsonObjects.createObjectBuilder() + .add("materialIds", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("materialId", materialId1.toString()) .add("courtDocumentId", UUID.randomUUID().toString()) .add("caseId", UUID.randomUUID().toString()) .add("caseUrn", "39GD1116822")) - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("materialId", materialId2.toString()) .add("courtDocumentId", UUID.randomUUID().toString()) .add("caseId", UUID.randomUUID().toString()) @@ -134,9 +134,9 @@ void shouldPreserveEnvelopeMetadataAndPayload() { @Test void shouldHandleEmptyMaterialIdsArray() { // Given - final JsonArray emptyMaterialIdsArray = Json.createArrayBuilder().build(); + final JsonArray emptyMaterialIdsArray = JsonObjects.createArrayBuilder().build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", emptyMaterialIdsArray) .build(); @@ -145,8 +145,8 @@ void shouldHandleEmptyMaterialIdsArray() { payload ); - final JsonObject responsePayload = Json.createObjectBuilder() - .add("materialIds", Json.createArrayBuilder().build()) + final JsonObject responsePayload = JsonObjects.createObjectBuilder() + .add("materialIds", JsonObjects.createArrayBuilder().build()) .build(); final JsonEnvelope expectedResponse = envelopeFrom( @@ -168,9 +168,9 @@ void shouldHandleEmptyMaterialIdsArray() { @Test void shouldDelegateToMaterialBulkQueryView() { // Given - final JsonObject payload = Json.createObjectBuilder() - .add("materialIds", Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("materialId", UUID.randomUUID().toString())) + final JsonObject payload = JsonObjects.createObjectBuilder() + .add("materialIds", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("materialId", UUID.randomUUID().toString())) .build()) .build(); @@ -194,11 +194,11 @@ void shouldHandleSingleMaterialId() { // Given final UUID materialId = UUID.fromString("a1b2c3d4-e5f6-4a7b-8c9d-0e1f2a3b4c5d"); - final JsonArray materialIdsArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("materialId", materialId.toString())) + final JsonArray materialIdsArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("materialId", materialId.toString())) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsArray) .build(); @@ -207,9 +207,9 @@ void shouldHandleSingleMaterialId() { payload ); - final JsonObject responsePayload = Json.createObjectBuilder() - .add("materialIds", Json.createArrayBuilder() - .add(Json.createObjectBuilder() + final JsonObject responsePayload = JsonObjects.createObjectBuilder() + .add("materialIds", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder() .add("materialId", materialId.toString()) .add("courtDocumentId", UUID.randomUUID().toString()) .add("caseId", UUID.randomUUID().toString()) diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CivilFeesQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CivilFeesQueryApiTest.java index 08f4c48ff..483276be2 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CivilFeesQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CivilFeesQueryApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.*; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApiTest.java index 6caebb14d..f0c37a021 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CotrQueryApiTest.java @@ -2,8 +2,8 @@ import static java.nio.charset.Charset.defaultCharset; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; @@ -34,7 +34,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.io.Resources; @@ -317,7 +317,7 @@ public void shouldGetTrialReadinessHearingDetails() throws IOException { private JsonObject getJsonPayload(final String fileName) throws IOException { final String jsonString = Resources.toString(Resources.getResource(fileName), defaultCharset()); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readObject(); } diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApiTest.java index 363141b5c..e5500cec4 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtDocumentQueryApiTest.java @@ -1,8 +1,8 @@ package uk.gov.moj.cpp.progression.query.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtRegisterRequestApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtRegisterRequestApiTest.java index 9dca0482f..43fc3895f 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtRegisterRequestApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtRegisterRequestApiTest.java @@ -4,7 +4,7 @@ import uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory; import uk.gov.moj.cpp.progression.query.CourtRegisterDocumentRequestQueryView; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ public class CourtRegisterRequestApiTest { @Test public void getCourtRegisterDocumentRequest() { - final JsonObjectBuilder courtDocumentPayload = Json.createObjectBuilder(); + final JsonObjectBuilder courtDocumentPayload = JsonObjects.createObjectBuilder(); final JsonEnvelope response = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.query.court-register-document-request"), courtDocumentPayload); @@ -34,7 +34,7 @@ public void getCourtRegisterDocumentRequest() { @Test public void getCourtRegisterDocumentRequestByMaterial() { - final JsonObjectBuilder courtDocumentPayload = Json.createObjectBuilder(); + final JsonObjectBuilder courtDocumentPayload = JsonObjects.createObjectBuilder(); final JsonEnvelope response = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.query.court-register-document-by-material"), courtDocumentPayload); @@ -45,7 +45,7 @@ public void getCourtRegisterDocumentRequestByMaterial() { @Test public void getCourtRegisterDocumentRequestByDate() { - final JsonObjectBuilder courtDocumentPayload = Json.createObjectBuilder(); + final JsonObjectBuilder courtDocumentPayload = JsonObjects.createObjectBuilder(); final JsonEnvelope response = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.query.court-register-document-by-request-date"), courtDocumentPayload); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApiTest.java index 03e89d966..40b621869 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/CourtlistQueryApiTest.java @@ -11,7 +11,7 @@ import java.lang.reflect.Field; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,11 +57,11 @@ public void shouldHandlePrisonCourtListQuery() { @Test public void shouldHandleSearchCourtlistDataQuery() { stubCourtlistQueryView.setSearchCourtlistResponse(response); - var enrichedPayload = Json.createObjectBuilder().build(); + var enrichedPayload = JsonObjects.createObjectBuilder().build(); when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(enrichedPayload); var metadata = metadataBuilder().withId(UUID.randomUUID()).withName("test").build(); when(query.metadata()).thenReturn(metadata); - when(query.payloadAsJsonObject()).thenReturn(Json.createObjectBuilder().build()); + when(query.payloadAsJsonObject()).thenReturn(JsonObjects.createObjectBuilder().build()); var result = courtListQueryApi.searchCourtlistData(query); assertThat(result.metadata().name(), equalTo(metadata.name())); assertThat(result.payloadAsJsonObject(), equalTo(enrichedPayload)); @@ -70,11 +70,11 @@ public void shouldHandleSearchCourtlistDataQuery() { @Test public void shouldHandleSearchPrisonCourtlistDataQuery() { stubCourtlistQueryView.setSearchPrisonCourtlistResponse(response); - var enrichedPayload = Json.createObjectBuilder().build(); + var enrichedPayload = JsonObjects.createObjectBuilder().build(); when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(enrichedPayload); var metadata = metadataBuilder().withId(UUID.randomUUID()).withName("test").build(); when(query.metadata()).thenReturn(metadata); - when(query.payloadAsJsonObject()).thenReturn(Json.createObjectBuilder().build()); + when(query.payloadAsJsonObject()).thenReturn(JsonObjects.createObjectBuilder().build()); var result = courtListQueryApi.searchPrisonCourtlistData(query); assertThat(result.metadata().name(), equalTo(metadata.name())); assertThat(result.payloadAsJsonObject(), equalTo(enrichedPayload)); @@ -83,9 +83,9 @@ public void shouldHandleSearchPrisonCourtlistDataQuery() { @Test public void searchCourtlistData_shouldPassIncludeApplicationsTrueWhenPresentInPayload() { stubCourtlistQueryView.setSearchCourtlistResponse(response); - when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(Json.createObjectBuilder().build()); + when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(JsonObjects.createObjectBuilder().build()); when(query.metadata()).thenReturn(metadataBuilder().withId(UUID.randomUUID()).withName("progression.search.court.list.data").build()); - when(query.payloadAsJsonObject()).thenReturn(Json.createObjectBuilder().add("includeApplications", true).build()); + when(query.payloadAsJsonObject()).thenReturn(JsonObjects.createObjectBuilder().add("includeApplications", true).build()); courtListQueryApi.searchCourtlistData(query); @@ -96,9 +96,9 @@ public void searchCourtlistData_shouldPassIncludeApplicationsTrueWhenPresentInPa @Test public void searchCourtlistData_shouldPassIncludeApplicationsFalseWhenPresentInPayload() { stubCourtlistQueryView.setSearchCourtlistResponse(response); - when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(Json.createObjectBuilder().build()); + when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(JsonObjects.createObjectBuilder().build()); when(query.metadata()).thenReturn(metadataBuilder().withId(UUID.randomUUID()).withName("progression.search.court.list.data").build()); - when(query.payloadAsJsonObject()).thenReturn(Json.createObjectBuilder().add("includeApplications", false).build()); + when(query.payloadAsJsonObject()).thenReturn(JsonObjects.createObjectBuilder().add("includeApplications", false).build()); courtListQueryApi.searchCourtlistData(query); @@ -109,9 +109,9 @@ public void searchCourtlistData_shouldPassIncludeApplicationsFalseWhenPresentInP @Test public void searchCourtlistData_shouldDefaultIncludeApplicationsToFalseWhenMissingFromPayload() { stubCourtlistQueryView.setSearchCourtlistResponse(response); - when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(Json.createObjectBuilder().build()); + when(courtlistQueryService.buildEnrichedPayload(response)).thenReturn(JsonObjects.createObjectBuilder().build()); when(query.metadata()).thenReturn(metadataBuilder().withId(UUID.randomUUID()).withName("progression.search.court.list.data").build()); - when(query.payloadAsJsonObject()).thenReturn(Json.createObjectBuilder().build()); + when(query.payloadAsJsonObject()).thenReturn(JsonObjects.createObjectBuilder().build()); courtListQueryApi.searchCourtlistData(query); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApiTest.java index e8a910e78..c34c0f33f 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DirectionsManagementQueryApiTest.java @@ -35,7 +35,7 @@ import uk.gov.moj.cpp.progression.service.RefDataService; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -53,9 +53,9 @@ import static java.util.Arrays.asList; import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; @@ -124,7 +124,7 @@ public void shouldReturnPetCaseDirections() { final JsonEnvelope query = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("directionsmanagement.query.form-directions"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("categories", "test1,test2") .add("caseId", caseId.toString()) .add("formId", formId.toString()) @@ -162,7 +162,7 @@ public void shouldReturnPtphCaseDirections() { final JsonEnvelope query = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("directionsmanagement.query.form-directions"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("categories", "test1,test2") .add("caseId", caseId.toString()) .add("formId", formId.toString()) @@ -223,7 +223,7 @@ public void shouldGetPetCaseDirectionsReturnNoRefDataDirectionWhenFormTypeDoesNo RefDataDirection refDataDirection = RefDataDirection.refDataDirection().withSequenceNumber(1).build(); // when(directionQueryView.getTransformedDirections(any(), any(), any(), any(), any(), anyBoolean(), anyString())).thenReturn(refDataDirection); - final JsonObjectBuilder queryPayload = Json.createObjectBuilder().add("categories", "cat1,cat2") + final JsonObjectBuilder queryPayload = JsonObjects.createObjectBuilder().add("categories", "cat1,cat2") .add("formType", "PET") .add("caseId", randomUUID().toString()) .add("formId", randomUUID().toString()); @@ -245,7 +245,7 @@ public void shouldReturnEmptyDirectionsWhenNoDirectionManagementTypes() { final UUID formId = randomUUID(); final JsonEnvelope query = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("directionsmanagement.query.form-directions"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("categories", "test1,test2") .add("caseId", caseId.toString()) .add("formId", formId.toString()) @@ -266,7 +266,7 @@ public void shouldReturnEmptyDirectionsWhenNoMatchingCategories() { final UUID formId = randomUUID(); final JsonEnvelope query = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("directionsmanagement.query.form-directions"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("categories", "nonexistent") .add("caseId", caseId.toString()) .add("formId", formId.toString()) @@ -289,7 +289,7 @@ public void shouldReturnEmptyDirectionsWhenNoDefendants() { final UUID formId = randomUUID(); final JsonEnvelope query = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("directionsmanagement.query.form-directions"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("categories", "test1,test2") .add("caseId", caseId.toString()) .add("formId", formId.toString()) @@ -320,7 +320,7 @@ public void shouldReturnEmptyDirectionsWhenNoMatchingDirections() { final UUID formId = randomUUID(); final JsonEnvelope query = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("directionsmanagement.query.form-directions"), - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add("categories", "test1,test2") .add("caseId", caseId.toString()) .add("formId", formId.toString()) @@ -363,7 +363,7 @@ private JsonEnvelope getJsonEnvelope(final Envelope envelop) { private JsonObject getJsonPayload(final String fileName) throws IOException { final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream(fileName); - final JsonReader jsonReader = Json.createReader(stream)) { + final JsonReader jsonReader = JsonObjects.createReader(stream)) { final JsonObject payload = jsonReader.readObject(); return payload; } diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DocumentQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DocumentQueryApiTest.java index 8f28f2d37..75d8d6062 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DocumentQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/DocumentQueryApiTest.java @@ -3,8 +3,8 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -44,7 +44,7 @@ import java.util.Map; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -112,18 +112,18 @@ private static JsonObject buildCourtDocumentJsonObject() { } private static JsonObject buildDocumentTypeDataWithRBAC() { - return Json.createObjectBuilder() - .add("documentAccess", Json.createArrayBuilder().add("Listing Officer")) - .add("canCreateUserGroups", Json.createArrayBuilder().add("Listing Officer")) - .add("canReadUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates")) - .add("canDownloadUserGroups", Json.createArrayBuilder().add("Listing Officer").add("Magistrates")) + return JsonObjects.createObjectBuilder() + .add("documentAccess", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("canCreateUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer")) + .add("canReadUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates")) + .add("canDownloadUserGroups", JsonObjects.createArrayBuilder().add("Listing Officer").add("Magistrates")) .build(); } private static JsonObject buildHearingTypeListJsonObject() { - final JsonObject hearingTypeList = Json.createObjectBuilder() - .add("hearingTypes", Json.createArrayBuilder() + final JsonObject hearingTypeList = JsonObjects.createObjectBuilder() + .add("hearingTypes", JsonObjects.createArrayBuilder() .add(createObjectBuilder() .add("id", "06b0c2bf-3f98-46ed-ab7e-56efaf9ecced") .add("hearingCode", "TIS") diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/FormQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/FormQueryApiTest.java index a2d2b3e4c..35d927c2c 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/FormQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/FormQueryApiTest.java @@ -2,8 +2,8 @@ import static java.time.LocalTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/JudicialResultQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/JudicialResultQueryApiTest.java index 1588ae89c..d0be914ee 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/JudicialResultQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/JudicialResultQueryApiTest.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.progression.query.JudicialResultQueryView; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -32,7 +32,7 @@ class JudicialResultQueryApiTest { @Test void shouldGetJudicialChildResults() { - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", randomUUID().toString()) .add("masterDefendantId", randomUUID().toString()) .add("judicialResultTypeId", randomUUID().toString()) @@ -50,7 +50,7 @@ void shouldGetJudicialChildResults() { @Test void shouldGetJudicialChildResultsV2() { - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", randomUUID().toString()) .add("masterDefendantId", randomUUID().toString()) .add("judicialResultTypeId", randomUUID().toString()) diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PetQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PetQueryApiTest.java index ebdade002..ff4c561f1 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PetQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PetQueryApiTest.java @@ -2,8 +2,8 @@ import static java.time.LocalTime.now; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PrisonCourtRegisterRequestApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PrisonCourtRegisterRequestApiTest.java index c497e6105..b83471fd4 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PrisonCourtRegisterRequestApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/PrisonCourtRegisterRequestApiTest.java @@ -4,7 +4,7 @@ import uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory; import uk.gov.moj.cpp.progression.query.PrisonCourtRegisterDocumentRequestQueryView; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObjectBuilder; import org.junit.jupiter.api.Test; @@ -24,7 +24,7 @@ public class PrisonCourtRegisterRequestApiTest { @Test public void getPrisonCourtRegisterDocumentRequestByCourtCentre() { - final JsonObjectBuilder prisonCourtRegisterDocumentPayload = Json.createObjectBuilder(); + final JsonObjectBuilder prisonCourtRegisterDocumentPayload = JsonObjects.createObjectBuilder(); final JsonEnvelope response = JsonEnvelope.envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("progression.query.prison-court-register-document-by-court-centre"), prisonCourtRegisterDocumentPayload); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApiTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApiTest.java index dc9a76df3..d56aa945e 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApiTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/ProsecutionCaseQueryApiTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; @@ -27,7 +27,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -264,7 +264,7 @@ public void shouldHandleProsecutionCaseQueryWithNoCourtOrders() { @Test public void shouldHandleProsecutionCaseQueryWithEmptyCourtOrders() { final JsonObject prosecutionCasePayload = readJson(PROSECUTION_CASE_QUERY_VIEW_JSON, JsonObject.class); - final JsonObject courtOrdersPayload = createObjectBuilder().add("courtOrders", Json.createArrayBuilder().build()).build(); + final JsonObject courtOrdersPayload = createObjectBuilder().add("courtOrders", JsonObjects.createArrayBuilder().build()).build(); final Metadata metadata = QueryClientTestBase.metadataFor(PROSECUTION_CASE_QUERY, randomUUID()); final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, prosecutionCasePayload); @@ -305,7 +305,7 @@ public void shouldHandleProsecutionCaseAtAGlanceWithRepresentation() { @Test public void shouldHandleProsecutionCaseAtAGlanceWithOutRepresentation() { final JsonObject caagResponse = readJson(JSON_CAAG_RESPONSE_JSON, JsonObject.class); - final JsonObject jsonObjectPayload = createObjectBuilder().add("defendants", Json.createArrayBuilder().build()).build(); + final JsonObject jsonObjectPayload = createObjectBuilder().add("defendants", JsonObjects.createArrayBuilder().build()).build(); final Metadata metadata = QueryClientTestBase.metadataFor(CAAG_PROSECUTION_QUERY, randomUUID()); final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadata, caagResponse); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoadTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoadTest.java index 31d3a0e4c..a237d64d4 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoadTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoadTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoaderTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoaderTest.java index 37ce46126..aa54d661b 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoaderTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/UserDetailsLoaderTest.java @@ -19,7 +19,7 @@ import java.util.List; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -79,7 +79,7 @@ public void shouldReturnValidOrganisationDetails() { @Test public void shouldNotReturnOrganisationDetails() { - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); final Metadata metadata = QueryClientTestBase.metadataFor(USER_GROUPS_GET_PERMISSION); final Envelope envelope = Envelope.envelopeFrom(metadata, jsonObjectPayload); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelperTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelperTest.java index fb16d7e06..96915a6e7 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelperTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/helper/PetForDefendantQueryHelperTest.java @@ -2,7 +2,7 @@ import static java.nio.charset.Charset.defaultCharset; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiServiceTest.java index f6b5bec76..bebbbe308 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CotrQueryApiServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderServiceTest.java index 3c87cdaa1..6c6c8c80f 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtOrderServiceTest.java @@ -11,7 +11,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.Metadata; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.CoreMatchers; @@ -52,7 +52,7 @@ public void shouldReturnCourtOrders() { public void shouldNotReturnCourtOrders() { - final JsonObject jsonObjectPayload = Json.createObjectBuilder().build(); + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder().build(); final Metadata metadata = QueryClientTestBase.metadataFor(COURT_ORDERS_QUERY, randomUUID()); final Envelope envelope = Envelope.envelopeFrom(metadata, jsonObjectPayload); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryServiceTest.java index 5f901ff14..f7cfd188d 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/CourtlistQueryServiceTest.java @@ -16,7 +16,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -82,7 +82,7 @@ void buildCourtlistQueryEnvelope_shouldOmitUserIdWhenNull() { @Test void buildEnrichedPayload_shouldCopyPayloadWhenCourtCentreNameIsNull() { - final JsonObject originalPayload = Json.createObjectBuilder() + final JsonObject originalPayload = JsonObjects.createObjectBuilder() .add("listType", "public") .build(); final JsonEnvelope document = envelopeFrom( @@ -101,7 +101,7 @@ void buildEnrichedPayload_shouldCopyPayloadWhenCourtCentreNameIsNull() { @Test void buildEnrichedPayload_shouldEnrichWithCourtCentreDataWhenCourtCentreNamePresentAndReferenceDataReturnsData() { final String courtCentreName = "Test Court"; - final JsonObject originalPayload = Json.createObjectBuilder() + final JsonObject originalPayload = JsonObjects.createObjectBuilder() .add("courtCentreName", courtCentreName) .add("listType", "public") .build(); @@ -109,7 +109,7 @@ void buildEnrichedPayload_shouldEnrichWithCourtCentreDataWhenCourtCentreNamePres MetadataBuilderFactory.metadataWithRandomUUID("test"), originalPayload); - final JsonObject courtCentreData = Json.createObjectBuilder() + final JsonObject courtCentreData = JsonObjects.createObjectBuilder() .add("oucode", "OU123") .add("id", "court-id-1") .add("courtId", "456") @@ -130,14 +130,14 @@ void buildEnrichedPayload_shouldEnrichWithCourtCentreDataWhenCourtCentreNamePres @Test void buildEnrichedPayload_shouldUseDefaultCourtIdNumericWhenNotInReferenceData() { final String courtCentreName = "Other Court"; - final JsonObject originalPayload = Json.createObjectBuilder() + final JsonObject originalPayload = JsonObjects.createObjectBuilder() .add("courtCentreName", courtCentreName) .build(); final JsonEnvelope document = envelopeFrom( MetadataBuilderFactory.metadataWithRandomUUID("test"), originalPayload); - final JsonObject courtCentreData = Json.createObjectBuilder() + final JsonObject courtCentreData = JsonObjects.createObjectBuilder() .add("oucode", "OU456") .add("id", "court-id-2") .build(); @@ -152,7 +152,7 @@ void buildEnrichedPayload_shouldUseDefaultCourtIdNumericWhenNotInReferenceData() @Test void buildEnrichedPayload_shouldNotAddEnrichmentWhenReferenceDataReturnsEmpty() { final String courtCentreName = "Unknown Court"; - final JsonObject originalPayload = Json.createObjectBuilder() + final JsonObject originalPayload = JsonObjects.createObjectBuilder() .add("courtCentreName", courtCentreName) .build(); final JsonEnvelope document = envelopeFrom( diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/ListingServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/ListingServiceTest.java index c4efd5c47..7954a8e14 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/ListingServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/ListingServiceTest.java @@ -23,7 +23,7 @@ import java.util.Optional; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -61,7 +61,7 @@ public void shouldSearchTrialReadiness() { .with(metadataBuilder) .build(); - final JsonObject listingPayload = Json.createObjectBuilder() + final JsonObject listingPayload = JsonObjects.createObjectBuilder() .add("id", "id-value") .build(); @@ -91,7 +91,7 @@ public void shouldSearchTrialReadinessWithClusterId() { .withPayloadOf("53b3c80f-57ea-3915-8b2d-457291d94d9a","clusterId") .build(); - final JsonObject listingPayload = Json.createObjectBuilder() + final JsonObject listingPayload = JsonObjects.createObjectBuilder() .add("id", "id-value") .build(); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationServiceTest.java index c5957bd13..e7d90d306 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/OrganisationServiceTest.java @@ -16,7 +16,7 @@ import uk.gov.justice.services.messaging.Envelope; import uk.gov.justice.services.messaging.Metadata; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -55,8 +55,8 @@ public void shouldReturnOrganisationDetails() { @Test public void shouldReturnEmptyOrganisationDetails() { - final JsonObject jsonObjectPayload = Json.createObjectBuilder() - .add("association", Json.createObjectBuilder()) + final JsonObject jsonObjectPayload = JsonObjects.createObjectBuilder() + .add("association", JsonObjects.createObjectBuilder()) .build(); final Metadata metadata = metadataFor(DEFENCE_ASSOCIATION_QUERY, randomUUID()); final Envelope envelope = envelopeFrom(metadata, jsonObjectPayload); diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetServiceTest.java index 6a9ecc9f0..cd049f7bb 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/RecordSheetServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.api.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryServiceTest.java b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryServiceTest.java index 1fa6f241d..3b7cacefd 100644 --- a/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryServiceTest.java +++ b/progression-query/progression-query-api/src/test/java/uk/gov/moj/cpp/progression/query/api/service/UsersGroupQueryServiceTest.java @@ -2,8 +2,8 @@ import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryView.java index ce4b56bc3..23396b18b 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryView.java @@ -34,7 +34,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -77,7 +77,7 @@ public JsonEnvelope getApplicationHearingCaseDetails(final JsonEnvelope envelope final Optional optionalCourtApplication = ofNullable(hearing.getCourtApplications()).orElse(Collections.emptyList()).stream() .filter(c -> c.getId().equals(applicationId)) .findFirst(); - final JsonObjectBuilder responseBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder responseBuilder = JsonObjects.createObjectBuilder(); if (optionalCourtApplication.isPresent()) { final CourtApplication courtApplication = optionalCourtApplication.get(); responseBuilder.add("hearingId", hearingId.toString()) @@ -110,12 +110,12 @@ private static void getMasterDefendant(final CourtApplication courtApplication, private void getCourtOrderCasesSummary(final CourtApplication courtApplication, final JsonObjectBuilder responseBuilder) { if (nonNull(courtApplication.getCourtOrder())) { - final JsonArrayBuilder caseDetails = Json.createArrayBuilder(); + final JsonArrayBuilder caseDetails = JsonObjects.createArrayBuilder(); final List addedCaseIds = new ArrayList<>(); courtApplication.getCourtOrder().getCourtOrderOffences().forEach(courtOrderOffence -> { if (!addedCaseIds.contains(courtOrderOffence.getProsecutionCaseId())) { caseDetails.add( - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, courtOrderOffence.getProsecutionCaseId().toString()) .add(CASE_URN, getCaseURN(courtOrderOffence.getProsecutionCaseIdentifier())) .add(CASE_STATUS, getCaseStatus(courtOrderOffence.getProsecutionCaseId())) @@ -130,10 +130,10 @@ private void getCourtOrderCasesSummary(final CourtApplication courtApplication, private void getCourtApplicationCasesSummary(final CourtApplication courtApplication, final JsonObjectBuilder responseBuilder) { if (nonNull(courtApplication.getCourtApplicationCases())) { - final JsonArrayBuilder caseDetails = Json.createArrayBuilder(); + final JsonArrayBuilder caseDetails = JsonObjects.createArrayBuilder(); courtApplication.getCourtApplicationCases().forEach(courtApplicationCase -> caseDetails.add( - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(CASE_ID, courtApplicationCase.getProsecutionCaseId().toString()) .add(CASE_URN, getCaseURN(courtApplicationCase.getProsecutionCaseIdentifier())) .add(CASE_STATUS, courtApplicationCase.getCaseStatus()) diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryView.java index 4c0934cd7..1b7cfbf91 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryView.java @@ -2,8 +2,8 @@ import static java.util.UUID.fromString; 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.justice.services.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.services.common.converter.ZonedDateTimes; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationQueryView.java index 75cac226a..e9fc41fc0 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ApplicationQueryView.java @@ -6,8 +6,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.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonObjects.getString; import static uk.gov.justice.services.messaging.JsonObjects.getUUID; @@ -366,7 +366,7 @@ public JsonEnvelope getApplicationOnly(final JsonEnvelope envelope) { @Handles("progression.query.application-status") public JsonEnvelope getApplicationStatus(final JsonEnvelope envelope) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); final List applicationIdList = JsonObjects.getString(envelope.payloadAsJsonObject(), APPLICATION_IDS) .map(applicationIdStr -> Arrays.stream(applicationIdStr.split(",")).map(UUID::fromString).toList()) @@ -377,7 +377,7 @@ public JsonEnvelope getApplicationStatus(final JsonEnvelope envelope) { final JsonArrayBuilder applicationStatusJsonArray = createArrayBuilder(); courtApplicationEntityList.forEach(courtApplicationEntity -> { final JsonObject application = stringToJsonObjectConverter.convert(courtApplicationEntity.getPayload()); - applicationStatusJsonArray.add(Json.createObjectBuilder() + applicationStatusJsonArray.add(JsonObjects.createObjectBuilder() .add(APPLICATION_ID, application.getString(ID)) .add(APPLICATION_STATUS, application.getString(APPLICATION_STATUS))); }); @@ -466,7 +466,7 @@ public JsonEnvelope getCourtProceedingsForApplication(final JsonEnvelope query) final List childApplications = courtApplicationRepository.findByParentApplicationId(UUID.fromString(applicationId)); if (!childApplications.isEmpty()) { final JsonArray childApplicationsArray = buildApplicationSummaries(childApplications); - applicationObject = createObjectBuilder(applicationObject).add("linkedApplications", createArrayBuilder(childApplicationsArray)).build(); + applicationObject = createObjectBuilder(applicationObject).add("linkedApplications", JsonObjects.getProvider().createArrayBuilder(childApplicationsArray)).build(); } return envelopeFrom(query.metadata(), applicationObject); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQuery.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQuery.java index 830079bef..dad8b8f73 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQuery.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQuery.java @@ -36,7 +36,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -91,7 +91,7 @@ public JsonEnvelope getCaseLsmInfo(final JsonEnvelope envelope) { final UUID caseId = JsonObjects.getUUID(envelope.payloadAsJsonObject(), PARAM_CASE_ID) .orElseThrow(() -> new IllegalArgumentException("caseId parameter cannot be empty!")); - final JsonObjectBuilder responseBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder responseBuilder = JsonObjects.createObjectBuilder(); //MATCHED DEFENDANTS try { @@ -112,7 +112,7 @@ public JsonEnvelope getCaseLsmInfo(final JsonEnvelope envelope) { defendantCaseHearingEntityToBeRemoved.stream().forEach(e -> uniqueMatchedCases.removeIf(matchDefendantCaseHearingEntity -> matchDefendantCaseHearingEntity.getId().equals(e)) ); - final JsonArrayBuilder matchedCasesArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder matchedCasesArrayBuilder = JsonObjects.createArrayBuilder(); uniqueMatchedCases.stream().forEach(e -> matchedCasesArrayBuilder.add(buildMatchedDefendantCase(e.getProsecutionCase(), e.getMasterDefendantId(), Optional.ofNullable(e.getHearing())))); responseBuilder.add(MATCHED_DEFENDANT_CASES, matchedCasesArrayBuilder); } @@ -132,7 +132,7 @@ public JsonEnvelope getCaseLsmInfo(final JsonEnvelope envelope) { } private void buildRelatedCases(final JsonObjectBuilder responseBuilder, final LinkType linkType, final List linkedCases) { - final JsonArrayBuilder linkedCasesArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder linkedCasesArrayBuilder = JsonObjects.createArrayBuilder(); linkedCases.stream().forEach(e -> linkedCasesArrayBuilder.add(buildRelatedCase(e.getLinkedCase(), e.getType(), Optional.ofNullable(e.getReference()), e.getLinkGroupId(), getHearingByCaseId(e.getLinkedCaseId())))); responseBuilder.add(getLinkTitle(linkType), linkedCasesArrayBuilder); } @@ -166,7 +166,7 @@ private JsonObjectBuilder buildMatchedDefendantCase(final ProsecutionCaseEntity final ProsecutionCase prosecutionCase = convertToProsecutionCase(prosecutionCaseEntity); final Hearing hearing = convertToHearing(hearingEntity); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder() .add(CASE_ID, prosecutionCase.getId().toString()) .add(CASE_URN, extractCaseUrn(prosecutionCase)) .add(MATCHED_MASTER_DEFENDANT_ID, matchedMasterDefendantId.toString()) @@ -190,7 +190,7 @@ private JsonObjectBuilder buildRelatedCase(final ProsecutionCaseEntity prosecuti caseUrn = extractCaseUrn(prosecutionCase); } - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(CASE_ID, prosecutionCase.getId().toString()) .add(CASE_URN, caseUrn) .add(LINK_GROUP_ID, linkGroupId.toString()) diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryView.java index 5263989d4..b28071b83 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryView.java @@ -2,8 +2,8 @@ import static java.util.UUID.fromString; 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.justice.services.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.services.common.converter.ZonedDateTimes; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryView.java index 72909f45b..d64af6508 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryView.java @@ -3,8 +3,8 @@ import static java.util.Collections.emptyList; import static java.util.Objects.isNull; import static java.util.Optional.ofNullable; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.core.courts.CivilFees; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryView.java index 74cef845f..1461a7ff2 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryView.java @@ -6,7 +6,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import static org.apache.commons.lang3.StringUtils.isEmpty; import static org.apache.commons.lang3.StringUtils.isNoneBlank; @@ -83,7 +83,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -196,7 +196,7 @@ public class CourtDocumentQueryView { public JsonEnvelope getCourtDocument(final JsonEnvelope envelope) { final Optional id = JsonObjects.getUUID(envelope.payloadAsJsonObject(), ID_PARAMETER); CourtDocumentEntity courtDocumentEntity = null; - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); JsonEnvelope jsonEnvelope = envelopeFrom(envelope.metadata(), JsonValue.NULL); @@ -783,7 +783,7 @@ public JsonEnvelope getCaseNotifications(final JsonEnvelope envelope) { } private static JsonObject jsonFromString(final String jsonObjectStr) { - try (final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr))) { + try (final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr))) { return jsonReader.readObject(); } } @@ -826,13 +826,13 @@ private CourtDocument filterPermittedMaterial(final CourtDocument courtDocument, private JsonEnvelope createJsonEnvelope(final JsonEnvelope envelope, final Map> applicationNotificationMap) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); applicationNotificationMap.forEach((k, v) -> applicationNotificationMap.get(k).forEach( notificationStatusEntity -> prepareResponse(notificationStatusEntity, jsonArrayBuilder))); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add(NOTIFICATION_STATUS, jsonArrayBuilder.build()); @@ -842,7 +842,7 @@ private JsonEnvelope createJsonEnvelope(final JsonEnvelope envelope, private void prepareResponse(final NotificationStatusEntity notificationStatusEntity, final JsonArrayBuilder jsonArrayBuilder) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add(ID, notificationStatusEntity.getId().toString()) .add(NOTIFICATION_ID, @@ -901,7 +901,7 @@ private JsonObject getUserGroupsByUserId(final Action action) { final Metadata metadata = metadataFrom(action.envelope().metadata()) .withName("usersgroups.get-groups-by-user").build(); final JsonObject payload = - Json.createObjectBuilder().add("userId", userId.get()).build(); + JsonObjects.createObjectBuilder().add("userId", userId.get()).build(); final JsonEnvelope jsonEnvelope = envelopeFrom(metadata, payload); final Envelope response = diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryView.java index 780cc5c04..0fe45c6fb 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryView.java @@ -23,7 +23,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -46,8 +46,8 @@ public class CourtRegisterDocumentRequestQueryView { @Handles("progression.query.court-register-document-request") public JsonEnvelope getCourtRegisterRequests(final JsonEnvelope envelope) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final String requestStatus = envelope.payloadAsJsonObject().getString(FIELD_REQUEST_STATUS); if (isNotBlank(requestStatus)) { if(RegisterStatus.RECORDED.toString().equalsIgnoreCase(requestStatus)) { @@ -66,8 +66,8 @@ public JsonEnvelope getCourtRegisterRequests(final JsonEnvelope envelope) { @Handles("progression.query.court-register-document-by-material") public JsonEnvelope getCourtRegisterByMaterial(final JsonEnvelope envelope) { final UUID materialId = UUID.fromString(envelope.payloadAsJsonObject().getString(FIELD_MATERIAL_ID)); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final List courtRegisterRequestEntity = courtRegisterRequestRepository.findBySystemDocGeneratorId(materialId); courtRegisterRequestEntity.forEach(i -> jsonArrayBuilder.add(objectToJsonObjectConverter.convert(i))); return envelopeFrom(envelope.metadata(), @@ -77,8 +77,8 @@ public JsonEnvelope getCourtRegisterByMaterial(final JsonEnvelope envelope) { @Handles("progression.query.court-register-document-by-request-date") public JsonEnvelope getCourtRegistersByRequestDate(final JsonEnvelope envelope) { final JsonObject payload = envelope.payloadAsJsonObject(); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final Optional registerDate = JsonObjects.getString(payload, FIELD_REGISTER_DATE).map(LocalDate::parse); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtlistQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtlistQueryView.java index 76be3f78a..99d666b2f 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtlistQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/CourtlistQueryView.java @@ -12,8 +12,8 @@ import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; import static java.util.stream.Collectors.toSet; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.containsAny; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -66,7 +66,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -165,7 +165,7 @@ public JsonEnvelope searchCourtlist(final JsonEnvelope query) { } return envelopeFrom(query.metadata(), documentPayload); } - return envelopeFrom(query.metadata(), Json.createObjectBuilder().build()); + return envelopeFrom(query.metadata(), JsonObjects.createObjectBuilder().build()); } @Handles("progression.search.prison.court.list") @@ -521,7 +521,7 @@ private JsonArray buildApplicationOffences(final CourtApplication courtApplicati .flatMap(courtApplicationCase -> courtApplicationCase.getOffences().stream()) .filter(offence -> offencesForApplications.contains(offence.getId())) .forEach(offence -> { - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder(); buildOffence(offenceBuilder, offence, null); addApplicationInformation(offenceBuilder, courtApplication); addOffenceInformation(offenceBuilder, offence); @@ -532,7 +532,7 @@ private JsonArray buildApplicationOffences(final CourtApplication courtApplicati .map(CourtOrderOffence::getOffence) .filter(offence -> offencesForApplications.contains(offence.getId())) .forEach(offence -> { - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder(); buildOffence(offenceBuilder, offence, null); addApplicationInformation(offenceBuilder, courtApplication); addOffenceInformation(offenceBuilder, offence); @@ -544,7 +544,7 @@ private JsonArray buildApplicationOffences(final CourtApplication courtApplicati private JsonObject buildDefendantFromCourtApplication(JsonObject hearingFromListing, final CourtApplication courtApplication, final Hearing hearing, final List offencesForApplications) { - final JsonObjectBuilder defendantBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder defendantBuilder = JsonObjects.createObjectBuilder(); final JsonArrayBuilder offencesArray = createArrayBuilder(); final List caseIdList = new ArrayList<>(); @@ -560,7 +560,7 @@ private JsonObject buildDefendantFromCourtApplication(JsonObject hearingFromList .flatMap(courtApplicationCase -> courtApplicationCase.getOffences().stream()) .filter(offence -> offencesForApplications.contains(offence.getId())) .forEach(offence -> { - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder(); buildOffence(offenceBuilder, offence, null); addApplicationInformation(offenceBuilder, courtApplication); offencesArray.add(offenceBuilder.build()); @@ -575,7 +575,7 @@ private JsonObject buildDefendantFromCourtApplication(JsonObject hearingFromList .map(CourtOrderOffence::getOffence) .filter(offence -> offencesForApplications.contains(offence.getId())) .forEach(offence -> { - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder(); buildOffence(offenceBuilder, offence, null); addApplicationInformation(offenceBuilder, courtApplication); offencesArray.add(offenceBuilder.build()); @@ -586,7 +586,7 @@ private JsonObject buildDefendantFromCourtApplication(JsonObject hearingFromList if (nonNull(masterDefendant) && nonNull(masterDefendant.getPersonDefendant())) { final Person person = masterDefendant.getPersonDefendant().getPersonDetails(); - final JsonObjectBuilder defendantFromListingBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder defendantFromListingBuilder = JsonObjects.createObjectBuilder(); if (isNotEmpty(hearingFromListing.getJsonArray(DEFENDANTS))) { hearingFromListing.getJsonArray(DEFENDANTS) .stream() @@ -666,7 +666,7 @@ private JsonObject enrichDefendant(final JsonObject defendantFromListing, final defendant.getOffences() .forEach(offence -> { if (offence.getId().equals(offenceId)) { - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder(); if (nonNull(offencesFromHearing)) { offencesFromHearing.forEach(offence1 -> { @@ -815,7 +815,7 @@ private JsonArray buildDefenceCounsels(final List defenceCounsel } private JsonObject buildCounsel(final String firstName, final String middleName, final String lastName) { - final JsonObjectBuilder counsel = Json.createObjectBuilder(); + final JsonObjectBuilder counsel = JsonObjects.createObjectBuilder(); ofNullable(firstName).ifPresent(fn -> counsel.add(FIRST_NAME, fn)); ofNullable(middleName).ifPresent(mn -> counsel.add(MIDDLE_NAME, mn)); ofNullable(lastName).ifPresent(ln -> counsel.add(LAST_NAME, ln)); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantByLAAContractNumberQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantByLAAContractNumberQueryView.java index e88538140..e4759ad1c 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantByLAAContractNumberQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantByLAAContractNumberQueryView.java @@ -8,7 +8,7 @@ import uk.gov.moj.cpp.prosecutioncase.persistence.repository.DefendantLAAAssociationRepository; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -28,7 +28,7 @@ public JsonEnvelope getDefendantsByLAAContractNumber(final JsonEnvelope envelope final JsonObject payload = envelope.payloadAsJsonObject(); final String laaContractNumber = payload.getString("laaContractNumber"); final List defenceLAAAssociations = defendantLAAAssociationRepository.findByLAAContractNUmber(laaContractNumber); - final JsonObject responsePayload = Json.createObjectBuilder() + final JsonObject responsePayload = JsonObjects.createObjectBuilder() .add("defendants",convertProsecutionCaseEntityToDefendantsList(defenceLAAAssociations)) .build(); return JsonEnvelope.envelopeFrom( @@ -41,7 +41,7 @@ private JsonArray convertProsecutionCaseEntityToDefendantsList(final List defendantLAAKey.getDefendantId().toString()) .collect(toList()); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); defendantIdList.stream().forEach(jsonArrayBuilder :: add); return jsonArrayBuilder.build(); } diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryView.java index 2fcd27fdd..26307aa35 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryView.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -57,7 +57,7 @@ public JsonEnvelope getDefendantPartialMatches(JsonEnvelope jsonEnvelope) { final long count = defendantPartialMatchRepository.count(); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add("totalMatchedDefendants", count); if (isPageGreaterThanMaximumPage(page, pageSize, count)) { diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/FormQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/FormQueryView.java index 0e94221fb..b322c73f7 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/FormQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/FormQueryView.java @@ -3,8 +3,8 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; 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.justice.services.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.core.courts.FormType; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/HearingQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/HearingQueryView.java index 587e69ab9..17338ab91 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/HearingQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/HearingQueryView.java @@ -20,7 +20,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -45,7 +45,7 @@ public class HearingQueryView { @Handles("progression.query.hearing") public JsonEnvelope getHearing(final JsonEnvelope envelope) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); final Optional hearingId = JsonObjects.getUUID(envelope.payloadAsJsonObject(), ID); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryView.java index a4e24a95f..d4182d1d3 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryView.java @@ -3,8 +3,8 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonObjects.getUUID; import uk.gov.justice.core.courts.CourtApplication; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryView.java index 925456b47..05b76cdcf 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryView.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -56,10 +56,10 @@ public JsonEnvelope findMaterialIdMappingsInBulk(final JsonEnvelope envelope) { private JsonObject createResponsePayload(final List mappings) { - final JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder arrayBuilder = JsonObjects.createArrayBuilder(); mappings.forEach(mapping -> { - final JsonObjectBuilder materialBuilder = Json.createObjectBuilder() + final JsonObjectBuilder materialBuilder = JsonObjects.createObjectBuilder() .add("materialId", mapping.getMaterialId().toString()); if (mapping.getCourtDocumentId() != null) { @@ -83,6 +83,6 @@ private JsonObject createResponsePayload(final List mappings) arrayBuilder.add(materialBuilder); }); - return Json.createObjectBuilder().add("materialIds", arrayBuilder).build(); + return JsonObjects.createObjectBuilder().add("materialIds", arrayBuilder).build(); } } \ No newline at end of file diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryView.java index dd186c8ea..1863a4b9f 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryView.java @@ -16,7 +16,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObjectBuilder; @@ -36,14 +36,14 @@ public class NowDocumentRequestQueryView { @Handles(NOW_DOCUMENT_REQUESTS_BY_REQUEST_ID_QUERY) public JsonEnvelope getNowDocumentRequestsByRequestId(final JsonEnvelope envelope) { final Optional requestId = JsonObjects.getUUID(envelope.payloadAsJsonObject(), REQUEST_ID_PARAM); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); if (requestId.isPresent()) { final List nowDocumentRequests = nowDocumentRequestRepository.findByRequestId(requestId.get()); nowDocumentRequests.forEach(nowDocumentRequestEntity -> jsonArrayBuilder.add( - Json.createObjectBuilder() + JsonObjects.createObjectBuilder() .add(MATERIAL_ID_PARAM, nowDocumentRequestEntity.getMaterialId().toString()) .add(REQUEST_ID_PARAM, nowDocumentRequestEntity.getRequestId().toString()) .add(HEARING_ID_PARAM, nowDocumentRequestEntity.getHearingId().toString()) @@ -59,13 +59,13 @@ public JsonEnvelope getNowDocumentRequestsByRequestId(final JsonEnvelope envelop @Handles(NOW_DOCUMENT_REQUEST_BY_HEARING_QUERY) public JsonEnvelope getNowDocumentRequestByHearing(final JsonEnvelope envelope) { final Optional hearingId = JsonObjects.getUUID(envelope.payloadAsJsonObject(), HEARING_ID_PARAM); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); if (hearingId.isPresent()) { final List nowDocumentRequests = nowDocumentRequestRepository.findByHearingId(hearingId.get()); nowDocumentRequests.forEach(nowDocumentRequestEntity -> { final UUID requestId = nowDocumentRequestEntity.getRequestId(); - final JsonObjectBuilder builder = Json.createObjectBuilder() + final JsonObjectBuilder builder = JsonObjects.createObjectBuilder() .add(MATERIAL_ID_PARAM, nowDocumentRequestEntity.getMaterialId().toString()) .add(HEARING_ID_PARAM, nowDocumentRequestEntity.getHearingId().toString()) .add(PAYLOAD_PARAM, nowDocumentRequestEntity.getPayload()); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/OpaNoticeQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/OpaNoticeQueryView.java index 979f50213..c7f99de3d 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/OpaNoticeQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/OpaNoticeQueryView.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query; -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.justice.core.courts.OpaNotice; import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PetQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PetQueryView.java index 3db5ff3c3..2d46c5861 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PetQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PetQueryView.java @@ -2,8 +2,8 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import org.apache.commons.lang3.tuple.Pair; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryView.java index 90c49abf2..172e5dbfb 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryView.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObjectBuilder; @@ -32,8 +32,8 @@ public class PrisonCourtRegisterDocumentRequestQueryView { @Handles("progression.query.prison-court-register-document-by-court-centre") public JsonEnvelope getPrisonCourtRegistersByCourtCentre(final JsonEnvelope envelope) { final UUID courtCentreId = UUID.fromString(envelope.payloadAsJsonObject().getString(FIELD_COURT_CENTRE_ID)); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final List prisonCourtRegisterEntities = prisonCourtRegisterRepository.findByCourtCentreId(courtCentreId); prisonCourtRegisterEntities.forEach(i -> jsonArrayBuilder.add(objectToJsonObjectConverter.convert(i))); return envelopeFrom(envelope.metadata(), diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ProsecutionCaseQuery.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ProsecutionCaseQuery.java index 4d16210a4..ae60d391f 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ProsecutionCaseQuery.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/ProsecutionCaseQuery.java @@ -5,8 +5,8 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toCollection; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static uk.gov.justice.services.messaging.JsonObjects.getUUID; import static uk.gov.moj.cpp.progression.domain.helper.JsonHelper.addProperty; @@ -86,7 +86,7 @@ import java.util.stream.Stream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -245,7 +245,7 @@ public JsonEnvelope getGroupMemberCases(final JsonEnvelope envelope) { } private JsonArrayBuilder getMemberProsecutionCases(final List prosecutionCaseEntities) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final List jsonObjectList = prosecutionCaseEntities.stream() .map(o -> jsonObjectToObjectConverter.convert(stringToJsonObjectConverter.convert(o.getPayload()), ProsecutionCase.class)) .filter(p -> (p.getIsGroupMember() && !p.getIsGroupMaster())) @@ -281,7 +281,7 @@ public JsonEnvelope getProsecutionCase(final JsonEnvelope envelope) { JsonArray civilFeesArray = null; if (!civilFeesList.isEmpty()) { - final JsonArrayBuilder jsonProsecutionBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonProsecutionBuilder = JsonObjects.createArrayBuilder(); civilFeesList.forEach(civilFee -> buildCivilFeesList(civilFee, jsonProsecutionBuilder)); civilFeesArray = jsonProsecutionBuilder.build(); } @@ -323,7 +323,7 @@ public JsonEnvelope getProsecutionCase(final JsonEnvelope envelope) { final String statusOfPrimaryCase = prosecutionCaseWithFees.getString(CASE_STATUS); final boolean isAllRelatedCases = envelope.payloadAsJsonObject().getBoolean("isAllRelatedCases", false); - final JsonArrayBuilder relatedCasesArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder relatedCasesArrayBuilder = JsonObjects.createArrayBuilder(); matchedCasesGroupedByMasterDefendantId.forEach((masterDefendantId, cases) -> buildRelatedCasesForDefendant(masterDefendantId, cases, relatedCasesArrayBuilder, statusOfPrimaryCase, isAllRelatedCases)); final JsonArray relatedCases = relatedCasesArrayBuilder.build(); if (isNotEmpty(relatedCases)) { @@ -441,7 +441,7 @@ public JsonEnvelope getProsecutionCaseForCaseAtAGlance(final JsonEnvelope envelo jsonObjectBuilder.add("defendants", resultTextFlagBuilder.rebuildWithResultTextFlag(caseDefendantsJsonArray)); if (!courtApplicationCaseEntities.isEmpty()) { - final JsonArrayBuilder jsonApplicationBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonApplicationBuilder = JsonObjects.createArrayBuilder(); courtApplicationCaseEntities .stream().filter(courtApplicationCaseEntity -> courtApplicationCaseEntity.getCourtApplication().getParentApplicationId() == null) .forEach(courtApplicationCaseEntity -> buildApplicationSummary(courtApplicationCaseEntity.getCourtApplication().getPayload(), jsonApplicationBuilder)); @@ -621,7 +621,7 @@ public JsonEnvelope searchByMaterialId(final JsonEnvelope envelope) { LOGGER.debug("Searching for allowed user groups with materialId='{}'", FIELD_QUERY); final JsonObjectBuilder json = createObjectBuilder(); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); final CourtDocumentMaterialEntity courtDocumentMaterialEntity = courtDocumentMaterialRepository.findBy(UUID .fromString(envelope.payloadAsJsonObject().getString(FIELD_QUERY))); if (courtDocumentMaterialEntity != null) { @@ -642,7 +642,7 @@ public JsonEnvelope searchCase(final JsonEnvelope envelope) { if (StringUtils.isNotBlank(searchCriteria)) { final List cases = searchCaseRepository.findBySearchCriteria(prepareSearch (searchCriteria.toLowerCase())); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); cases.forEach(caseEntity -> jsonArrayBuilder.add(stringToJsonObjectConverter.convert(SearchCaseBuilder.searchCaseBuilder() .withSearchCaseEntity(caseEntity) @@ -662,7 +662,7 @@ public JsonEnvelope searchCaseByCaseUrn(final JsonEnvelope envelope) { final JsonObjectBuilder jsonObjectBuilder = createObjectBuilder(); if (envelope.payloadAsJsonObject().containsKey(FIELD_CASE_URN) && StringUtils.isNotBlank(envelope.payloadAsJsonObject().getString(FIELD_CASE_URN))) { final List cases = searchCaseRepository.findByCaseUrn(envelope.payloadAsJsonObject().getString(FIELD_CASE_URN).toUpperCase()); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); cases.forEach(caseEntity -> jsonArrayBuilder.add(stringToJsonObjectConverter.convert(SearchCaseBuilder.searchCaseBuilder() .withSearchCaseEntity(caseEntity) @@ -787,7 +787,7 @@ private GetHearingsAtAGlance getHearingsAtAGlance(final JsonObjectBuilder jsonOb final GetHearingsAtAGlance hearingsAtAGlance = hearingAtAGlanceService.getHearingAtAGlance(caseId.get()); final List courtApplicationCaseEntities = courtApplicationCaseRepository.findByCaseId(caseId.get()); if (isNotEmpty(courtApplicationCaseEntities)) { - final JsonArrayBuilder jsonApplicationBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonApplicationBuilder = JsonObjects.createArrayBuilder(); courtApplicationCaseEntities.forEach(courtApplicationCaseEntity -> buildApplicationSummary(courtApplicationCaseEntity.getCourtApplication().getPayload(), jsonApplicationBuilder)); jsonObjectBuilder.add(LINKED_APPLICATIONS_SUMMARY, jsonApplicationBuilder.build()); addCourtApplication(hearingsAtAGlance, courtApplicationCaseEntities); @@ -816,7 +816,7 @@ private void buildApplicationSummary(final String applicationPayload, final Json public JsonEnvelope getActiveApplicationsOnCase(final JsonEnvelope envelope) { final UUID prosecutionCaseId = getProsecutionCaseId(envelope); - final JsonArrayBuilder jsonApplicationBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonApplicationBuilder = JsonObjects.createArrayBuilder(); final List courtApplicationCaseEntities = courtApplicationCaseRepository.findByCaseId(prosecutionCaseId); if (!courtApplicationCaseEntities.isEmpty()) { @@ -832,7 +832,7 @@ public JsonEnvelope getActiveApplicationsOnCase(final JsonEnvelope envelope) { .filter(entity -> nonNull(entity.getHearing()) && !HearingListingStatus.HEARING_RESULTED.equals(entity.getHearing().getListingStatus())) .forEach(entity -> hearingArrayBuilder.add(entity.getHearing().getHearingId().toString())); } - jsonApplicationBuilder.add(Json.createObjectBuilder() + jsonApplicationBuilder.add(JsonObjects.createObjectBuilder() .add("applicationId", courtApplication.getId().toString()) .add("hearingIds", hearingArrayBuilder.build()).build()); } @@ -874,8 +874,8 @@ private UUID getApplicantId(final CourtApplication courtApplication) { } private void buildRelatedCasesForDefendant(final UUID masterDefendantId, final List matchDefendantCaseHearingEntityList, final JsonArrayBuilder relatedCasesArrayBuilder, final String statusOfPrimaryCase, final boolean isAllRelatedCases) { - final JsonObjectBuilder relatedCaseObjectBuilder = Json.createObjectBuilder(); - final JsonArrayBuilder casesArrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder relatedCaseObjectBuilder = JsonObjects.createObjectBuilder(); + final JsonArrayBuilder casesArrayBuilder = JsonObjects.createArrayBuilder(); final List uniqueMatchDefendantCaseHearingEntityList = matchDefendantCaseHearingEntityList.stream() .collect(collectingAndThen(toCollection(() -> new TreeSet<>(Comparator.comparing(MatchDefendantCaseHearingEntity::getProsecutionCaseId))), ArrayList::new)); @@ -899,7 +899,7 @@ private void buildCases(final MatchDefendantCaseHearingEntity matchDefendantCase return; } - final JsonArrayBuilder offencesArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder offencesArrayBuilder = JsonObjects.createArrayBuilder(); prosecutionCase.getDefendants().stream() .filter(defendant -> defendant.getMasterDefendantId().equals(matchDefendantCaseHearingEntity.getMasterDefendantId())) .flatMap(defendant -> defendant.getOffences().stream()) @@ -910,12 +910,12 @@ private void buildCases(final MatchDefendantCaseHearingEntity matchDefendantCase final JsonArray offences = offencesArrayBuilder.build(); if (isNotEmpty(offences)) { - final JsonObjectBuilder caseObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder caseObjectBuilder = JsonObjects.createObjectBuilder(); caseObjectBuilder.add(CASE_ID, prosecutionCase.getId().toString()); caseObjectBuilder.add(CASE_STATUS, prosecutionCaseStatus); if (nonNull(prosecutionCase.getProsecutionCaseIdentifier())) { final ProsecutionCaseIdentifier prosecutionCaseIdentifier = prosecutionCase.getProsecutionCaseIdentifier(); - final JsonObjectBuilder pciJsonBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder pciJsonBuilder = JsonObjects.createObjectBuilder(); pciJsonBuilder.add(PROSECUTION_AUTHORITY_ID, prosecutionCaseIdentifier.getProsecutionAuthorityId().toString()); pciJsonBuilder.add("prosecutionAuthorityCode", prosecutionCaseIdentifier.getProsecutionAuthorityCode()); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryView.java index 9a6776891..3f5fe3cca 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryView.java @@ -42,7 +42,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -159,7 +159,7 @@ public JsonEnvelope getApplicationSharedCourtDocumentsLinks(final JsonEnvelope e return JsonEnvelope.envelopeFrom( envelope.metadata(), - Json.createObjectBuilder().add("sharedCourtDocumentsLinksForApplication", sharedCourtDocumentsLinksForApplicationListToJsonArrayConverter.convert(sharedCourtDocumentsLinks)).build()); + JsonObjects.createObjectBuilder().add("sharedCourtDocumentsLinksForApplication", sharedCourtDocumentsLinksForApplicationListToJsonArrayConverter.convert(sharedCourtDocumentsLinks)).build()); } diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ApplicationHearingQueryHelper.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ApplicationHearingQueryHelper.java index 31b934576..90807bed3 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ApplicationHearingQueryHelper.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ApplicationHearingQueryHelper.java @@ -3,8 +3,8 @@ import static java.util.Comparator.comparing; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.moj.cpp.progression.query.utils.CaseHearingsQueryHelper.addHearing; import uk.gov.justice.core.courts.CourtApplication; @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Objects; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -61,7 +61,7 @@ public static JsonArray getApplicationHearingsJson(final Map hearings.stream().filter(h -> isNull(h.getIsBoxHearing()) || !h.getIsBoxHearing()) .forEach(hearing -> { - final JsonObjectBuilder applicationHearingsJsonBuilder = Json.createObjectBuilder() + final JsonObjectBuilder applicationHearingsJsonBuilder = JsonObjects.createObjectBuilder() .add(ID, courtApplication.getId().toString()) .add(TITLE, courtApplication.getType().getType()); addHearing(applicationHearingsJsonBuilder, hearing); @@ -85,7 +85,7 @@ public static JsonArray getApplicationHearingsJson(final Map defen } private JsonArrayBuilder convertDefendants(final List defendants, final Hearing hearing, final Optional matchedMasterDefendantId) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); for (final Defendant defendant : defendants) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder() .add(ID, defendant.getId().toString()) .add(MASTER_DEFENDANT_ID, defendant.getMasterDefendantId().toString()); @@ -107,17 +107,17 @@ private JsonObjectBuilder convertHearing(final Hearing hearing) { return null; } - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add(HEARING_ID, hearing.getId().toString()) .add(HEARING_TYPE, hearing.getType().getDescription()) .add(HEARING_DAY, nextHearingDate.get().getSittingDay().format(DateTimeFormatter.ISO_INSTANT)); } private JsonArrayBuilder convertOffences(List offences) { - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); for (final Offence offence : offences) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder() + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder() .add(OFFENCE_TITLE, offence.getOffenceTitle()); jsonArrayBuilder.add(jsonObjectBuilder); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ResultTextFlagBuilder.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ResultTextFlagBuilder.java index d1019033d..2ffed4303 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ResultTextFlagBuilder.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/ResultTextFlagBuilder.java @@ -8,7 +8,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -22,7 +22,7 @@ public class ResultTextFlagBuilder { public JsonArray rebuildWithResultTextFlag(final JsonArray payload){ - final JsonArrayBuilder response = Json.createArrayBuilder(); + final JsonArrayBuilder response = JsonObjects.createArrayBuilder(); payload.stream().map(JsonObject.class::cast).map(this::rebuildObject).forEach(response::add); return response.build(); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/StringToJsonArray.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/StringToJsonArray.java index 59bf099d7..235f0dd0e 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/StringToJsonArray.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/utils/StringToJsonArray.java @@ -4,7 +4,7 @@ import java.io.StringReader; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonReader; @@ -15,10 +15,10 @@ public class StringToJsonArray implements Converter { public JsonArray convert(final String source) { if (Strings.isNullOrEmpty(source)) { - return Json.createArrayBuilder().build(); + return JsonObjects.createArrayBuilder().build(); } JsonArray jsonArray; - try (JsonReader reader = Json.createReader(new StringReader(source))) { + try (JsonReader reader = JsonObjects.createReader(new StringReader(source))) { jsonArray = reader.readArray(); } return jsonArray; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/RelatedReferenceQueryView.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/RelatedReferenceQueryView.java index 07bdd68e5..ae2abbc06 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/RelatedReferenceQueryView.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/RelatedReferenceQueryView.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArrayBuilder; import javax.json.JsonObjectBuilder; @@ -35,8 +35,8 @@ public JsonEnvelope getProsecutionCaseWithRelatedUrn(final JsonEnvelope envelope } private JsonObjectBuilder getRelatedReferences(final UUID caseId) { - final JsonObjectBuilder responseBuilder = Json.createObjectBuilder(); - final JsonArrayBuilder jsonArrayBuilder = Json.createArrayBuilder(); + final JsonObjectBuilder responseBuilder = JsonObjects.createObjectBuilder(); + final JsonArrayBuilder jsonArrayBuilder = JsonObjects.createArrayBuilder(); relatedReferenceRepository .findByProsecutionCaseId(caseId) .stream() diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/UserDetailsLoader.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/UserDetailsLoader.java index 20db06ff3..959e9785a 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/UserDetailsLoader.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/UserDetailsLoader.java @@ -2,7 +2,7 @@ import static java.util.Objects.nonNull; import static java.util.UUID.fromString; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; @@ -23,7 +23,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonValue; @@ -53,7 +53,7 @@ public class UserDetailsLoader { private Requester requester; public boolean isUserHasPermissionForApplicationTypeCode(final Metadata metadata, final String applicationTypeCode) { - final JsonObject getOrganisationForUserRequest = Json.createObjectBuilder() + final JsonObject getOrganisationForUserRequest = JsonObjects.createObjectBuilder() .add(ACTION, ACCESS_TO_STANDALONE_APPLICATION) .add(OBJECT, applicationTypeCode) .build(); @@ -108,7 +108,7 @@ public List getGroupsUserBelongsTo(final Requester requester, } public List getPermissions(final Metadata metadata, final Requester requester, final UUID defendantId) { - final JsonObject getOrganisationForUserRequest = Json.createObjectBuilder().add(ACTION, "View").add(OBJECT, "DefendantDocuments").add(TARGET, defendantId.toString()).build(); + final JsonObject getOrganisationForUserRequest = JsonObjects.createObjectBuilder().add(ACTION, "View").add(OBJECT, "DefendantDocuments").add(TARGET, defendantId.toString()).build(); final MetadataBuilder metadataWithActionName = metadataFrom(metadata).withName("usersgroups.permissions"); final JsonEnvelope requestEnvelope = envelopeFrom(metadataWithActionName, getOrganisationForUserRequest); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/CotrQueryService.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/CotrQueryService.java index 48cc5d2b8..f48a39740 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/CotrQueryService.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/CotrQueryService.java @@ -39,7 +39,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -152,7 +152,7 @@ public JsonObject getCotrFormForAProsecutionCaseAndCotr(final UUID prosecutionCa .collect(Collectors.toList()); final ProsecutionCaseEntity prosecutionCaseEntity = prosecutionCaseRepository.findByCaseId(prosecutionCaseId); final ProsecutionCase prosecutionCase = jsonObjectToObjectConverter.convert(stringToJsonObjectConverter.convert(prosecutionCaseEntity.getPayload()), ProsecutionCase.class); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); final JsonObject prosecutionFormData = Strings.isNullOrEmpty(cotrDetailsEntity.getProsecutionFormData()) ? null : stringToJsonObjectConverter.convert(cotrDetailsEntity.getProsecutionFormData()); addAttribute(jsonObjectBuilder, "id", cotrDetailsEntity.getId().toString()); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryService.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryService.java index a17e6df41..156427dd6 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryService.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryService.java @@ -3,7 +3,7 @@ import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/HearingService.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/HearingService.java index dabe6d3ad..f3e07b889 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/HearingService.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/HearingService.java @@ -2,7 +2,7 @@ import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/OrganisationService.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/OrganisationService.java index da71c726c..298fd2011 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/OrganisationService.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/OrganisationService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.progression.query.view.service; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataService.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataService.java index 83cdcd718..1239ebc5c 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataService.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataService.java @@ -17,7 +17,7 @@ import static java.util.Objects.isNull; import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.QUERY_VIEW; import static uk.gov.justice.services.messaging.Envelope.metadataBuilder; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/UserService.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/UserService.java index d9fea261d..cb2e56b66 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/UserService.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/UserService.java @@ -17,7 +17,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonValue; @@ -54,7 +54,7 @@ private Optional getUserGroupsByUserId(final Action action) { final Metadata metadata = metadataFrom(action.envelope().metadata()) .withName("usersgroups.get-groups-by-user").build(); final JsonObject payload = - Json.createObjectBuilder().add("userId", userId.get()).build(); + JsonObjects.createObjectBuilder().add("userId", userId.get()).build(); final JsonEnvelope jsonEnvelope = envelopeFrom(metadata, payload); final Envelope response = diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/AssigneeTransformer.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/AssigneeTransformer.java index 4a35111ba..8f7bd5b96 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/AssigneeTransformer.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/AssigneeTransformer.java @@ -5,7 +5,7 @@ import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import java.util.HashMap; @@ -42,7 +42,7 @@ public Map transform(final JsonObject payload) { final JsonObject assigneeForm = jsonObject.getJsonObject(DATA); if (nonNull(assigneeForm.getJsonArray(ASSIGNEES))) { - final JsonArray cpsAssignees = ofNullable(assigneeForm.getJsonArray(ASSIGNEES)).orElse(Json.createArrayBuilder().build()); + final JsonArray cpsAssignees = ofNullable(assigneeForm.getJsonArray(ASSIGNEES)).orElse(JsonObjects.createArrayBuilder().build()); LOGGER.info("cpsAssignees >> {}", cpsAssignees); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPetTransformer.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPetTransformer.java index 760760631..b1e271e0a 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPetTransformer.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPetTransformer.java @@ -3,7 +3,7 @@ import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import java.util.HashMap; @@ -30,7 +30,7 @@ public Map transform(final JsonObject payload) { final JsonObject jsonObject = stringToJsonObjectConverter.convert(payload.getString("data")); final JsonObject petForm = jsonObject.getJsonObject("data"); if (nonNull(petForm.getJsonObject(PROSECUTION))) { - final JsonArray prosecutionWitnesses = ofNullable(petForm.getJsonObject(PROSECUTION).getJsonArray(WITNESSES)).orElse(Json.createArrayBuilder().build()); + final JsonArray prosecutionWitnesses = ofNullable(petForm.getJsonObject(PROSECUTION).getJsonArray(WITNESSES)).orElse(JsonObjects.createArrayBuilder().build()); IntStream.range(0, prosecutionWitnesses.size()).mapToObj(prosecutionWitnesses::getJsonObject).forEach(prosecutionWitnesse -> mapWitness(witnesses, prosecutionWitnesse) ); @@ -39,7 +39,7 @@ public Map transform(final JsonObject payload) { final JsonArray defendants = petForm.getJsonObject(DEFENCE).getJsonArray(DEFENDANTS); IntStream.range(0, defendants.size()).mapToObj(defendants::getJsonObject).forEach(defendant -> { - final JsonArray prosecutionWitnesses = ofNullable(defendant.getJsonArray(WITNESSES)).orElse(Json.createArrayBuilder().build()); + final JsonArray prosecutionWitnesses = ofNullable(defendant.getJsonArray(WITNESSES)).orElse(JsonObjects.createArrayBuilder().build()); IntStream.range(0, prosecutionWitnesses.size()).mapToObj(prosecutionWitnesses::getJsonObject).forEach(prosecutionWitnesse -> mapWitness(witnesses, prosecutionWitnesse) ); diff --git a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPtphTransformer.java b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPtphTransformer.java index fd16b7075..56e687869 100644 --- a/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPtphTransformer.java +++ b/progression-query/progression-query-view/src/main/java/uk/gov/moj/cpp/progression/query/view/service/transformer/WitnessPtphTransformer.java @@ -6,7 +6,7 @@ import uk.gov.justice.services.common.converter.StringToJsonObjectConverter; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import java.util.HashMap; @@ -43,7 +43,7 @@ public Map transform(final JsonObject payload) { final JsonObject petForm = jsonObject.getJsonObject(DATA); if (nonNull(petForm.getJsonArray(WITNESSES))) { - final JsonArray cpsParticipantsWitnesses = ofNullable(petForm.getJsonArray(WITNESSES)).orElse(Json.createArrayBuilder().build()); + final JsonArray cpsParticipantsWitnesses = ofNullable(petForm.getJsonArray(WITNESSES)).orElse(JsonObjects.createArrayBuilder().build()); LOGGER.info("cpsParticipantsWitnesses >> {}", cpsParticipantsWitnesses); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryViewTest.java index f1981713a..3950a20e9 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationHearingQueryViewTest.java @@ -3,7 +3,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryViewTest.java index 31d58aa67..2c3192564 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationNotesQueryViewTest.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; @@ -82,7 +82,7 @@ public void shouldFindByApplicationIdOrderByCreatedDateTimeDesc() { final JsonEnvelope envelope = applicationNotesQueryView.getApplicationNotes( JsonEnvelope.envelopeFrom(JsonEnvelope.metadataBuilder().withId(randomUUID()) .withName(PROGRESSION_QUERY_APPLICATION_NOTES).build(), - Json.createObjectBuilder().add(APPLICATION_ID, VALUE_APPLICATION_ID.toString()).build())); + JsonObjects.createObjectBuilder().add(APPLICATION_ID, VALUE_APPLICATION_ID.toString()).build())); //Then verifyResponseList(envelope); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationQueryViewTest.java index 6eda99439..e3f520188 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/ApplicationQueryViewTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; @@ -99,10 +99,10 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; + import javax.persistence.NoResultException; import org.junit.jupiter.api.BeforeEach; @@ -117,8 +117,7 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import uk.gov.moj.cpp.systemidmapper.client.SystemIdMapperClient; -import uk.gov.moj.cpp.systemidmapper.client.SystemIdMapping; + @ExtendWith(MockitoExtension.class) @@ -447,15 +446,15 @@ public void shouldGetApplicationAtAGlance() { when(applicationAtAGlanceHelper.getApplicantDetails(any(CourtApplication.class), any(JsonEnvelope.class), eq(false))).thenReturn(mock(ApplicantDetails.class)); final JsonObject mockApplicantDetailsJson = mock(JsonObject.class); - final JsonObject linkedCaseJson = Json.createObjectBuilder() - .add("offences", Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("orderIndex", 2).build()) + final JsonObject linkedCaseJson = JsonObjects.createObjectBuilder() + .add("offences", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("orderIndex", 2).build()) .build()) .build(); when(objectToJsonObjectConverter.convert(any())) .thenReturn(mockApplicationDetailsJson) // applicationDetails .thenReturn(linkedCaseJson) // linked case (inside getLinkedCases) - .thenReturn(Json.createObjectBuilder().build()) // laaApplnReference + .thenReturn(JsonObjects.createObjectBuilder().build()) // laaApplnReference .thenReturn(mockApplicantDetailsJson); // applicantDetails (and child summary) final ProsecutionCase prosecutionCaseMock = mock(ProsecutionCase.class); @@ -528,7 +527,7 @@ void shouldGetApplicationAtAGlanceHideAddressForDefenceQueryAndDefendant() { when(objectToJsonObjectConverter.convert(any())) .thenReturn(mockApplicationDetailsJson) - .thenReturn(Json.createObjectBuilder().add("prosecutionCaseId", prosecutionCaseId.toString()).build()) + .thenReturn(JsonObjects.createObjectBuilder().add("prosecutionCaseId", prosecutionCaseId.toString()).build()) .thenReturn(mockApplicantDetailsJson); final ProsecutionCase prosecutionCaseMock = mock(ProsecutionCase.class); @@ -600,7 +599,7 @@ void shouldGetApplicationAtAGlanceNotHideAddressForDefenceQueryAndProsecutor() { when(objectToJsonObjectConverter.convert(any())) .thenReturn(mockApplicationDetailsJson) - .thenReturn(Json.createObjectBuilder().add("prosecutionCaseId", prosecutionCaseId.toString()).build()) + .thenReturn(JsonObjects.createObjectBuilder().add("prosecutionCaseId", prosecutionCaseId.toString()).build()) .thenReturn(mockApplicantDetailsJson); final ProsecutionCase prosecutionCaseMock = mock(ProsecutionCase.class); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQueryTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQueryTest.java index 8f5ec2a82..19db0cc5b 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQueryTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseLsmInfoQueryTest.java @@ -37,7 +37,7 @@ import java.util.Objects; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -86,7 +86,7 @@ public class CaseLsmInfoQueryTest { @BeforeEach public void setUp() { - JsonObject payload = Json.createObjectBuilder() + JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); @@ -115,7 +115,7 @@ public void shouldReturnMatchedCases() { .thenReturn(new ArrayList<>()); when(caseLsmInfoConverter.convertMatchedCaseDefendants(any(),any(),any())) - .thenReturn(Json.createArrayBuilder()); + .thenReturn(JsonObjects.createArrayBuilder()); JsonEnvelope responseEnvelope = caseLsmInfoQuery.getCaseLsmInfo(envelope); JsonObject responsePayload = responseEnvelope.payloadAsJsonObject(); @@ -169,7 +169,7 @@ public void shouldReturnLinkedCases() { .thenReturn(Arrays.asList(createCaseDefendantHearingEntity())); when(caseLsmInfoConverter.convertRelatedCaseDefendants(any(),any())) - .thenReturn(Json.createArrayBuilder()); + .thenReturn(JsonObjects.createArrayBuilder()); JsonEnvelope responseEnvelope = caseLsmInfoQuery.getCaseLsmInfo(envelope); JsonObject responsePayload = responseEnvelope.payloadAsJsonObject(); @@ -197,7 +197,7 @@ public void shouldReturnMergedCases() { when(caseDefendantHearingRepository.findByCaseId(any())) .thenReturn(Arrays.asList(createCaseDefendantHearingEntity())); - when(caseLsmInfoConverter.convertRelatedCaseDefendants(any(),any())).thenReturn(Json.createArrayBuilder()); + when(caseLsmInfoConverter.convertRelatedCaseDefendants(any(),any())).thenReturn(JsonObjects.createArrayBuilder()); JsonEnvelope responseEnvelope = caseLsmInfoQuery.getCaseLsmInfo(envelope); JsonObject responsePayload = responseEnvelope.payloadAsJsonObject(); @@ -233,7 +233,7 @@ public void shouldReturnCasesWithoutDuplicatesEvenWhenOneHearingIsNull() { .thenReturn(new ArrayList<>()); when(caseLsmInfoConverter.convertMatchedCaseDefendants(any(),any(),any())) - .thenReturn(Json.createArrayBuilder()); + .thenReturn(JsonObjects.createArrayBuilder()); JsonEnvelope responseEnvelope = caseLsmInfoQuery.getCaseLsmInfo(envelope); JsonObject responsePayload = responseEnvelope.payloadAsJsonObject(); @@ -261,7 +261,7 @@ public void shouldReturnCasesWithoutDuplicatesWithUniqueHearingIds() { .thenReturn(new ArrayList<>()); when(caseLsmInfoConverter.convertMatchedCaseDefendants(any(),any(),any())) - .thenReturn(Json.createArrayBuilder()); + .thenReturn(JsonObjects.createArrayBuilder()); JsonEnvelope responseEnvelope = caseLsmInfoQuery.getCaseLsmInfo(envelope); JsonObject responsePayload = responseEnvelope.payloadAsJsonObject(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryViewTest.java index c1ea640bd..82b7ddef4 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CaseNotesQueryViewTest.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.hamcrest.Matchers; @@ -83,7 +83,7 @@ public void shouldfindByCaseIdOrderByCreatedDateTimeDesc() throws Exception { private JsonEnvelope createJsonEnvelope(final ZonedDateTime createdDateTime) { final UUID caseId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryViewTest.java index e19cc1875..feb472173 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CivilFeesQueryViewTest.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -47,7 +47,7 @@ void shouldGetCivilFees() { List civilFeeEntities = List.of(civilFeeEntityOne, civilFeeEntityTwo); when(civilFeeRepository.findByFeeIds(List.of(uuidOne, uuidTwo))).thenReturn(civilFeeEntities); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("feeIds", uuidOne + "," + uuidTwo) .build(); @@ -66,7 +66,7 @@ void shouldHandleNonExistingEntity() { UUID uuidTwo = UUID.randomUUID(); when(civilFeeRepository.findByFeeIds(List.of(uuidOne, uuidTwo))).thenReturn(Collections.emptyList()); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("feeIds", uuidOne + "," + uuidTwo) .build(); @@ -88,7 +88,7 @@ void shouldHandleGetCivilFeesForOneId() { List civilFeeEntities = List.of(civilFeeEntityOne); when(civilFeeRepository.findByFeeIds(List.of(uuidOne))).thenReturn(civilFeeEntities); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("feeIds", String.valueOf(uuidOne)) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryViewTest.java index 9ed4c701e..6c497082f 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtDocumentQueryViewTest.java @@ -6,7 +6,7 @@ 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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.collections.CollectionUtils.isNotEmpty; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; @@ -93,7 +93,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -196,7 +196,7 @@ public void setUp() { private String objectToString(final Object o) { final StringWriter sr = new StringWriter(); - final JsonWriter jsonWriter = Json.createWriter(sr); + final JsonWriter jsonWriter = JsonObjects.createWriter(sr); jsonWriter.writeObject(objectToJsonObjectConverter.convert(o)); return sr.toString(); } @@ -444,7 +444,7 @@ private List createOffences() { @Test public void shouldFindDocumentById() throws Exception { final UUID courtDocumentId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(ID_PARAMETER, courtDocumentId.toString()).build(); final JsonEnvelope jsonEnvelopeIn = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()) @@ -467,7 +467,7 @@ public void shouldFindDocumentById() throws Exception { @Test public void shouldNotFindDocumentWhenIsRemoveIsTrue() throws Exception { final UUID courtDocumentId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(ID_PARAMETER, courtDocumentId.toString()).build(); final JsonEnvelope jsonEnvelopeIn = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()) @@ -531,10 +531,10 @@ public void shouldFindDocumentsForProsecutionByDefendantIdPermitted() throws IOE public void shouldNotFindDocumentsByDefendantIdIfDocumentBelongsToOtherDefendant() throws IOException { final UUID defendantId = randomUUID(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); - final JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonBuilder = JsonObjects.createObjectBuilder(); final Map id2ExpectedCourtDocumentIndex = new HashMap<>(); final Map courtDocumentId2Id = new HashMap<>(); final UUID documentTypeId = DOCUMENT_TYPE_ID_1; @@ -575,8 +575,8 @@ public void shouldFindDocumentsByPaginationOrderBySectionAsc() throws IOExceptio .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, SECTION, ASC, null); @@ -626,8 +626,8 @@ public void shouldFindDocumentsByPaginationOrderBySectionDesc() throws IOExcepti .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, SECTION, DESC, null); @@ -677,8 +677,8 @@ public void shouldFindDocumentsByPaginationOrderByDateAsc() throws IOException { .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, DATE, ASC, null); @@ -733,8 +733,8 @@ public void shouldFindDocumentsByPaginationOrderByDateDesc() throws IOException .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, DATE, DESC, null); @@ -788,8 +788,8 @@ public void shouldFindDocumentsByPaginationOrderByDateDescWithDocumentNameFilter .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, DATE, DESC, "Court Final orders1"); @@ -826,8 +826,8 @@ public void shouldFindDocumentsByPaginationOrderByDateDescWithDocumentNameFilter .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, DATE, DESC, "cd"); @@ -864,8 +864,8 @@ public void shouldFindDocumentsAndFilterRestrictedDocumentTypesByPaginationOrder .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, SECTION, ASC, null); @@ -900,8 +900,8 @@ public void shouldFindNoDocumentWithPaginationDueToNotAuthorisedDocumentType() t .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, SECTION, ASC, null); @@ -935,8 +935,8 @@ public void shouldFindDocumentsAndFilterRestrictedDocumentByPaginationOrderBySec .withCaseId(caseId) .build(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final JsonEnvelope jsonEnvelopeIn = getJsonEnvelopeForQueryRequest(caseId, pageSize, 1, SECTION, ASC, null); @@ -962,7 +962,7 @@ public void shouldFindDocumentsAndFilterRestrictedDocumentByPaginationOrderBySec } private JsonEnvelope getJsonEnvelopeForQueryRequest(final UUID caseId, final int pageSize, final int page, final String sortField, final String sortOrder, final String documentName) { - final JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonBuilder = JsonObjects.createObjectBuilder(); jsonBuilder.add(SORT_FIELD, sortField); jsonBuilder.add(SORT_ORDER, sortOrder); jsonBuilder.add(CASE_ID, caseId.toString()); @@ -1073,11 +1073,11 @@ private void addId(List caseId, UUID defendantId, List applicationId } private void shouldFindDocuments(final boolean rbackReadPermitted, final boolean permitted, final List caseIds, final UUID defendantId, final List applicationIds, final String userGroup, final boolean isProsecuting, final boolean shouldStub) throws IOException { - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", userGroup).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", userGroup).build()) .build(); - final JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonBuilder = JsonObjects.createObjectBuilder(); jsonBuilder.add("prosecutingCase", isProsecuting); final Map id2ExpectedCourtDocumentIndex = new HashMap<>(); final Map courtDocumentId2Id = new HashMap<>(); @@ -1157,11 +1157,11 @@ public Object answer(final InvocationOnMock invocationOnMock) throws Throwable { } private void shouldFindDocumentsForProsecution(final boolean rbackReadPermitted, final boolean permitted, final List caseIds, final UUID defendantId, final List applicationIds, final String userGroup, final boolean isProsecuting, final boolean shouldStub) throws IOException { - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", userGroup).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", userGroup).build()) .build(); - final JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonBuilder = JsonObjects.createObjectBuilder(); jsonBuilder.add("prosecutingCase", isProsecuting); final Map id2ExpectedCourtDocumentIndex = new HashMap<>(); final Map courtDocumentId2Id = new HashMap<>(); @@ -1244,7 +1244,7 @@ public Object answer(final InvocationOnMock invocationOnMock) throws Throwable { public void shouldFindAllDocuments() { final UUID caseId = randomUUID(); - final JsonObjectBuilder jsonBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonBuilder = JsonObjects.createObjectBuilder(); final Map id2ExpectedCourtDocumentIndex = new HashMap<>(); final Map courtDocumentId2Id = new HashMap<>(); addId(singletonList(caseId), null, null, id2ExpectedCourtDocumentIndex, courtDocumentId2Id, DOCUMENT_TYPE_ID_1, null); @@ -1299,7 +1299,7 @@ public Object answer(final InvocationOnMock invocationOnMock) throws Throwable { } private JsonObject getJsonPayload(final String fileName) throws IOException { - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(getJsonPayloadAsString(fileName).getBytes())) .readObject(); } @@ -1314,7 +1314,7 @@ public void shouldFindDocumentsByApplicationId() throws IOException { final boolean permitted = true; final UUID applicationId = UUID.randomUUID(); final UUID courtDocumentId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .add(APPLICATION_ID, applicationId.toString()) .build(); @@ -1339,8 +1339,8 @@ public void shouldFindDocumentsByApplicationId() throws IOException { when(userDetailsLoader.isUserHasPermissionForApplicationTypeCode(any(), any())).thenReturn(true); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); mockUserGroups(userGroupArray, jsonEnvelopeIn); final CourtDocumentIndex.Builder courtDocumentIndexBuilder = CourtDocumentIndex.courtDocumentIndex() @@ -1384,7 +1384,7 @@ void shouldHideDocumentWhenApplicationHasConfidentialAddressAndDefenceQuery() th final UUID applicationId = UUID.randomUUID(); final UUID courtDocumentId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .add("isDefenceQuery", true) .build(); @@ -1424,8 +1424,8 @@ void shouldHideDocumentWhenApplicationHasConfidentialAddressAndDefenceQuery() th when(jsonObjectToObjectConverter.convert(applicationJsonObject, CourtApplication.class)).thenCallRealMethod(); when(userDetailsLoader.isUserHasPermissionForApplicationTypeCode(any(), any())).thenReturn(true); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", userGroup).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(createObjectBuilder().add("groupName", userGroup).build()) .build(); mockReferenceData(jsonEnvelopeIn, userGroupArray); @@ -1443,7 +1443,7 @@ void shouldNotHideDocumentWhenApplicationHasNotConfidentialAddressAndDefenceQuer final String userGroup = "Defence Lawyers"; final UUID applicationId = UUID.randomUUID(); final UUID courtDocumentId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .add("isDefenceQuery", true) .build(); @@ -1483,8 +1483,8 @@ void shouldNotHideDocumentWhenApplicationHasNotConfidentialAddressAndDefenceQuer when(jsonObjectToObjectConverter.convert(applicationJsonObject, CourtApplication.class)).thenCallRealMethod(); when(userDetailsLoader.isUserHasPermissionForApplicationTypeCode(any(), any())).thenReturn(true); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", userGroup).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(createObjectBuilder().add("groupName", userGroup).build()) .build(); mockReferenceData(jsonEnvelopeIn, userGroupArray); final CourtDocumentIndex.Builder courtDocumentIndexBuilder = CourtDocumentIndex.courtDocumentIndex() @@ -1509,7 +1509,7 @@ void shouldNotHideDocumentWhenApplicationHasConfidentialAddressAndDefenceQueryBu final String userGroup = "Defence Lawyers"; final UUID applicationId = UUID.randomUUID(); final UUID courtDocumentId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .add("isDefenceQuery", true) .build(); @@ -1548,8 +1548,8 @@ void shouldNotHideDocumentWhenApplicationHasConfidentialAddressAndDefenceQueryBu when(jsonObjectToObjectConverter.convert(applicationJsonObject, CourtApplication.class)).thenCallRealMethod(); when(userDetailsLoader.isUserHasPermissionForApplicationTypeCode(any(), any())).thenReturn(true); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", userGroup).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(createObjectBuilder().add("groupName", userGroup).build()) .build(); mockReferenceData(jsonEnvelopeIn, userGroupArray); final CourtDocumentIndex.Builder courtDocumentIndexBuilder = CourtDocumentIndex.courtDocumentIndex() @@ -1574,7 +1574,7 @@ void shouldNotHideDocumentWhenApplicationHasConfidentialAddressAndPostalNotifica final String userGroup = "Court Clerks"; final UUID applicationId = UUID.randomUUID(); final UUID courtDocumentId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .build(); final JsonEnvelope jsonEnvelopeIn = JsonEnvelope.envelopeFrom( @@ -1612,8 +1612,8 @@ void shouldNotHideDocumentWhenApplicationHasConfidentialAddressAndPostalNotifica when(jsonObjectToObjectConverter.convert(applicationJsonObject, CourtApplication.class)).thenCallRealMethod(); when(userDetailsLoader.isUserHasPermissionForApplicationTypeCode(any(), any())).thenReturn(true); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", userGroup).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(createObjectBuilder().add("groupName", userGroup).build()) .build(); mockReferenceData(jsonEnvelopeIn, userGroupArray); final CourtDocumentIndex.Builder courtDocumentIndexBuilder = CourtDocumentIndex.courtDocumentIndex() @@ -1635,7 +1635,7 @@ void shouldNotHideDocumentWhenApplicationHasConfidentialAddressAndPostalNotifica @Test public void shouldNotFindDocumentsByApplicationIdWhenUserNotAuthoriseToViewDocuments() throws IOException { final UUID applicationId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .add(APPLICATION_ID, applicationId.toString()) .build(); @@ -1654,8 +1654,8 @@ public void shouldNotFindDocumentsByApplicationIdWhenUserNotAuthoriseToViewDocum when(jsonObjectToObjectConverter.convert(applicationJsonObject, CourtApplication.class)).thenCallRealMethod(); when(userDetailsLoader.isUserHasPermissionForApplicationTypeCode(any(), any())).thenReturn(false); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); mockUserGroups(userGroupArray, jsonEnvelopeIn); mockReferenceData(jsonEnvelopeIn, userGroupArray); @@ -1669,10 +1669,10 @@ public void shouldNotFindDocumentsWhenIsRemovedisTrue() throws IOException { boolean permitted = true; final UUID applicationId = UUID.randomUUID(); final UUID courtDocumentId = UUID.randomUUID(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .add(APPLICATION_ID, applicationId.toString()) .build(); @@ -1709,7 +1709,7 @@ public void shouldNotFindDocumentsWhenIsRemovedisTrue() throws IOException { @Test public void shouldNotListDocumentsWithNoReadOnlyAccessAndListAllOther() throws IOException { final UUID applicationId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .build(); final JsonEnvelope jsonEnvelopeIn = JsonEnvelope.envelopeFrom( @@ -1717,8 +1717,8 @@ public void shouldNotListDocumentsWithNoReadOnlyAccessAndListAllOther() throws I .withName(COURT_DOCUMENTS_SEARCH_NAME) .withUserId(randomUUID().toString()).build(), jsonObject); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); final UUID nowCourtDocumentId = randomUUID(); @@ -1793,7 +1793,7 @@ public void shouldNotListDocumentsWithNoReadOnlyAccessAndListAllOther() throws I @Test public void shouldFindDocumentsIsFilterNonCpsProsecutorRelatedDocumentWhenUserHasExcludeNonCpsProsecutorRole() throws IOException { final UUID applicationId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .build(); final JsonEnvelope jsonEnvelopeIn = JsonEnvelope.envelopeFrom( @@ -1801,9 +1801,9 @@ public void shouldFindDocumentsIsFilterNonCpsProsecutorRelatedDocumentWhenUserHa .withName(COURT_DOCUMENTS_SEARCH_NAME) .withUserId(randomUUID().toString()).build(), jsonObject); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) - .add(Json.createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) + .add(JsonObjects.createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) .build(); final UUID nowCourtDocumentId = randomUUID(); @@ -1844,9 +1844,9 @@ public void shouldFindDocumentsIsFilterNonCpsProsecutorRelatedDocumentWhenUserHa .thenReturn(courtDocumentIndexBuilder); mockReferenceData(jsonEnvelopeIn, userGroupArray); - final JsonObject loggedInUserPermissions = Json.createObjectBuilder().add("permissions", - Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("object", "CDES_EXCLUDE_NON_CPS_ROLE").build()) + final JsonObject loggedInUserPermissions = JsonObjects.createObjectBuilder().add("permissions", + JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("object", "CDES_EXCLUDE_NON_CPS_ROLE").build()) .build()) .build(); mockLoggedInUserPermissions(loggedInUserPermissions); @@ -1870,7 +1870,7 @@ public void shouldFindDocumentsIsFilterNonCpsProsecutorRelatedDocumentWhenUserHa @Test public void shouldApplicationTypeFilterDoesNotWorkWhenApplicationNotFound() throws IOException { final UUID applicationId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .build(); final JsonEnvelope jsonEnvelopeIn = JsonEnvelope.envelopeFrom( @@ -1878,9 +1878,9 @@ public void shouldApplicationTypeFilterDoesNotWorkWhenApplicationNotFound() thro .withName(COURT_DOCUMENTS_SEARCH_NAME) .withUserId(randomUUID().toString()).build(), jsonObject); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) - .add(Json.createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) + .add(JsonObjects.createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) .build(); final UUID nowCourtDocumentId = randomUUID(); @@ -1918,9 +1918,9 @@ public void shouldApplicationTypeFilterDoesNotWorkWhenApplicationNotFound() thro .thenReturn(courtDocumentIndexBuilder); mockReferenceData(jsonEnvelopeIn, userGroupArray); - final JsonObject loggedInUserPermissions = Json.createObjectBuilder().add("permissions", - Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("object", "CDES_EXCLUDE_NON_CPS_ROLE").build()) + final JsonObject loggedInUserPermissions = JsonObjects.createObjectBuilder().add("permissions", + JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("object", "CDES_EXCLUDE_NON_CPS_ROLE").build()) .build()) .build(); mockLoggedInUserPermissions(loggedInUserPermissions); @@ -1944,7 +1944,7 @@ public void shouldApplicationTypeFilterDoesNotWorkWhenApplicationNotFound() thro @Test public void shouldFindDocumentsIsNotFilterNonCpsProsecutorRelatedDocumentWhenUserHasNotExcludeNonCpsProsecutorRole() throws IOException { final UUID applicationId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(APPLICATION_ID, applicationId.toString()) .build(); final JsonEnvelope jsonEnvelopeIn = JsonEnvelope.envelopeFrom( @@ -1952,9 +1952,9 @@ public void shouldFindDocumentsIsNotFilterNonCpsProsecutorRelatedDocumentWhenUse .withName(COURT_DOCUMENTS_SEARCH_NAME) .withUserId(randomUUID().toString()).build(), jsonObject); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) - .add(Json.createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) + .add(JsonObjects.createObjectBuilder().add("groupName", "Non CPS Prosecutors").build()) .build(); final UUID nowCourtDocumentId = randomUUID(); @@ -1994,9 +1994,9 @@ public void shouldFindDocumentsIsNotFilterNonCpsProsecutorRelatedDocumentWhenUse .thenReturn(courtDocumentIndexBuilder); mockReferenceData(jsonEnvelopeIn, userGroupArray); - final JsonObject loggedInUserPermissions = Json.createObjectBuilder().add("permissions", - Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("object", "something else").build()) + final JsonObject loggedInUserPermissions = JsonObjects.createObjectBuilder().add("permissions", + JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("object", "something else").build()) .build()) .build(); mockLoggedInUserPermissions(loggedInUserPermissions); @@ -2039,7 +2039,7 @@ public void shouldFindDocumentsByHearingId() throws IOException { boolean permitted = false; final UUID hearingId = UUID.randomUUID(); final UUID defendantId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(DEFENDANT_ID_PARAMETER, defendantId.toString()) .add(HEARING_ID_PARAMETER, hearingId.toString()) .build(); @@ -2049,8 +2049,8 @@ public void shouldFindDocumentsByHearingId() throws IOException { .withUserId(randomUUID().toString()) .build(), jsonObject); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "Court Clerks").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "Court Clerks").build()) .build(); mockReferenceData(jsonEnvelopeIn, userGroupArray); final CourtDocumentIndex.Builder courtDocumentIndexBuilder = CourtDocumentIndex.courtDocumentIndex() @@ -2087,10 +2087,10 @@ public void shouldFindDocumentsByHearingIdWithRbac() throws IOException { final UUID hearingId = randomUUID(); final UUID defendantId = randomUUID(); final UUID courtDocumentId = randomUUID(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "group1").build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "group1").build()) .build(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(DEFENDANT_ID_PARAMETER, defendantId.toString()) .add(HEARING_ID_PARAMETER, hearingId.toString()) .build(); @@ -2139,7 +2139,7 @@ private void mockUserGroups(final JsonArray userGroupArray, final JsonEnvelope j private void mockReferenceData(final JsonEnvelope jsonEnvelopeIn, final JsonArray userGroupArray) throws IOException { final JsonObject documentsAccess = getJsonPayload("get-all-document-type-access.json"); - final JsonObject groups = Json.createObjectBuilder().add("groups", userGroupArray).build(); + final JsonObject groups = JsonObjects.createObjectBuilder().add("groups", userGroupArray).build(); when(requester.requestAsAdmin(any(JsonEnvelope.class), any())).thenAnswer(invocationOnMock -> { final JsonEnvelope envelope = (JsonEnvelope) invocationOnMock.getArguments()[0]; @@ -2173,7 +2173,7 @@ public void shouldGetCourtDocumentNotificationStatus() { final UUID courtDocumentId = UUID.randomUUID(); final UUID documentTypeId = DOCUMENT_TYPE_ID_1; - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(CASE_ID_SEARCH_PARAM, caseId.toString()) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryViewTest.java index 78a85d7d9..fc2812480 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtRegisterDocumentRequestQueryViewTest.java @@ -13,7 +13,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.collect.Lists; @@ -39,12 +39,12 @@ public class CourtRegisterDocumentRequestQueryViewTest { public void shouldGetCourtRegisterRequests() { final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()) .withName("progression.query.court-register-document-request").build(), - Json.createObjectBuilder().add("requestStatus", RegisterStatus.RECORDED.name()).build()); + JsonObjects.createObjectBuilder().add("requestStatus", RegisterStatus.RECORDED.name()).build()); final CourtRegisterRequestEntity courtRegisterRequestEntity = new CourtRegisterRequestEntity(); final UUID courtCentreId = UUID.randomUUID(); courtRegisterRequestEntity.setCourtCentreId(courtCentreId); courtRegisterRequestEntity.setStatus(RegisterStatus.RECORDED); - final JsonObject transformedJsonEntity = Json.createObjectBuilder().add("courtCentreId", courtCentreId.toString()).build(); + final JsonObject transformedJsonEntity = JsonObjects.createObjectBuilder().add("courtCentreId", courtCentreId.toString()).build(); when(objectToJsonObjectConverter.convert(courtRegisterRequestEntity)).thenReturn(transformedJsonEntity); when(courtRegisterRequestRepository.findByStatusRecorded()).thenReturn(Lists.newArrayList(courtRegisterRequestEntity)); final JsonEnvelope courtRegisterRequests = courtRegisterDocumentRequestQueryView.getCourtRegisterRequests(envelope); @@ -58,12 +58,12 @@ public void shouldGetCourtRegisterByMaterial() { final UUID materialId = UUID.randomUUID(); final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()) .withName("progression.query.court-register-document-by-material").build(), - Json.createObjectBuilder().add("materialId", materialId.toString()).build()); + JsonObjects.createObjectBuilder().add("materialId", materialId.toString()).build()); final CourtRegisterRequestEntity courtRegisterRequestEntity = new CourtRegisterRequestEntity(); final UUID courtCentreId = UUID.randomUUID(); courtRegisterRequestEntity.setCourtCentreId(courtCentreId); courtRegisterRequestEntity.setStatus(RegisterStatus.RECORDED); - final JsonObject transformedJsonEntity = Json.createObjectBuilder().add("courtCentreId", courtCentreId.toString()).build(); + final JsonObject transformedJsonEntity = JsonObjects.createObjectBuilder().add("courtCentreId", courtCentreId.toString()).build(); when(objectToJsonObjectConverter.convert(courtRegisterRequestEntity)).thenReturn(transformedJsonEntity); when(courtRegisterRequestRepository.findBySystemDocGeneratorId(materialId)).thenReturn(Lists.newArrayList(courtRegisterRequestEntity)); final JsonEnvelope courtRegisterRequests = courtRegisterDocumentRequestQueryView.getCourtRegisterByMaterial(envelope); @@ -76,7 +76,7 @@ public void shouldGetCourtRegisterByMaterial() { public void shouldGetCourtRegistersByDate() { final LocalDate requestDate = LocalDate.now(); final String courtHouse = "liver pool"; - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("registerDate", requestDate.toString()) .add("courtHouse", courtHouse) .build(); @@ -90,7 +90,7 @@ public void shouldGetCourtRegistersByDate() { courtRegisterRequestEntity.setRegisterDate(requestDate); courtRegisterRequestEntity.setStatus(RegisterStatus.RECORDED); - final JsonObject transformedJsonEntity = Json.createObjectBuilder() + final JsonObject transformedJsonEntity = JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", requestDate.toString()) .build(); @@ -108,7 +108,7 @@ public void shouldGetCourtRegistersByDate() { public void shouldGetCourtRegistersByDateCourtHouseEmpty() { final LocalDate requestDate = LocalDate.now(); final String courtHouse = "liver pool"; - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("registerDate", requestDate.toString()) .build(); final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()) @@ -121,7 +121,7 @@ public void shouldGetCourtRegistersByDateCourtHouseEmpty() { courtRegisterRequestEntity.setRegisterDate(requestDate); courtRegisterRequestEntity.setStatus(RegisterStatus.RECORDED); - final JsonObject transformedJsonEntity = Json.createObjectBuilder() + final JsonObject transformedJsonEntity = JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("registerDate", requestDate.toString()) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtlistQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtlistQueryViewTest.java index 397e3ab9d..91520c41d 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtlistQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/CourtlistQueryViewTest.java @@ -43,7 +43,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -105,7 +105,7 @@ public void shouldEnrichCourtlistDocumentPayloadForProsecutionCases() throws IOE JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-expected-with-prosecution-cases.json"); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -128,7 +128,7 @@ public void shouldNotIncludeGenderAndArrestNumberForBulkCivilCases() throws IOEx JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-for-bulk-civil-cases.json"); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -151,7 +151,7 @@ public void shouldEnrichCourtlistDocumentPayloadForProsecutionCases_ReadCaseFrom JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-expected-with-prosecution-cases.json"); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -173,7 +173,7 @@ public void shouldEnrichUshersListDocumentPayloadForProsecutionCases_ReadCaseFro JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-expected-with-prosecution-cases-ushers-list.json"); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -196,7 +196,7 @@ public void shouldEnrichCourtlistDocumentPayload_NoPlea() throws IOException { JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); assertPleaValue(actual, false); @@ -217,7 +217,7 @@ public void shouldEnrichCourtlistDocumentPayload_WithIndicatedGuiltyPlea() throw JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); assertIndicatedPleaValue(actual, true); @@ -238,7 +238,7 @@ public void shouldEnrichCourtlistDocumentPayload_WithNoIndicatedNotGuiltyPlea() JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); assertIndicatedPleaValue(actual, false); @@ -259,7 +259,7 @@ public void shouldEnrichCourtlistDocumentPayloadForProsecutionCasesWhenListingNu JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-expected-with-prosecution-cases-without-listing-number.json"); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -278,7 +278,7 @@ public void shouldEnrichBenchlistDocumentPayloadForCourtApplications() throws IO JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-expected-with-court-applications.json"); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -299,7 +299,7 @@ public void shouldEnrichBenchlistDocumentPayloadForCourtApplications2() throws I JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getAndReplaceJsonPayload("courtlist-expected-with-court-applications-with-restricted-defendant.json", defendantId.toString(), defendantId2.toString()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -314,7 +314,7 @@ public void shouldReturnEmptyPayloadWhenListingServiceReturnsEmpty() { JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -336,7 +336,7 @@ public void searchPrisonCourtlistShouldDelegateToSearchCourtlist() throws IOExce JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.prison.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-expected-with-prosecution-cases.json"); final JsonObject actual = courtlistQueryView.searchPrisonCourtlist(query).payloadAsJsonObject(); @@ -352,7 +352,7 @@ public void shouldReturnPayloadWithoutEnrichmentWhenHearingDatesIsEmpty() throws JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -371,7 +371,7 @@ public void shouldReturnPayloadWithoutEnrichmentWhenHearingsMapIsEmpty() throws JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -391,7 +391,7 @@ public void shouldOmitHearingFromOutputWhenHearingIdNotInHearingsMap() throws IO JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -420,7 +420,7 @@ public void shouldNotAddLjaInformationWhenCourtCentreIsNull() throws IOException JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -443,7 +443,7 @@ public void shouldAddLjaInformationIncludingWelshLjaNameWhenCourtCentreHasLjaDet JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -470,7 +470,7 @@ public void shouldEnrichCourtlistDocumentPayloadForProsecutionCases_WhenHearingI JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject expected = getJsonPayload("courtlist-expected-with-prosecution-cases.json"); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -487,7 +487,7 @@ private T invokePrivateMethod(final String methodName, final Class[] para @Test public void getApplicationOffenceListingNumbers_shouldReturnEmptyListWhenNoApplicationOffences() throws Exception { - final JsonObject hearingJson = Json.createObjectBuilder().build(); + final JsonObject hearingJson = JsonObjects.createObjectBuilder().build(); final List result = invokePrivateMethod("getApplicationOffenceListingNumbers", new Class[]{JsonObject.class}, hearingJson); assertThat(result.isEmpty(), is(true)); } @@ -496,10 +496,10 @@ public void getApplicationOffenceListingNumbers_shouldReturnEmptyListWhenNoAppli public void getApplicationOffenceListingNumbers_shouldReturnOffenceIdsWhenApplicationOffencesPresent() throws Exception { final String id1 = "072319bf-73c2-41b5-b309-c8c86c9b077b"; final String id2 = "651fc68b-8b9f-4cf2-912a-0b55d536323c"; - final JsonObject hearingJson = Json.createObjectBuilder() - .add("applicationOffences", Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("id", id1).build()) - .add(Json.createObjectBuilder().add("id", id2).build()) + final JsonObject hearingJson = JsonObjects.createObjectBuilder() + .add("applicationOffences", JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("id", id1).build()) + .add(JsonObjects.createObjectBuilder().add("id", id2).build()) .build()) .build(); final List result = invokePrivateMethod("getApplicationOffenceListingNumbers", new Class[]{JsonObject.class}, hearingJson); @@ -510,13 +510,13 @@ public void getApplicationOffenceListingNumbers_shouldReturnOffenceIdsWhenApplic @Test public void addWelshOffenceTitleFromListingIfMissing_shouldUseListingWelshTitleWhenProgressionHasNone() throws Exception { - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder(); final Offence offenceWithoutWelsh = Offence.offence() .withId(randomUUID()) .withOffenceCode("TTH105HY") .withOffenceTitle("ROBBERY") .build(); - final JsonObject offenceFromListing = Json.createObjectBuilder() + final JsonObject offenceFromListing = JsonObjects.createObjectBuilder() .add("welshOffenceTitle", "Listing Welsh Title") .build(); @@ -530,14 +530,14 @@ public void addWelshOffenceTitleFromListingIfMissing_shouldUseListingWelshTitleW @Test public void addWelshOffenceTitleFromListingIfMissing_shouldNotAddWhenProgressionAlreadyHasWelshTitle() throws Exception { - final JsonObjectBuilder offenceBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder offenceBuilder = JsonObjects.createObjectBuilder(); final Offence offenceWithWelsh = Offence.offence() .withId(randomUUID()) .withOffenceCode("TTH105HY") .withOffenceTitle("ROBBERY") .withOffenceTitleWelsh("Progression Welsh Title") .build(); - final JsonObject offenceFromListing = Json.createObjectBuilder() + final JsonObject offenceFromListing = JsonObjects.createObjectBuilder() .add("welshOffenceTitle", "Listing Welsh Title") .build(); @@ -850,7 +850,7 @@ public void shouldEnrichCourtlistWithCourtApplicationApplicantAndDefendants() th JsonEnvelope.metadataBuilder() .withId(randomUUID()) .withName("progression.search.court.list").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); final JsonObject actual = courtlistQueryView.searchCourtlist(query).payloadAsJsonObject(); @@ -871,14 +871,14 @@ public void shouldEnrichCourtlistWithCourtApplicationApplicantAndDefendants() th private JsonObject getJsonPayload(final String fileName) throws IOException { final String jsonString = Resources.toString(Resources.getResource(fileName), defaultCharset()); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readObject(); } private List getHearings(final String resourceName) throws IOException { final String jsonString = Resources.toString(Resources.getResource(resourceName), defaultCharset()); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readArray().stream() .map(jsonObject -> jsonObjectToObjectConverter.convert((JsonObject) jsonObject, Hearing.class)) @@ -887,7 +887,7 @@ private List getHearings(final String resourceName) throws IOException private List getHearings(final String resourceName, final String defId, final String defId2) throws IOException { final String jsonString = getStringFromResourceAndReplaceValues(resourceName, defId, defId2); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readArray().stream() .map(jsonObject -> jsonObjectToObjectConverter.convert((JsonObject) jsonObject, Hearing.class)) @@ -896,7 +896,7 @@ private List getHearings(final String resourceName, final String defId, private JsonObject getAndReplaceJsonPayload(final String fileName, final String defId, final String defId2) throws IOException { final String jsonString = getStringFromResourceAndReplaceValues(fileName, defId, defId2); - return Json.createReader(new ByteArrayInputStream(jsonString.getBytes())).readObject(); + return JsonObjects.createReader(new ByteArrayInputStream(jsonString.getBytes())).readObject(); } private String getStringFromResourceAndReplaceValues(final String fileName, final String defId, final String defId2) throws IOException { @@ -907,7 +907,7 @@ private String getStringFromResourceAndReplaceValues(final String fileName, fina private List getBulkCivilCasesHearings() throws IOException { final String jsonString = Resources.toString(Resources.getResource("courtlists.hearings.repository.bulk.civil.cases.json"), defaultCharset()); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readArray().stream() .map(jsonObject -> jsonObjectToObjectConverter.convert((JsonObject) jsonObject, Hearing.class)) @@ -916,7 +916,7 @@ private List getBulkCivilCasesHearings() throws IOException { private List getHearingsWithoutCase() throws IOException { final String jsonString = Resources.toString(Resources.getResource("courtlists.hearings.repository.without.case.json"), defaultCharset()); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readArray().stream() .map(jsonObject -> jsonObjectToObjectConverter.convert((JsonObject) jsonObject, Hearing.class)) diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryViewTest.java index 344fbbf38..93a8cbe43 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantPartialMatchQueryViewTest.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.fasterxml.jackson.databind.ObjectMapper; @@ -207,71 +207,71 @@ private List getDefendantPartialMatchData(UUID defe public static Collection data() { return Arrays.asList( - new Object[]{Json.createObjectBuilder().build(), 0, 20, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, - new Object[]{Json.createObjectBuilder().add("page", 1).build(), 0, 20, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder().build(), 0, 20, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, + new Object[]{JsonObjects.createObjectBuilder().add("page", 1).build(), 0, 20, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .build(), 1, 10, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "XXXX") .add(SORT_ORDER, "XXXX") .build(), 1, 10, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "caseReceivedDate") .build(), 1, 10, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "caseReceivedDate") .add(SORT_ORDER, "XXXX") .build(), 1, 10, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "caseReceivedDate") .add(SORT_ORDER, "Desc") .build(), 1, 10, 22, "findAllOrderByCaseReceivedDatetimeDesc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "caseReceivedDate") .add(SORT_ORDER, "Asc") .build(), 1, 10, 22, "findAllOrderByCaseReceivedDatetimeAsc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "defendantName") .build(), 1, 10, 22, "findAllOrderByDefendantNameAsc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "defendantName") .add(SORT_ORDER, "XXXX") .build(), 1, 10, 22, "findAllOrderByDefendantNameAsc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "defendantName") .add(SORT_ORDER, "Asc") .build(), 1, 10, 22, "findAllOrderByDefendantNameAsc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 2) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "defendantName") .add(SORT_ORDER, "Desc") .build(), 1, 10, 22, "findAllOrderByDefendantNameDesc",true}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 7) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "defendantName") .add(SORT_ORDER, "Desc") .build(), null, null, 59, "",false}, - new Object[]{Json.createObjectBuilder() + new Object[]{JsonObjects.createObjectBuilder() .add(PAGE, 1) .add(PAGE_SIZE, 10) .add(SORT_FIELD, "defendantName") diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantRequestQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantRequestQueryViewTest.java index de4d94f27..e084b8748 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantRequestQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/DefendantRequestQueryViewTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/FormQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/FormQueryViewTest.java index d38d3f572..696ec8cfb 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/FormQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/FormQueryViewTest.java @@ -5,7 +5,7 @@ import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; import static java.util.stream.Collectors.toList; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/HearingQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/HearingQueryViewTest.java index ee59804c6..63574a5ed 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/HearingQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/HearingQueryViewTest.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.BeforeEach; @@ -57,7 +57,7 @@ public void setup() { public void shouldFindHearingById() { final UUID hearingId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("jurisdictionType", JurisdictionType.CROWN.toString()) .build(); @@ -90,11 +90,11 @@ public void shouldFindHearingsByIds() { final UUID hearingId2 = randomUUID(); final List hearingIds = asList(hearingId1, hearingId2); - final JsonObject jsonObject1 = Json.createObjectBuilder() + final JsonObject jsonObject1 = JsonObjects.createObjectBuilder() .add("hearingId", hearingId1.toString()) .build(); - final JsonObject jsonObject2 = Json.createObjectBuilder() + final JsonObject jsonObject2 = JsonObjects.createObjectBuilder() .add("hearingId", hearingId2.toString()) .build(); @@ -129,7 +129,7 @@ public void shouldFindHearingsByIds() { @Test public void shouldReturnEmpty_FindHearingById() { - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", randomUUID().toString()) .add("jurisdictionType", JurisdictionType.CROWN.toString()) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryViewTest.java index c7a4bcc26..7526b2183 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/JudicialResultQueryViewTest.java @@ -18,7 +18,7 @@ import java.io.IOException; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -62,7 +62,7 @@ void shouldGetJudicialChildResults() throws IOException { when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -93,7 +93,7 @@ void shouldGetJudicialChildResultsV2WhenResultInProsecutionCaseAndExistInMoreTha when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -127,7 +127,7 @@ void shouldNotGetJudicialChildResultWhenNoChildResultExists() throws IOException when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -156,7 +156,7 @@ void shouldNotGetJudicialChildResultWhenJudicialResultTypeIdDoesNotExists() thro when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -185,7 +185,7 @@ void shouldGetJudicialChildResultsWhenResultInApplication() throws IOException { when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -216,7 +216,7 @@ void shouldGetJudicialChildResultsWhenResultInApplicationAndExistsInMoreThanOneA when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -248,7 +248,7 @@ void shouldGetJudicialChildResultsWhenResultInApplicationCourtOrderOffences() th when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -279,7 +279,7 @@ void shouldGetJudicialChildResultsWhenResultInApplicationCourtOrderOffencesAndHa when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -310,7 +310,7 @@ void shouldNotGetJudicialChildResultsWhenResultInApplicationButDefendantIsDiffer when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -338,7 +338,7 @@ void shouldGetJudicialChildResultsWhenResultInApplicationOffence() throws IOExce when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -369,7 +369,7 @@ void shouldGetJudicialChildResultsWhenResultInApplicationTwoOffence() throws IOE when(hearingRepository.findBy(hearingId)).thenReturn(hearingEntity); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) @@ -399,7 +399,7 @@ void shouldNotGetJudicialChildResultsWhenHearingIsNotExists() throws IOException when(hearingRepository.findBy(hearingId)).thenReturn(null); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("hearingId", hearingId.toString()) .add("masterDefendantId", masterDefendantId) .add("judicialResultTypeId", judicialResultTypeId) diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryViewTest.java index 342168716..3d334939e 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/MaterialBulkQueryViewTest.java @@ -10,7 +10,7 @@ import uk.gov.moj.cpp.prosecutioncase.persistence.entity.MaterialIdMapping; import uk.gov.moj.cpp.prosecutioncase.persistence.repository.MaterialBulkRepository; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import java.util.Arrays; @@ -60,7 +60,7 @@ void shouldProcessBulkMaterialMappingsQuery() { // Given final String materialIdsString = materialId1.toString() + "," + materialId2.toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsString) .build(); @@ -112,7 +112,7 @@ void shouldHandleNullValuesInMappings() { // Given final String materialIdsString = materialId3.toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsString) .build(); @@ -150,7 +150,7 @@ void shouldReturnEmptyArrayWhenNoMappingsFound() { // Given final String materialIdsString = materialId1.toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsString) .build(); @@ -183,7 +183,7 @@ void shouldPreserveEnvelopeMetadata() { final String materialIdsString = materialId1.toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsString) .build(); @@ -209,7 +209,7 @@ void shouldHandleMultipleMaterialIdsWithMixedData() { // Given final String materialIdsString = materialId1.toString() + "," + materialId2.toString() + "," + materialId3.toString(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("materialIds", materialIdsString) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryViewTest.java index 40b7e5c25..9d035eb9b 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/NowDocumentRequestQueryViewTest.java @@ -14,7 +14,7 @@ import java.util.Arrays; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -44,7 +44,7 @@ public class NowDocumentRequestQueryViewTest { @Test public void shouldFindNowDocumentRequestByRequestId() { final UUID requestId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(REQUEST_ID_PARAM, requestId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()) @@ -65,7 +65,7 @@ public void shouldFindNowDocumentRequestByRequestId() { @Test public void shouldReturnEmptyNowDocumentRequests() { final UUID requestId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(REQUEST_ID_PARAM, requestId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()) @@ -82,7 +82,7 @@ public void shouldReturnEmptyNowDocumentRequests() { @Test public void shouldNowDocumentRequestByHearing() { final UUID requestId = UUID.randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(HEARING_ID_PARAM, HEARING_ID.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()) diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PetQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PetQueryViewTest.java index 4451b737e..b7a8351d9 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PetQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PetQueryViewTest.java @@ -2,8 +2,8 @@ import static java.util.Arrays.asList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createArrayBuilder; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.when; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryViewTest.java index d422cfff9..f4a05f796 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/PrisonCourtRegisterDocumentRequestQueryViewTest.java @@ -12,7 +12,7 @@ import java.time.LocalDate; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import com.google.common.collect.Lists; @@ -41,14 +41,14 @@ public void getPrisonCourtRegisterByCourtCentre() { final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()) .withName("progression.query.prison-court-register-document-by-court-centre").build(), - Json.createObjectBuilder().add("courtCentreId", courtCentreId.toString()).build()); + JsonObjects.createObjectBuilder().add("courtCentreId", courtCentreId.toString()).build()); final PrisonCourtRegisterEntity prisonCourtRegisterEntity = new PrisonCourtRegisterEntity(); prisonCourtRegisterEntity.setCourtCentreId(courtCentreId); prisonCourtRegisterEntity.setFileId(fileId); prisonCourtRegisterEntity.setRecordedDate(LocalDate.now()); - final JsonObject transformedJsonEntity = Json.createObjectBuilder() + final JsonObject transformedJsonEntity = JsonObjects.createObjectBuilder() .add("courtCentreId", courtCentreId.toString()) .add("fileId", fileId.toString()) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryViewTest.java index dd2a5c363..ae5800b72 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/SharedCourtDocumentsQueryViewTest.java @@ -4,7 +4,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -60,7 +60,7 @@ import java.util.UUID; import java.util.stream.IntStream; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -442,9 +442,9 @@ void shouldGetApplicationSharedCourtDocumentsLinksWhenCaseInActiveApplicationHea final String trialTypeId = randomUUID().toString(); hearingEntity.setPayload(("{\"type\":{\"description\":\"Application\",\"id\":\"" + trialTypeId + "\"}}").replaceAll("%NOW%", ZonedDateTime.now().toString())); hearingApplicationEntity.setHearing(hearingEntity); - final JsonArray jsonHearingTypesArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("id", trialTypeId).add("trialTypeFlag", true).build()) - .add(Json.createObjectBuilder().add("id", randomUUID().toString()).add("trialTypeFlag", false).build()) + final JsonArray jsonHearingTypesArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("id", trialTypeId).add("trialTypeFlag", true).build()) + .add(JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("trialTypeFlag", false).build()) .build(); when(hearingApplicationRepository.findBy(new HearingApplicationKey(applicationId, hearingId))).thenReturn(hearingApplicationEntity); @@ -504,9 +504,9 @@ void shouldGetApplicationSharedCourtDocumentsLinksWhenCaseInactiveAndApplication final String nonTrialTypeId = randomUUID().toString(); hearingEntity.setPayload(("{\"type\":{\"description\":\"Application\",\"id\":\"" + nonTrialTypeId + "\"}}")); hearingApplicationEntity.setHearing(hearingEntity); - final JsonArray jsonHearingTypesArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("id", randomUUID().toString()).add("trialTypeFlag", true).build()) - .add(Json.createObjectBuilder().add("id", nonTrialTypeId).add("trialTypeFlag", false).build()) + final JsonArray jsonHearingTypesArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("id", randomUUID().toString()).add("trialTypeFlag", true).build()) + .add(JsonObjects.createObjectBuilder().add("id", nonTrialTypeId).add("trialTypeFlag", false).build()) .build(); when(hearingApplicationRepository.findBy(new HearingApplicationKey(applicationId, applicationHearingId))).thenReturn(hearingApplicationEntity); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ApplicationAtAGlanceHelperTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ApplicationAtAGlanceHelperTest.java index 4410e85a1..fec6863d5 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ApplicationAtAGlanceHelperTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ApplicationAtAGlanceHelperTest.java @@ -70,7 +70,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.apache.commons.lang3.tuple.Pair; @@ -175,7 +175,7 @@ public void shouldGetApplicantDetailsWhenApplicantIsAnIndividual() { .withType(courtApplicationType().build()) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); @@ -212,7 +212,7 @@ void shouldNotGetApplicantAddressDetailsWhenApplicantIsAnIndividualWhenAddressCo .withType(courtApplicationType().build()) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); @@ -246,7 +246,7 @@ void shouldGetApplicantAddressDetailsWhenApplicantIsAnIndividualWhenAddressConfi .withType(courtApplicationType().build()) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); @@ -281,7 +281,7 @@ void shouldGetApplicantAddressDetailsWhenApplicantIsAnIndividualWhenAddressNotCo .withType(courtApplicationType().build()) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); @@ -333,19 +333,19 @@ public void shouldGetApplicantDetailsWhenApplicantIsAnIndividualAndRepresentatio .withCourtApplicationCases(List.of(courtApplicationCase1, courtApplicationCase2)) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom(metadataBuilder().withId(randomUUID()) .withName("progression.query.application.aaag"), payload); - final JsonObject representation = Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add( - Json.createObjectBuilder() + final JsonObject representation = JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add( + JsonObjects.createObjectBuilder() .add("defendantId", masterDefendantId.toString()) .add("organisationName", "organisationName") - .add("organisationAddress", Json.createObjectBuilder() + .add("organisationAddress", JsonObjects.createObjectBuilder() .add("address1", "address1") .add("address2", "address2") .add("address3", "address3") @@ -452,7 +452,7 @@ public void shouldGetApplicantDetailsWhenApplicantIsAnOrganisation() { .withType(courtApplicationType().build()) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); @@ -505,7 +505,7 @@ public void shouldGetApplicantDetailsWhenApplicantIsADefendant() { .withType(courtApplicationType().build()) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); @@ -550,19 +550,19 @@ public void shouldHandleApplicantMasterDefendantId() { .withCourtApplicationCases(List.of(courtApplicationCase1, courtApplicationCase2)) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom(metadataBuilder().withId(randomUUID()) .withName("progression.query.application.aaag"), payload); - final JsonObject representation = Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add( - Json.createObjectBuilder() + final JsonObject representation = JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add( + JsonObjects.createObjectBuilder() .add("defendantId", masterDefendantId.toString()) .add("organisationName", "organisationName") - .add("organisationAddress", Json.createObjectBuilder() + .add("organisationAddress", JsonObjects.createObjectBuilder() .add("address1", "address1") .add("address2", "address2") .add("address3", "address3") @@ -600,7 +600,7 @@ public void shouldHandleMissingFields() { .withApplicant(applicant) .build(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/CaseAtAGlanceHelperTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/CaseAtAGlanceHelperTest.java index 121fee18f..a462a8c02 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/CaseAtAGlanceHelperTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/CaseAtAGlanceHelperTest.java @@ -5,7 +5,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/DefendantByLAAContractNumberQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/DefendantByLAAContractNumberQueryViewTest.java index 584c6895f..21abce94b 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/DefendantByLAAContractNumberQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/DefendantByLAAContractNumberQueryViewTest.java @@ -14,7 +14,7 @@ import java.util.Collections; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -37,7 +37,7 @@ public void shouldFindDefendantByLAAContractNumber() { final String defendantId = randomUUID().toString(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("laaContractNumber", laaContractNumber).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ProsecutionCaseQueryViewTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ProsecutionCaseQueryViewTest.java index 99b4abf65..e1d8d7154 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ProsecutionCaseQueryViewTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/ProsecutionCaseQueryViewTest.java @@ -9,7 +9,7 @@ import static java.util.Collections.singletonList; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.is; @@ -120,7 +120,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonReader; @@ -260,7 +260,7 @@ public void setup() { public void shouldFindProsecutionCaseById() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -298,7 +298,7 @@ public void shouldNotReturnAnyRelatedCaseWhenThereIsNoRelatedCase() { final UUID relatedCaseId = randomUUID(); final UUID masterDefendantId = randomUUID(); final UUID offenceId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -350,7 +350,7 @@ public void shouldAddOldProsecutionAuthorityCode() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); final UUID defendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); @@ -398,7 +398,7 @@ public void shouldAddOldProsecutionAuthorityCode() { @Test public void shouldFindProsecutionCaseAndRelatedCasesByIdWithMultipleDefendants() { - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", CASE_ID1.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -442,7 +442,7 @@ public void shouldFindProsecutionCaseAndRelatedCasesByIdWithMultipleDefendants() @Test public void shouldNotFindRelatedCaseIfThereIsNoOffenceForMasterDefendant() { - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", CASE_ID1.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -601,7 +601,7 @@ public void shouldAddOldProsecutionAuthorityCodeToCaseAtAGlanceProsecutionCase() public void shouldFindCaseById() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1020,7 +1020,7 @@ public void shouldReturnCotrFormForAProsecutionCase() { public void shouldFindApplicationsLinkedToProsecutionCase() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1068,7 +1068,7 @@ public void shouldFindApplicationsLinkedToProsecutionCase() { public void shouldFindApplicationsLinkedToProsecutionCaseWithLegalEntityDefendant() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1115,7 +1115,7 @@ public void shouldFindApplicationsLinkedToProsecutionCaseWithLegalEntityDefendan @Test public void shouldFindUserGroupsByMaterialId() { final UUID materialId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("q", materialId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()).withName("progression.query.usergroups-by-material-id").build(), @@ -1131,7 +1131,7 @@ public void shouldFindUserGroupsByMaterialId() { @Test public void shouldNotFindUserGroupsByMaterialId() throws Exception { final UUID materialId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("q", materialId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()).withName("progression.query.usergroups-by-material-id").build(), @@ -1146,7 +1146,7 @@ public void shouldNotFindUserGroupsByMaterialId() throws Exception { public void shouldFindCaseBySearchCriteria() { final UUID caseId = randomUUID(); final String searchCriteria = "John Smith"; - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("q", searchCriteria).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1173,7 +1173,7 @@ public void shouldFindCaseBySearchCriteria() { @Test public void shouldNotFindCaseBySearchCriteria() { final String searchCriteria = "FirstName LastName"; - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("q", searchCriteria.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()).withName("progression.query.search-cases").build(), @@ -1607,7 +1607,7 @@ public void shouldReturnCaseHearingTypesHearingWithSameConfirmDate() throws IOEx public void shouldFindProsecutionAuthorityIdByCaseIds() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseIds", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1638,7 +1638,7 @@ public void shouldFindProsecutorIdOrProsecutionAuthorityIdByCaseIds() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); final UUID prosecutorId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseIds", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1683,7 +1683,7 @@ public void shouldGetAllCaseHearings() throws IOException { @Test public void shouldReturnEmptyEnvelopeWhenNoLinkedApplicationsOnCaseExists() { final UUID caseId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("prosecutionCaseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1696,7 +1696,7 @@ public void shouldReturnEmptyEnvelopeWhenNoLinkedApplicationsOnCaseExists() { @Test public void shouldReturnOnlyActiveApplicationsOnCaseWhenExists() { final UUID caseId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("prosecutionCaseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -1862,7 +1862,7 @@ private TrialHearing createTrialHearing(final UUID hearingId, final UUID courtCe } private JsonObject createCotrForm(final UUID defendantId, final String firstName, final String lastName, final LocalDate dateOfBirth, final ZonedDateTime hearingDay, final UUID prosecutionCaseId) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("id", randomUUID().toString()) .add("caseId", prosecutionCaseId.toString()) .add("hearingId", randomUUID().toString()) @@ -1996,9 +1996,9 @@ private CourtApplication getCourtApplicationWithLegalEntityDefendant(final UUID private JsonEnvelope buildEnvelope(final String eventName, final String payloadFileName) { final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream(payloadFileName); - final JsonReader jsonReader = Json.createReader(stream)) { + final JsonReader jsonReader = JsonObjects.createReader(stream)) { final JsonObject payload = jsonReader.readObject(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", randomUUID().toString()).build(); return envelopeFrom(metadataBuilder().withId(randomUUID()).withName(eventName), payload); } catch (final IOException e) { @@ -2085,7 +2085,7 @@ static class ApplicationArbitraryValues { private List buildMatchDefendantCaseHearingEntitiesWithNoOffence() { - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", CASE_ID1.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -2300,7 +2300,7 @@ private HearingEntity createHearingEntity(final UUID hearingId, final LocalDate private JsonObject getJsonPayload(final String fileName) throws IOException { final String jsonString = Resources.toString(Resources.getResource(fileName), defaultCharset()); - return Json.createReader( + return JsonObjects.createReader( new ByteArrayInputStream(jsonString.getBytes())) .readObject(); } @@ -2309,7 +2309,7 @@ private JsonObject getJsonPayload(final String fileName) throws IOException { public void shouldFindCivilFees() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -2363,7 +2363,7 @@ public void shouldFindCivilFees() { public void shouldFindProsecutionCaseDetails() { final UUID caseId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("caseId", caseId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -2390,7 +2390,7 @@ public void shouldFindProsecutionCaseDetails() { public void shouldFindGroupMemberCases() { final UUID groupId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("groupId", groupId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -2420,7 +2420,7 @@ public void shouldFindGroupMemberCases() { public void shouldFindGroupMasterCase() { final UUID groupId = randomUUID(); final UUID masterDefendantId = randomUUID(); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add("groupId", groupId.toString()).build(); final JsonEnvelope jsonEnvelope = JsonEnvelope.envelopeFrom( @@ -2476,7 +2476,7 @@ public void shouldSearchInactiveMigratedCases() { """.formatted(caseId.toString()); - final JsonObject jsonObject = Json.createObjectBuilder() + final JsonObject jsonObject = JsonObjects.createObjectBuilder() .add(CASE_IDS_SEARCH_PARAM, caseId.toString()) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryServiceTest.java index 34c46d13a..05b77f098 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefenceQueryServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.query.view.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.ArgumentMatchers.any; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefendantServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefendantServiceTest.java index 0099d6b1e..a90a8a469 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefendantServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DefendantServiceTest.java @@ -27,7 +27,7 @@ import static java.util.Collections.emptyList; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.when; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DirectionTransformServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DirectionTransformServiceTest.java index e7d16e101..13dae9246 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DirectionTransformServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/DirectionTransformServiceTest.java @@ -30,8 +30,8 @@ import java.util.UUID; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.mockito.Mockito.any; diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/HearingServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/HearingServiceTest.java index 531d3e4af..eb4323307 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/HearingServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/HearingServiceTest.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; @ExtendWith(MockitoExtension.class) @@ -43,10 +43,10 @@ void shouldGetApplicationHearing() { final UUID hearingId1 = randomUUID(); final UUID hearingId2 = randomUUID(); - final JsonObject responsePayload = Json.createObjectBuilder() - .add("hearingSummaries",Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("hearingId", hearingId1.toString()).build()) - .add(Json.createObjectBuilder().add("hearingId", hearingId2.toString()).build())) + final JsonObject responsePayload = JsonObjects.createObjectBuilder() + .add("hearingSummaries",JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("hearingId", hearingId1.toString()).build()) + .add(JsonObjects.createObjectBuilder().add("hearingId", hearingId2.toString()).build())) .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ListingServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ListingServiceTest.java index a30e7d3dd..37113ecae 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ListingServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ListingServiceTest.java @@ -18,7 +18,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import org.junit.jupiter.api.Test; @@ -52,7 +52,7 @@ public void shouldSearchCourtlistDetails() { .with(metadataBuilder) .build(); - final JsonObject listingPayload = Json.createObjectBuilder() + final JsonObject listingPayload = JsonObjects.createObjectBuilder() .add("key", "value") .build(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataServiceTest.java index e890b8063..189e81ed1 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/ReferenceDataServiceTest.java @@ -13,7 +13,7 @@ import java.util.Optional; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -82,11 +82,11 @@ public void shouldNotReturnProsecutorJson() { @Test void shouldGetHearingTypes() { when(requester.request(requestJsonEnvelope.capture())).thenReturn(jsonEnvelope); - final JsonArray hearingTypes = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("id", UUID.randomUUID().toString()).build()) + final JsonArray hearingTypes = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("id", UUID.randomUUID().toString()).build()) .build(); when(queryEnvelope.metadata()).thenReturn(JsonEnvelope.metadataBuilder().withId(UUID.randomUUID()).withName("name").build()); - when(jsonEnvelope.payloadAsJsonObject()).thenReturn(Json.createObjectBuilder() + when(jsonEnvelope.payloadAsJsonObject()).thenReturn(JsonObjects.createObjectBuilder() .add("hearingTypes", hearingTypes) .build() ); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/SharedAllCourtDocumentsServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/SharedAllCourtDocumentsServiceTest.java index 62940ad37..42fbc57c3 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/SharedAllCourtDocumentsServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/SharedAllCourtDocumentsServiceTest.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -48,7 +48,7 @@ void shouldGetSharedAllCourtDocumentsForTrialHearing() { final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(Envelope.metadataBuilder(). withId(UUID.randomUUID()). withUserId(userId.toString()) - .withName("test"), Json.createObjectBuilder().build()); + .withName("test"), JsonObjects.createObjectBuilder().build()); final UUID caseId = UUID.randomUUID(); final UUID hearingId = UUID.randomUUID(); final String caseUrn = string(8).next(); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/UserServiceTest.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/UserServiceTest.java index ba4659899..14eb8b007 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/UserServiceTest.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/service/UserServiceTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; @@ -39,11 +39,11 @@ class UserServiceTest { void shouldGetUserGroupIdsByUserId() { final UUID group1 = UUID.randomUUID(); final UUID group2 = UUID.randomUUID(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "group1").add("groupId", group1.toString()).build()) - .add(Json.createObjectBuilder().add("groupName", "group2").add("groupId", group2.toString()).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "group1").add("groupId", group1.toString()).build()) + .add(JsonObjects.createObjectBuilder().add("groupName", "group2").add("groupId", group2.toString()).build()) .build(); - final JsonObject groups = Json.createObjectBuilder().add("groups", userGroupArray).build(); + final JsonObject groups = JsonObjects.createObjectBuilder().add("groups", userGroupArray).build(); final Envelope envelope = Envelope.envelopeFrom(Envelope.metadataBuilder(). withId(UUID.randomUUID()). withUserId(randomUUID().toString()) @@ -53,7 +53,7 @@ void shouldGetUserGroupIdsByUserId() { .withId(randomUUID()) .withUserId(randomUUID().toString()) .withName("test").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); when(requester.requestAsAdmin(any(JsonEnvelope.class), any())).thenReturn(envelope); final List groupIds = userService.getUserGroupIdsByUserId(jsonEnvelopeIn); @@ -67,11 +67,11 @@ void shouldGetUserGroupIdsByUserId() { void shouldGetUserGroupsByUserId() { final String group1 = UUID.randomUUID().toString(); final String group2 = UUID.randomUUID().toString(); - final JsonArray userGroupArray = Json.createArrayBuilder() - .add(Json.createObjectBuilder().add("groupName", "group1").add("groupId", group1).build()) - .add(Json.createObjectBuilder().add("groupName", "group2").add("groupId", group2).build()) + final JsonArray userGroupArray = JsonObjects.createArrayBuilder() + .add(JsonObjects.createObjectBuilder().add("groupName", "group1").add("groupId", group1).build()) + .add(JsonObjects.createObjectBuilder().add("groupName", "group2").add("groupId", group2).build()) .build(); - final JsonObject groups = Json.createObjectBuilder().add("groups", userGroupArray).build(); + final JsonObject groups = JsonObjects.createObjectBuilder().add("groups", userGroupArray).build(); final Envelope envelope = Envelope.envelopeFrom(Envelope.metadataBuilder(). withId(UUID.randomUUID()). withUserId(randomUUID().toString()) @@ -81,7 +81,7 @@ void shouldGetUserGroupsByUserId() { .withId(randomUUID()) .withUserId(randomUUID().toString()) .withName("test").build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); when(requester.requestAsAdmin(any(JsonEnvelope.class), any())).thenReturn(envelope); final List groupNames = userService.getUserGroupsByUserId(jsonEnvelopeIn); diff --git a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/utils/FileUtil.java b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/utils/FileUtil.java index 5f473c7dc..f67ad17aa 100644 --- a/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/utils/FileUtil.java +++ b/progression-query/progression-query-view/src/test/java/uk/gov/moj/cpp/progression/query/view/utils/FileUtil.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import java.io.IOException; @@ -12,7 +12,7 @@ import java.util.Objects; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.junit.jupiter.api.Assertions.fail; public class FileUtil { @@ -49,7 +49,7 @@ public static JsonObject givenPayload(final String filePath) throws IOException public static JsonObject getJsonPayload(final String fileName) throws IOException { final ClassLoader loader = Thread.currentThread().getContextClassLoader(); try (final InputStream stream = loader.getResourceAsStream(fileName); - final JsonReader jsonReader = Json.createReader(stream)) { + final JsonReader jsonReader = JsonObjects.createReader(stream)) { final JsonObject payload = jsonReader.readObject(); return payload; } diff --git a/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/RefDataService.java b/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/RefDataService.java index 755ed88ec..58e25cd64 100644 --- a/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/RefDataService.java +++ b/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/RefDataService.java @@ -8,7 +8,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.isNotEmpty; import static uk.gov.justice.services.common.converter.LocalDates.to; import static uk.gov.justice.services.core.annotation.Component.QUERY_API; @@ -49,7 +49,7 @@ import java.util.stream.IntStream; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; @@ -254,7 +254,7 @@ public Optional getOrganisationUnitById(final UUID courtCentreId, fi } public Optional getDocumentTypeAccessData(final UUID documentTypeId, final JsonEnvelope event, final Requester requester) { - final JsonObject payload = Json.createObjectBuilder().add(ID, documentTypeId.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(ID, documentTypeId.toString()).build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_GET_DOCUMENT_ACCESS) .withMetadataFrom(event)); @@ -265,7 +265,7 @@ public Optional getDocumentTypeAccessData(final UUID documentTypeId, } public Optional getAllDocumentsTypes(final JsonEnvelope event, final LocalDate date, final Requester requester) { - final JsonObject payload = Json.createObjectBuilder().add("date", date.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add("date", date.toString()).build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_GET_ALL_DOCUMENTS_TYPE) @@ -278,7 +278,7 @@ public Optional getAllDocumentsTypes(final JsonEnvelope event, final } public Optional getCourtsByPostCodeAndProsecutingAuthority(final JsonEnvelope jsonEnvelope, final String postcode, final String prosecutingAuthority, final Requester requester) { - final JsonObject payloadForoucode = Json.createObjectBuilder() + final JsonObject payloadForoucode = JsonObjects.createObjectBuilder() .add("postcode", postcode) .add("prosecutingAuthority", prosecutingAuthority) .build(); @@ -293,7 +293,7 @@ public Optional getCourtsByPostCodeAndProsecutingAuthority(final Jso } public Optional getLocalJusticeArea(final JsonEnvelope jsonEnvelope, final String ljaCode, final Requester requester) { - final JsonObject payloadForLjaCode = Json.createObjectBuilder() + final JsonObject payloadForLjaCode = JsonObjects.createObjectBuilder() .add("nationalCourtCode", ljaCode) .build(); final Envelope requestForLocalJusticeArea = envelop(payloadForLjaCode).withName(REFERENCEDATA_QUERY_LOCAL_JUSTICE_AREAS).withMetadataFrom(jsonEnvelope); @@ -311,7 +311,7 @@ public Optional getCotrReviewNotes(final Metadata metadata, final Re public Optional getCourtsOrganisationUnitsByOuCode(final JsonEnvelope event, final String oucode, final Requester requester) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("oucode", oucode) .build(); @@ -326,7 +326,7 @@ public Optional getCourtsOrganisationUnitsByOuCode(final JsonEnvelop public Optional getCourtCentreWithCourtRoomsById(final UUID courtCentreId, final JsonEnvelope event, final Requester requester) { - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(ID, courtCentreId.toString()) .build(); @@ -419,7 +419,7 @@ public CourtCentre getCourtCentre(final String oucode, final JsonEnvelope jsonEn public CourtCentre getCourtByCourtHouseOUCode(final String courtHouseOUCode, final JsonEnvelope envelope, final Requester requester) { final CourtCentre.Builder courtCentreBuilder = CourtCentre.courtCentre(); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add("oucode", courtHouseOUCode) .build(); LOGGER.info(" Calling {} to get court centre for {} ", REFERENCEDATA_GET_COURTCENTER, courtHouseOUCode); @@ -464,7 +464,7 @@ private void populateCourtCenter(final CourtCentre.Builder courtCentreBuilder, public Optional getEthinicity(final JsonEnvelope event, final UUID id, final Requester requester) { LOGGER.info(" Calling {} to get ethinicity for {} ", REFERENCEDATA_QUERY_ETHNICITIES, id); - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_QUERY_ETHNICITIES) @@ -479,7 +479,7 @@ public Optional getEthinicity(final JsonEnvelope event, final UUID i public Optional getHearingType(final JsonEnvelope event, final UUID id, final Requester requester) { LOGGER.info(" Calling {} to get hearing-type for {} ", REFERENCEDATA_QUERY_HEARING_TYPES, id); - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_QUERY_HEARING_TYPES) @@ -513,7 +513,7 @@ public Optional getNationalityByNationality(final JsonEnvelope event } private JsonEnvelope getNationalityResponse(final JsonEnvelope event, final Requester requester) { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final JsonEnvelope request = requester.request(envelop(payload) .withName(REFERENCEDATA_QUERY_NATIONALITIES) @@ -526,7 +526,7 @@ public Optional getProsecutor(final JsonEnvelope event, final UUID i LOGGER.info(" Calling {} to get prosecutors for {} ", REFERENCEDATA_QUERY_PROSECUTOR, id); - final JsonObject payload = Json.createObjectBuilder().add(ID, id.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(ID, id.toString()).build(); final JsonEnvelope request = requester.request(envelop(payload) @@ -546,7 +546,7 @@ public Optional getProsecutorV2(final JsonEnvelope event, final UUID LOGGER.info(" Calling {} to get prosecutors for {} ", REFERENCEDATA_QUERY_PROSECUTOR, id); - final JsonObject payload = Json.createObjectBuilder().add(ID, id.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(ID, id.toString()).build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_QUERY_PROSECUTOR) @@ -563,7 +563,7 @@ public Optional getCPSProsecutorByOuCode(final JsonEnvelope event, f LOGGER.info(" Calling {} to get prosecutors for {} ", REFERENCEDATA_QUERY_PROSECUTOR_BY_OUCODE, id); - final JsonObject payload = Json.createObjectBuilder().add(OUCODE, id) + final JsonObject payload = JsonObjects.createObjectBuilder().add(OUCODE, id) .add(CPS_FLAG, TRUE) .build(); @@ -583,7 +583,7 @@ public Optional getCPSProsecutors(final JsonEnvelope event, final Req LOGGER.info(" Calling {} to get prosecutors with cpsFlag true", REFERENCE_DATA_QUERY_CPS_PROSECUTORS); - final JsonObject payload = Json.createObjectBuilder() + final JsonObject payload = JsonObjects.createObjectBuilder() .add(CPS_FLAG, TRUE) .build(); @@ -669,7 +669,7 @@ public LjaDetails getLjaDetails(final JsonEnvelope jsonEnvelope, final String lj public Optional getPetForm(final JsonEnvelope event, final Requester requester) { LOGGER.info("Get PET FORM details with ID '{}'", event.metadata().streamId()); - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATA_QUERY_PET_FORM) .withMetadataFrom(event)); diff --git a/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceService.java b/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceService.java index 9e57af9b9..4a0252d08 100644 --- a/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceService.java +++ b/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service; import static java.util.Objects.nonNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.apache.commons.lang3.StringUtils.EMPTY; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.JsonObjects.getBoolean; @@ -17,7 +17,7 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonObjectBuilder; import javax.json.JsonValue; @@ -54,7 +54,7 @@ public class ReferenceDataOffenceService { public Optional getOffenceById(final UUID offenceId, final JsonEnvelope envelope, final Requester requester) { - final JsonObject payload = Json.createObjectBuilder().add(OFFENCE_ID, offenceId.toString()).build(); + final JsonObject payload = JsonObjects.createObjectBuilder().add(OFFENCE_ID, offenceId.toString()).build(); final JsonEnvelope response = requester.request(envelop(payload) .withName(REFERENCEDATAOFFENCE_GET_OFFENCE) @@ -68,7 +68,7 @@ public Optional getOffenceById(final UUID offenceId, final JsonEnvel return Optional.empty(); } final JsonObject offencePayload = response.payloadAsJsonObject(); - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); return buildOffence(offencePayload, jsonObjectBuilder); } @@ -149,7 +149,7 @@ public Optional> getMultipleOffencesByOffenceCodeList(final Lis } private JsonObject generateOffenceJsonObject(final JsonObject offencePayload) { - final JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder jsonObjectBuilder = JsonObjects.createObjectBuilder(); jsonObjectBuilder.add(CJS_OFFENCE_CODE, getString(offencePayload, CJS_OFFENCE_CODE).orElse(EMPTY)); jsonObjectBuilder.add(OFFENCE_ID, getString(offencePayload, OFFENCE_ID).orElse(EMPTY)); jsonObjectBuilder.add(MODE_OF_TRIAL, getString(offencePayload, MODEOFTRIAL_DERIVED).orElse(EMPTY)); diff --git a/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/service/ProgressionService.java b/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/service/ProgressionService.java index c75260f2f..7d205de4e 100644 --- a/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/service/ProgressionService.java +++ b/progression-refdata-service/src/main/java/uk/gov/moj/cpp/progression/service/service/ProgressionService.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.service.service; import static java.util.Objects.isNull; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.COMMAND_HANDLER; import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; diff --git a/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/RefDataServiceTest.java b/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/RefDataServiceTest.java index 5d5913ec5..c87027e79 100644 --- a/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/RefDataServiceTest.java +++ b/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/RefDataServiceTest.java @@ -4,9 +4,9 @@ import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; 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 javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; @@ -50,7 +50,7 @@ import java.util.UUID; import java.util.function.Function; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonArray; import javax.json.JsonObject; import javax.json.JsonReader; @@ -160,7 +160,7 @@ public void shouldRequestForOffenceByCjsOffenceCode() { public void shouldReturnPublicHolidays() throws IOException { final String jsonString = Resources.toString(Resources.getResource("referencedata.public-holidays.json"), Charset.defaultCharset()); - final JsonObject payload = Json.createReader(new ByteArrayInputStream(jsonString.getBytes())).readObject(); + final JsonObject payload = JsonObjects.createReader(new ByteArrayInputStream(jsonString.getBytes())).readObject(); final Envelope inputEnvelope = JsonEnvelope.envelopeFrom(DefaultJsonMetadata.metadataBuilder() .withId(randomUUID()) @@ -180,7 +180,7 @@ public void shouldReturnPublicHolidays() throws IOException { @Test public void shouldReturnEmptyListWhenPublicHolidaysServiceReturnsEmptyList() { - final JsonObject payload = Json.createObjectBuilder().build(); + final JsonObject payload = JsonObjects.createObjectBuilder().build(); final Envelope inputEnvelope = JsonEnvelope.envelopeFrom(DefaultJsonMetadata.metadataBuilder() .withId(randomUUID()) @@ -601,7 +601,7 @@ private JsonObject returnAsJson(final String jsonString) { private JsonEnvelope getEnvelope(final String name) { return envelopeFrom( JsonEnvelope.metadataBuilder().withId(randomUUID()).withName(name).build(), - Json.createObjectBuilder().build()); + JsonObjects.createObjectBuilder().build()); } private JsonEnvelope getEnvelope(final String name, final JsonObject jsonObject) { @@ -611,9 +611,9 @@ private JsonEnvelope getEnvelope(final String name, final JsonObject jsonObject) } private JsonObject getPayloadForOrgUnits(final String id) { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("organisationunits", createArrayBuilder() - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("id", id) .add("oucodeL3Name", "South Western (Lavender Hill)") .add("oucodeL3WelshName", "welshName_Test") @@ -623,17 +623,17 @@ private JsonObject getPayloadForOrgUnits(final String id) { } private JsonObject getPayloadForCourts() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("courts", createArrayBuilder() - .add(Json.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) + .add(JsonObjects.createObjectBuilder().add("oucode", "Redditch").add("oucodeL3Code", "B22KS00").build()) .build()) .build(); } private JsonObject getReferralReasonsPayload() { - return Json.createObjectBuilder() + return JsonObjects.createObjectBuilder() .add("referralReasons", createArrayBuilder() - .add(Json.createObjectBuilder() + .add(JsonObjects.createObjectBuilder() .add("id", "7e2f843e-d639-40b3-8611-8015f3a18957") .add("seqId", 1) .add("reason", "Sections 135") diff --git a/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceServiceTest.java b/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceServiceTest.java index 3110a3481..5b75bdbd9 100644 --- a/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceServiceTest.java +++ b/progression-refdata-service/src/test/java/uk/gov/moj/cpp/progression/service/ReferenceDataOffenceServiceTest.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Optional; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; import javax.json.JsonValue; @@ -172,7 +172,7 @@ void shouldReturnEmptyJsonObjectWhenOffencesResponsePayloadIsEmpty() { final List offenceCodes = Arrays.asList(offenceCode1, offenceCode2); - final JsonObject responsePayload = Json.createReader( + final JsonObject responsePayload = JsonObjects.createReader( new ByteArrayInputStream("{\"offences\":[]}".getBytes())) .readObject(); @@ -253,7 +253,7 @@ private static JsonEnvelope prepareResponseEnvelopeForOffencesList(final String .replace("OFFENCE_CODE_1", offenceCode1) .replace("OFFENCE_CODE_2", offenceCode2); try { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonString)); return createEnvelope("referencedataoffences.query.offences-list", jsonReader.readObject()); } catch (final Exception e) { throw new RuntimeException(e); @@ -264,7 +264,7 @@ private static JsonEnvelope prepareResponseEnvelopeForOffencesList(final String final String jsonString = givenPayload(fileName).toString() .replace("OFFENCE_CODE", offenceCode); try { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonString)); return createEnvelope("referencedataoffences.query.offences-list", jsonReader.readObject()); } catch (final Exception e) { throw new RuntimeException(e); @@ -276,7 +276,7 @@ private static JsonEnvelope prepareResponseEnvelopeForOffencesListWhichOneOfThem .replace("OFFENCE_CODE_1", offenceCode1) .replace("OFFENCE_CODE_2", offenceCode2); try { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonString)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonString)); return createEnvelope("referencedataoffences.query.offences-list", jsonReader.readObject()); } catch (final Exception e) { throw new RuntimeException(e); diff --git a/progression-test-utilities/src/main/java/uk/gov/moj/cpp/progression/test/FileUtil.java b/progression-test-utilities/src/main/java/uk/gov/moj/cpp/progression/test/FileUtil.java index dfaffa74f..66696c9da 100644 --- a/progression-test-utilities/src/main/java/uk/gov/moj/cpp/progression/test/FileUtil.java +++ b/progression-test-utilities/src/main/java/uk/gov/moj/cpp/progression/test/FileUtil.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.progression.test; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; @@ -9,7 +9,7 @@ import java.io.StringReader; import java.util.Objects; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.json.JsonObject; import javax.json.JsonReader; @@ -47,7 +47,7 @@ public static JsonObject givenPayload(final String filePath) throws IOException } public static JsonObject jsonFromString(final String jsonObjectStr) { - final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr)); + final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonObjectStr)); final JsonObject object = jsonReader.readObject(); jsonReader.close(); diff --git a/progression-viewstore/progression-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncase/persistence/entity/utils/SearchCaseBuilder.java b/progression-viewstore/progression-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncase/persistence/entity/utils/SearchCaseBuilder.java index 818112c60..90542e07f 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncase/persistence/entity/utils/SearchCaseBuilder.java +++ b/progression-viewstore/progression-viewstore-persistence/src/main/java/uk/gov/moj/cpp/prosecutioncase/persistence/entity/utils/SearchCaseBuilder.java @@ -14,7 +14,7 @@ import java.util.UUID; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.commons.lang3.StringUtils; @@ -267,7 +267,7 @@ public SearchCaseBuilder.CaseBuilder withDefendantFullName() { } public SearchCaseBuilder.CaseBuilder withResultPayload() { - resultPayload = Json.createObjectBuilder() + resultPayload = JsonObjects.createObjectBuilder() .add(CASE_ID, this.caseId) .add(REFERENCE, this.reference) .add(DEFENDANT_NAME, defendantFullName) diff --git a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseDefendantHearingRepositoryTest.java b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseDefendantHearingRepositoryTest.java index 53045a154..a350adbe0 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseDefendantHearingRepositoryTest.java +++ b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseDefendantHearingRepositoryTest.java @@ -18,7 +18,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; import org.junit.Before; @@ -55,15 +55,15 @@ public void setUp() { caseDefendantHearingKey.setHearingId(randomUUID()); final HearingResultLineEntity hearingResultLineEntity = new HearingResultLineEntity(); - hearingResultLineEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingResultLineEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingResultLineEntity.setId(randomUUID()); final Set resultLines = new HashSet<>(); - resultLines.add(new HearingResultLineEntity(randomUUID(), Json.createObjectBuilder().build().toString(), null)); + resultLines.add(new HearingResultLineEntity(randomUUID(), JsonObjects.createObjectBuilder().build().toString(), null)); final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(caseDefendantHearingKey.getHearingId()); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); hearingEntity.addResultLine(hearingResultLineEntity); hearingEntity.setResultLines(resultLines); @@ -151,12 +151,12 @@ public void shouldRemoveByHearingId() { private void saveEntity(final UUID hearingId, final UUID caseId, final UUID defendantId, final UUID resultId) { final HearingResultLineEntity hearingResultLineEntity = new HearingResultLineEntity(); - hearingResultLineEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingResultLineEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingResultLineEntity.setId(resultId); final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(hearingId); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); hearingEntity.addResultLine(hearingResultLineEntity); hearingRepository.save(hearingEntity); diff --git a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseLinkSplitMergeRepositoryTest.java b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseLinkSplitMergeRepositoryTest.java index dbe383f34..d2c7274bc 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseLinkSplitMergeRepositoryTest.java +++ b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/CaseLinkSplitMergeRepositoryTest.java @@ -15,7 +15,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; import org.junit.Test; @@ -83,7 +83,7 @@ private void saveEntity(final UUID caseId, final UUID linkedCaseId, final LinkTy private ProsecutionCaseEntity getProsecutionCaseEntity(final UUID prosecutionCaseId) { final ProsecutionCaseEntity prosecutionCaseEntity = new ProsecutionCaseEntity(); prosecutionCaseEntity.setCaseId(prosecutionCaseId); - prosecutionCaseEntity.setPayload(Json.createObjectBuilder().build().toString()); + prosecutionCaseEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); prosecutionCaseRepository.save(prosecutionCaseEntity); return prosecutionCaseEntity; } diff --git a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingApplicationRepositoryTest.java b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingApplicationRepositoryTest.java index 31c28db55..74a206cd5 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingApplicationRepositoryTest.java +++ b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingApplicationRepositoryTest.java @@ -15,7 +15,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; import org.junit.Before; @@ -44,12 +44,12 @@ public void setUp() { APPLICATION_ID = randomUUID(); final HearingResultLineEntity hearingResultLineEntity = new HearingResultLineEntity(); - hearingResultLineEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingResultLineEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingResultLineEntity.setId(RESULT_ID); final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(HEARING_ID); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); hearingEntity.addResultLine(hearingResultLineEntity); diff --git a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingRepositoryTest.java b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingRepositoryTest.java index a7e392ddb..81b42a461 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingRepositoryTest.java +++ b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/HearingRepositoryTest.java @@ -17,7 +17,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; import org.junit.Before; @@ -52,7 +52,7 @@ public class HearingRepositoryTest { public void setUp() { final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(HEARING_ID); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); hearingRepository.save(hearingEntity); @@ -67,11 +67,11 @@ public void setUp() { public void shouldRemoveResultLineEntityByHearingId() throws Exception { //given final HearingResultLineEntity hearingResultLineEntityOne = new HearingResultLineEntity(); - hearingResultLineEntityOne.setPayload(Json.createObjectBuilder().build().toString()); + hearingResultLineEntityOne.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingResultLineEntityOne.setId(RESULT_ID_ONE); final HearingResultLineEntity hearingResultLineEntityTwo = new HearingResultLineEntity(); - hearingResultLineEntityTwo.setPayload(Json.createObjectBuilder().build().toString()); + hearingResultLineEntityTwo.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingResultLineEntityTwo.setId(RESULT_ID_TWO); final HearingEntity actual = hearingRepository.findBy(HEARING_ID); diff --git a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/MatchDefendantCaseHearingRepositoryTest.java b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/MatchDefendantCaseHearingRepositoryTest.java index a951873db..86ddb0caa 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/MatchDefendantCaseHearingRepositoryTest.java +++ b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/MatchDefendantCaseHearingRepositoryTest.java @@ -25,7 +25,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import javax.persistence.NonUniqueResultException; import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; @@ -179,11 +179,11 @@ private void saveEntity(UUID defendantId, UUID masterDefendantId, UUID prosecuti private HearingEntity getHearingEntity(UUID resultId, UUID hearingId) { final HearingResultLineEntity hearingResultLineEntity = new HearingResultLineEntity(); - hearingResultLineEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingResultLineEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingResultLineEntity.setId(resultId); final HearingEntity hearingEntity = new HearingEntity(); hearingEntity.setHearingId(hearingId); - hearingEntity.setPayload(Json.createObjectBuilder().build().toString()); + hearingEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); hearingEntity.setListingStatus(HearingListingStatus.HEARING_INITIALISED); hearingEntity.addResultLine(hearingResultLineEntity); return hearingEntity; @@ -192,7 +192,7 @@ private HearingEntity getHearingEntity(UUID resultId, UUID hearingId) { private ProsecutionCaseEntity getProsecutionCaseEntity(UUID prosecutionCaseId) { final ProsecutionCaseEntity prosecutionCaseEntity = new ProsecutionCaseEntity(); prosecutionCaseEntity.setCaseId(prosecutionCaseId); - prosecutionCaseEntity.setPayload(Json.createObjectBuilder().build().toString()); + prosecutionCaseEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); return prosecutionCaseEntity; } diff --git a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationCaseRepositoryTest.java b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationCaseRepositoryTest.java index dfcb9f55c..ba6dc3bac 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationCaseRepositoryTest.java +++ b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationCaseRepositoryTest.java @@ -14,7 +14,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; import org.junit.Before; @@ -49,8 +49,8 @@ public void setUp() { prosecutionCaseEntity = new ProsecutionCaseEntity(); prosecutionCaseEntity.setCaseId(CASE_ID); - prosecutionCaseEntity.setPayload(Json.createObjectBuilder() - .add("defendants", Json.createArrayBuilder().add(Json.createObjectBuilder() + prosecutionCaseEntity.setPayload(JsonObjects.createObjectBuilder() + .add("defendants", JsonObjects.createArrayBuilder().add(JsonObjects.createObjectBuilder() .add("id", randomUUID().toString()).build()) .build()).add("caseStatus", "INACTIVE") .build().toString()); @@ -58,7 +58,7 @@ public void setUp() { courtApplicationEntity = new CourtApplicationEntity(); - courtApplicationEntity.setPayload(Json.createObjectBuilder().build().toString()); + courtApplicationEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); courtApplicationEntity.setApplicationId(APPLICATION_ID); courtApplicationCaseKey = new CourtApplicationCaseKey(randomUUID(), APPLICATION_ID, CASE_ID); diff --git a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationRepositoryTest.java b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationRepositoryTest.java index 357061e47..5eecedcbe 100644 --- a/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationRepositoryTest.java +++ b/progression-viewstore/progression-viewstore-persistence/src/test/java/uk/gov/moj/cpp/prosecutioncase/persistence/repository/CourtApplicationRepositoryTest.java @@ -10,7 +10,7 @@ import java.util.UUID; import javax.inject.Inject; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import org.apache.deltaspike.testcontrol.api.junit.CdiTestRunner; import org.junit.Before; @@ -57,7 +57,7 @@ public void shouldGetApplicationsByListOfApplicationIds() { private void saveApplication(final UUID applicationId) { courtApplicationEntity = new CourtApplicationEntity(); - courtApplicationEntity.setPayload(Json.createObjectBuilder().build().toString()); + courtApplicationEntity.setPayload(JsonObjects.createObjectBuilder().build().toString()); courtApplicationEntity.setApplicationId(applicationId); courtApplicationRepository.save(courtApplicationEntity); }