Dev/sjp rebase

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.103.11</version>
+        <version>17.104.3</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.sjp</groupId>
@@ -42,7 +42,7 @@
         <access-control-sjp-providers.version>4.1.4-ATCM</access-control-sjp-providers.version>
         <material.version>17.0.57</material.version>
         <notification.notify.version>17.0.1</notification.notify.version>
-        <referencedata.version>17.103.131</referencedata.version>
+        <referencedata.version>17.103.133</referencedata.version>
         <referencedata.offences.version>17.0.38</referencedata.offences.version>
         <scheduling.version>17.0.11</scheduling.version>
         <authorisation.service.version>0.1.49</authorisation.service.version>
@@ -53,7 +53,7 @@
         <cpp.framework.action.mapping.enabled>true</cpp.framework.action.mapping.enabled>
         <mvn.site.url>file://${project.build.directory}/site</mvn.site.url>
         <file.alfresco.version>2.3.0</file.alfresco.version>
-        <coredomain.version>17.103.13</coredomain.version>
+        <coredomain.version>17.104.4</coredomain.version>
         <criminal-court-public-model.version>${coredomain.version}</criminal-court-public-model.version>
         <javax.el-api.version>3.0.0</javax.el-api.version>
         <joda-time.version>2.10</joda-time.version>

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApi.java

@@ -1,16 +1,15 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
+import static java.util.Objects.nonNull;
 import static java.util.Optional.ofNullable;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
-import static javax.json.Json.createArrayBuilder;
-import static java.util.Objects.nonNull;
-
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
 import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
+import static uk.gov.justice.services.messaging.JsonObjects.getBoolean;
 import static uk.gov.justice.services.messaging.JsonObjects.getLong;
 import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress;
 import static uk.gov.moj.cpp.sjp.command.api.service.ContactDetailsService.convertBlankEmailsToNull;
-import static uk.gov.justice.services.messaging.JsonObjects.getBoolean;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/EmployerApi.java

@@ -1,17 +1,17 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
 import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;
 import uk.gov.justice.services.core.enveloper.Enveloper;
 import uk.gov.justice.services.core.sender.Sender;
 import uk.gov.justice.services.messaging.JsonEnvelope;
-import uk.gov.justice.services.messaging.JsonObjects;
 
 import javax.inject.Inject;
