Dev/peg 2848 new changes from main rebase

pom.xml

@@ -4,12 +4,12 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.103.3</version>
+        <version>17.103.9-M1</version>
     </parent>
 
     <groupId>uk.gov.moj.cpp.subscriptions</groupId>
     <artifactId>subscriptions-parent</artifactId>
-    <version>17.0.46-SNAPSHOT</version>
+    <version>17.0.47-PEG-2848-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Subscription Microservice - Parent</name>
     <description>Subscription Microservice - Subscription Context</description>

subscriptions-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-parent</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

subscriptions-command/subscriptions-command-api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-command</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java

@@ -1,6 +1,6 @@
 package uk.gov.moj.cpp.subscriptions.command.api.service;
 
-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.COMMAND_API;
 

subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java

@@ -1,7 +1,7 @@
 package uk.gov.moj.cpp.subscriptions.command.api;
 
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;

subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java

@@ -2,7 +2,7 @@
 
 
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;

subscriptions-command/subscriptions-command-handler/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-command</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.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.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.mockito.ArgumentMatchers.any;

subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java

@@ -4,7 +4,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.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.mockito.ArgumentMatchers.any;

subscriptions-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-parent</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
 
     <artifactId>subscriptions-domain</artifactId>

subscriptions-domain/subscriptions-domain-aggregate/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-domain</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
 
     <artifactId>subscriptions-domain-aggregate</artifactId>

subscriptions-domain/subscriptions-domain-event/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-domain</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
 
     <artifactId>subscriptions-domain-event</artifactId>

subscriptions-domain/subscriptions-domain-transformation/pom.xml

@@ -3,12 +3,12 @@
     <parent>
         <artifactId>subscriptions-domain</artifactId>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>subscriptions-domain-transformation</artifactId>
-  <version>17.0.46-SNAPSHOT</version>
+  <version>17.0.47-PEG-2848-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 

subscriptions-domain/subscriptions-domain-value-schema/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>subscriptions-domain</artifactId>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

subscriptions-event-sources/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>subscriptions-parent</artifactId>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

subscriptions-event/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>subscriptions-parent</artifactId>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

subscriptions-event/subscriptions-event-listener/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-event</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

subscriptions-event/subscriptions-event-processor/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-event</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java

@@ -2,7 +2,7 @@
 
 
 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.messaging.Envelope.envelopeFrom;
 import static uk.gov.justice.services.messaging.Envelope.metadataFrom;

subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java

@@ -1,6 +1,6 @@
 package uk.gov.moj.cpp.subscriptions.event.processor.service;
 
-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.core.annotation.Component.EVENT_PROCESSOR;
 import static uk.gov.justice.services.messaging.Envelope.envelopeFrom;

subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.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.slf4j.LoggerFactory.getLogger;
 import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;

subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java

@@ -1,7 +1,7 @@
 package uk.gov.moj.cpp.subscriptions.event.processor.service;
 
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;
 
 import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;

subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java

@@ -2,7 +2,7 @@
 
 import static java.lang.String.format;
 import static java.util.UUID.randomUUID;
-import static javax.json.Json.createObjectBuilder;
+import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.verify;

subscriptions-healthchecks/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>subscriptions-parent</artifactId>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

subscriptions-integration-test/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.subscriptions</groupId>
         <artifactId>subscriptions-parent</artifactId>
-        <version>17.0.46-SNAPSHOT</version>
+        <version>17.0.47-PEG-2848-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java

@@ -13,7 +13,7 @@
 import uk.gov.moj.cpp.platform.test.feature.toggle.FeatureStubber;
 import uk.gov.moj.cpp.subscriptions.helper.EventListener;
 
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -88,7 +88,7 @@ public void shouldDeleteSubscriptionByAdmin() {
     private void deleteAndVerifySubscription() {
         final EventListener eventListener = new EventListener(SUBSCRIPTION_DELETE_PUBLIC_EVENT);
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -109,7 +109,7 @@ private void deleteAndVerifySubscription() {
     private void activateAndVerifySubscription() {
         final EventListener eventListener = new EventListener(SUBSCRIPTION_ACTIVATE_PUBLIC_EVENT);
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -141,7 +141,7 @@ private void activateAndVerifySubscription() {
     private void deactivateAndVerifySubscription() {
         final EventListener eventListener = new EventListener(SUBSCRIPTION_DEACTIVATE_PUBLIC_EVENT);
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),

subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java

@@ -7,7 +7,7 @@
 import static java.lang.System.lineSeparator;
 import static java.util.UUID.randomUUID;
 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.Response.Status.OK;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;

subscriptions-integration-test/src/test/java/it/SubscriberIT.java

@@ -32,7 +32,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.json.Json;
+import uk.gov.justice.services.messaging.JsonObjects;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -127,7 +127,7 @@ private void deleteSubscriberVerify() {
 
 
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -181,7 +181,7 @@ private void deleteSubscriberAndDeactivateSubscriptionAndVerify() {
         final EventListener deleteSubscriptionEventListener = new EventListener(SUBSCRIPTION_DEACTIVATE_PUBLIC_EVENT);
 
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -212,7 +212,7 @@ private void deleteSubscriberAndSubscriptionAndVerify() {
         final EventListener deleteSubscriptionEventListener = new EventListener(SUBSCRIPTION_DELETE_PUBLIC_EVENT);
 
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -240,7 +240,7 @@ private void deleteSubscriberFailed(final String reason) {
 
         final EventListener eventListener = new EventListener(SUBSCRIBER_DELETE_FAILED_PUBLIC_EVENT);
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -257,7 +257,7 @@ private void deleteSubscriberFailed(final String reason) {
     private void deleteAndVerifySubscription() {
         final EventListener eventListener = new EventListener(SUBSCRIPTION_DELETE_PUBLIC_EVENT);
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -281,7 +281,7 @@ private void subscribeAndVerifySubscription() {
 
         final EventListener eventListener = new EventListener(SUBSCRIPTION_SUBSCRIBE_PUBLIC_EVENT);
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),
@@ -316,7 +316,7 @@ private void unsubscribeAndVerifySubscription(final boolean subscriptionActive)
 
         final EventListener eventListener = new EventListener(SUBSCRIPTION_UNSUBSCRIBE_PUBLIC_EVENT);
         //given
-        final String payload = Json.createObjectBuilder().build().toString();
+        final String payload = JsonObjects.createObjectBuilder().build().toString();
 
         //when
         makePostCall(getWriteUrl(format("/subscriptions/%s", ID)),