PEG-2848-R14: merge from team/PEG-2848-R

azure-pipelines.yaml

@@ -26,7 +26,7 @@ resources:
 pool:
   name: "MDV-ADO-AGENT-AKS-01"
   demands:
-    - identifier -equals centos8-j17
+    - identifier -equals ubuntu-j17
 
 
 variables:
@@ -50,3 +50,4 @@ stages:
           sonarQubeType: 'sonarQubeAKS'
           serviceName: ${{ variables['service_Name'] }}
           itTestFolder: ${{ variables['itTest_Folder'] }}
+          aksDeployBranch: "dev/PEG-2744-proactive-processing"

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.103.3</version>
+        <version>17.103.9</version>
     </parent>
 
 

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");
 

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();

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;

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"))

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));

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))
         );

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;

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;

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<String, JsonValue> entry : origin.entrySet()) {
             builder.add(entry.getKey(), entry.getValue());
         }

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));
 

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));
 

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;

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<Permission> 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);

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";

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;

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<JsonObject> requestEnvelope = Enveloper.envelop(getUserGroupsForUserRequest)
                 .withName(DEFENCE_ASSOCIATION_QUERY).withMetadataFrom(envelope);
         final Envelope<JsonObject> response = requester.requestAsAdmin(requestEnvelope, JsonObject.class);
@@ -33,7 +33,7 @@ public final List<UUID> 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<JsonObject> requestEnvelope = Enveloper.envelop(request)
                 .withName(DEFENCE_ASSOCIATED_DEFENDANTS_QUERY).withMetadataFrom(envelope);
         final Envelope<JsonObject> response = requester.requestAsAdmin(requestEnvelope, JsonObject.class);

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;

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<String> 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<JsonObject> response = requester.request(requestEnvelope, JsonObject.class);

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();
 

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;

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();
 

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();