-import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 
@@ -35,14 +35,14 @@ public class EmployerApi {
     public void updateEmployer(final JsonEnvelope envelope) {
         final JsonObject payloadAsJsonObject = envelope.payloadAsJsonObject();
         //TODO ATCM-3151: when the UI is adapted remove this code below
-        final JsonObjectBuilder employerDetails = JsonObjects.createObjectBuilderWithFilter(payloadAsJsonObject,
+        final JsonObjectBuilder employerDetails = createObjectBuilderWithFilter(payloadAsJsonObject,
                 key -> !(CASE_ID.equals(key) || DEFENDANT_ID.equals(key) || ADDRESS.equals(key)));
 
         if (payloadAsJsonObject.containsKey(ADDRESS)) {
             employerDetails.add(ADDRESS, normalizePostcodeInAddress(payloadAsJsonObject.getJsonObject(ADDRESS)));
         }
 
-        final JsonObject payload = Json.createObjectBuilder()
+        final JsonObject payload = createObjectBuilder()
                 .add(CASE_ID, payloadAsJsonObject.getString(CASE_ID))
                 .add(DEFENDANT_ID, payloadAsJsonObject.getString(DEFENDANT_ID))
                 .add("employer", employerDetails)

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/PleadOnlineApi.java

@@ -3,7 +3,9 @@
 import static java.util.Arrays.asList;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilderWithFilter;
+import static uk.gov.justice.services.messaging.JsonObjects.createReader;
 import static uk.gov.moj.cpp.sjp.command.api.service.AddressService.normalizePostcodeInAddress;
 
 import uk.gov.justice.json.schemas.domains.sjp.command.PleadAocpOnline;
@@ -19,22 +21,22 @@
 import uk.gov.justice.services.messaging.Envelope;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.moj.cpp.sjp.command.api.validator.PleadOnlineValidator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 
 import java.io.StringReader;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
 import javax.inject.Inject;
-import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonReader;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 @ServiceComponent(COMMAND_API)
 public class PleadOnlineApi {
 
@@ -82,7 +84,7 @@ public void pleadOnline(final Envelope<PleadOnline> envelope) {
         checkValidationErrors(validationErrors);
 
         final JsonObjectBuilder pleaOnlineObjectBuilder = createObjectBuilderWithFilter(payload, field -> !asList(PERSONAL_DETAILS, EMPLOYER).contains(field));
-        if (payload.containsKey(PERSONAL_DETAILS))  {
+        if (payload.containsKey(PERSONAL_DETAILS)) {
             pleaOnlineObjectBuilder.add(PERSONAL_DETAILS, replacePostcodeInPayload(payload, PERSONAL_DETAILS));
         }
 
@@ -143,7 +145,7 @@ private void checkValidationErrors(Map<String, List<String>> validationErrors) {
 
 
     private JsonObject getCaseDetail(final Envelope<PleadOnline> envelope) {
-        final JsonObject queryCasePayload = Json.createObjectBuilder()
+        final JsonObject queryCasePayload = createObjectBuilder()
                 .add("caseId", envelope.payload().getCaseId().toString())
                 .build();
 
@@ -166,7 +168,7 @@ private JsonObjectBuilder replacePostcodeInPayload(final JsonObject payload, fin
     }
 
     private static JsonObject jsonFromString(final String jsonObjectStr) {
-        final JsonReader jsonReader = Json.createReader(new StringReader(jsonObjectStr));
+        final JsonReader jsonReader = createReader(new StringReader(jsonObjectStr));
         final JsonObject object = jsonReader.readObject();
         jsonReader.close();
         return object;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/ResolveCaseStatusApi.java

@@ -1,7 +1,7 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SessionApi.java

@@ -3,6 +3,7 @@
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.adapter.rest.exception.BadRequestException;
 import uk.gov.justice.services.core.annotation.Handles;
@@ -16,7 +17,6 @@
 import uk.gov.moj.cpp.sjp.domain.SessionCourt;
 
 import javax.inject.Inject;
-import javax.json.Json;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 
@@ -43,7 +43,7 @@ public void startSession(final JsonEnvelope startSessionCommand) {
         final SessionCourt sessionCourt = referenceDataService.getCourtByCourtHouseOUCode(courtHouseOUCode, startSessionCommand)
                 .orElseThrow(() -> new BadRequestException(String.format("Court house with ou code %s not found", courtHouseOUCode)));
 
-        final JsonObjectBuilder startSessionBuilder = Json.createObjectBuilder()
+        final JsonObjectBuilder startSessionBuilder = createObjectBuilder()
                 .add(SESSION_ID, commandPayload.getString(SESSION_ID))
                 .add("courtHouseCode", courtHouseOUCode)
                 .add("courtHouseName", sessionCourt.getCourtHouseName())

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/SetDatesToAvoidRequiredApi.java

@@ -1,7 +1,7 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/CaseService.java

@@ -1,8 +1,8 @@
 package uk.gov.moj.cpp.sjp.command.api.service;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.ServiceComponent;
 import uk.gov.justice.services.core.requester.Requester;

sjp-command/sjp-command-api/src/main/java/uk/gov/moj/cpp/sjp/command/api/service/ReferenceDataService.java

@@ -1,9 +1,9 @@
 package uk.gov.moj.cpp.sjp.command.api.service;
 
-import static javax.json.Json.createObjectBuilder;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 
 import uk.gov.justice.services.core.annotation.ServiceComponent;
 import uk.gov.justice.services.core.enveloper.Enveloper;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionAccountNumberBdfApiTest.java

@@ -3,7 +3,6 @@
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
 import static java.util.Collections.singletonMap;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,6 +11,7 @@
 import static org.mockito.Mockito.verify;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AddFinancialImpositionCorrelationIdApiTest.java

@@ -3,7 +3,6 @@
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
 import static java.util.Collections.singletonMap;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -12,6 +11,7 @@
 import static org.mockito.Mockito.verify;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher.payloadIsJson;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/AocpResponseTimeExpiredApiTest.java

@@ -1,12 +1,12 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.verify;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseNoteApiTest.java

@@ -5,7 +5,6 @@
 import static java.util.Collections.singletonMap;
 import static java.util.Objects.nonNull;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -19,6 +18,7 @@
 import static uk.gov.justice.json.schemas.domains.sjp.NoteType.DECISION;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMatcher.jsonEnvelope;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CaseReopenedApiTest.java

@@ -5,6 +5,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.verify;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom;
 
 import uk.gov.justice.services.adapter.rest.exception.BadRequestException;
@@ -18,8 +19,6 @@
 import java.util.UUID;
 import java.util.function.Consumer;
 
-import javax.json.Json;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
@@ -75,7 +74,7 @@ public void shouldUpdateCaseReopenedWhenValidDates() {
 
     @Test
     public void shouldUndoCaseReopened() {
-        final JsonEnvelope command = EnvelopeFactory.createEnvelope(COMMAND_UNDO, Json.createObjectBuilder().build());
+        final JsonEnvelope command = EnvelopeFactory.createEnvelope(COMMAND_UNDO, createObjectBuilder().build());
 
         caseReopenedApi.undoCaseReopenedInLibra(command);
 
@@ -116,7 +115,7 @@ private void shouldPropagateCommandWhenValidDates(final Consumer<JsonEnvelope> f
 
     private JsonEnvelope getEnvelope(final String reopenedDate, final String command) {
         return EnvelopeFactory.createEnvelope(command,
-                Json.createObjectBuilder()
+                createObjectBuilder()
                         .add("caseId", caseId)
                         .add("reopenedDate", reopenedDate)
                         .add("libraCaseNumber", libraCaseId)

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApiTest.java

@@ -1,24 +1,24 @@
 package uk.gov.moj.cpp.sjp.command.api;
 
-import static javax.json.Json.createObjectBuilder;
+import static java.util.UUID.randomUUID;
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope;
 import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;
 import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildAddressWithPostcode;
 import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddress;
+import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddressAndOffences;
 import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddressAndOffencesWithAOCPEligibilityAndStandardPenalty;
 import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithContactDetails;
-import static uk.gov.moj.cpp.sjp.command.utils.CommonObjectBuilderUtil.buildDefendantWithAddressAndOffences;
-import static java.util.UUID.randomUUID;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric;
 
 import uk.gov.justice.services.core.enveloper.Enveloper;
 import uk.gov.justice.services.core.sender.Sender;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/CreateCaseApplicationApiTest.java

@@ -2,14 +2,14 @@
 
 import static java.util.Collections.singletonMap;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope;

sjp-command/sjp-command-api/src/test/java/uk/gov/moj/cpp/sjp/command/api/DecisionApiTest.java

@@ -8,8 +8,6 @@
 import static java.util.Objects.nonNull;
 import static java.util.Optional.ofNullable;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createArrayBuilder;
-import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -20,6 +18,8 @@
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
+import static uk.gov.justice.services.messaging.JsonObjects.createArrayBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerClassMatcher.isHandlerClass;
 import static uk.gov.justice.services.test.utils.core.matchers.HandlerMethodMatcher.method;
 import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;