From 1d74db76d7d8508219ef2ff83acd28d5a0f11be5 Mon Sep 17 00:00:00 2001 From: erolkurelihmcts <134499553+erolkurelihmcts@users.noreply.github.com> Date: Tue, 3 Feb 2026 12:57:16 +0000 Subject: [PATCH 1/5] CHD-1832: upgrade framework e (#18) Co-authored-by: Erol Kureli <> --- pom.xml | 6 +++--- subscriptions-command/pom.xml | 2 +- .../subscriptions-command-api/pom.xml | 2 +- .../api/service/UserAndGroupsService.java | 2 +- .../command/api/SubscriberCommandApiTest.java | 2 +- .../api/SubscriptionCommandApiTest.java | 2 +- .../subscriptions-command-handler/pom.xml | 2 +- .../handler/SubscriberHandlerTest.java | 2 +- .../handler/SubscriptionHandlerTest.java | 2 +- subscriptions-domain/pom.xml | 2 +- .../subscriptions-domain-aggregate/pom.xml | 2 +- .../subscriptions-domain-event/pom.xml | 2 +- .../pom.xml | 4 ++-- .../subscriptions-domain-value-schema/pom.xml | 2 +- subscriptions-event-sources/pom.xml | 2 +- subscriptions-event/pom.xml | 2 +- .../subscriptions-event-listener/pom.xml | 2 +- .../subscriptions-event-processor/pom.xml | 2 +- .../processor/NotificationEventProcessor.java | 2 +- .../processor/service/EmailInfoSender.java | 2 +- .../processor/service/HearingService.java | 2 +- .../service/SubscriptionsQueryService.java | 2 +- .../NotificationEventProcessorTest.java | 2 +- subscriptions-healthchecks/pom.xml | 2 +- subscriptions-integration-test/pom.xml | 2 +- .../test/java/it/CreateSubscriptionIT.java | 8 ++++---- .../test/java/it/NotificationServiceIT.java | 3 +-- .../src/test/java/it/SubscriberIT.java | 18 ++++++++---------- .../it/SubscriptionsFeatureDisableIT.java | 19 +++++++++---------- .../cpp/subscriptions/helper/RestHelper.java | 5 ++--- subscriptions-query/pom.xml | 2 +- .../subscriptions-query-api/pom.xml | 2 +- .../api/service/UserAndGroupsService.java | 2 +- .../query/api/SubscriptionsQueryApiTest.java | 2 +- .../subscriptions-query-view/pom.xml | 2 +- .../query/SubscriptionsQueryView.java | 2 +- subscriptions-service/pom.xml | 2 +- subscriptions-viewstore/pom.xml | 2 +- .../subscriptions-viewstore-liquibase/pom.xml | 2 +- .../pom.xml | 2 +- 40 files changed, 62 insertions(+), 67 deletions(-) diff --git a/pom.xml b/pom.xml index 92b34be..153d152 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.3 + 17.104.0 uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT pom Subscription Microservice - Parent Subscription Microservice - Subscription Context @@ -21,7 +21,7 @@ git file://${project.build.directory}/site true - 17.103.10 + 17.104.1 17.0.24 17.0.75 17.0.133 diff --git a/subscriptions-command/pom.xml b/subscriptions-command/pom.xml index 7c23190..4fbbe56 100755 --- a/subscriptions-command/pom.xml +++ b/subscriptions-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/pom.xml b/subscriptions-command/subscriptions-command-api/pom.xml index c664c4a..e62dc23 100755 --- a/subscriptions-command/subscriptions-command-api/pom.xml +++ b/subscriptions-command/subscriptions-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java b/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java index 1e3b52f..961e86f 100644 --- a/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java b/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java index 17315a1..fc09eaa 100644 --- a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java b/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java index 8b5f8ae..edd4bd0 100644 --- a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-handler/pom.xml b/subscriptions-command/subscriptions-command-handler/pom.xml index 8489d09..aa39ecd 100644 --- a/subscriptions-command/subscriptions-command-handler/pom.xml +++ b/subscriptions-command/subscriptions-command-handler/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java b/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java index e320bc9..eb85b30 100644 --- a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java b/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java index cee6620..5374bb6 100644 --- a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java +++ b/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; diff --git a/subscriptions-domain/pom.xml b/subscriptions-domain/pom.xml index c1b8ed9..0839d35 100755 --- a/subscriptions-domain/pom.xml +++ b/subscriptions-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT subscriptions-domain diff --git a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml index 8ac054b..696b07f 100644 --- a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml +++ b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT subscriptions-domain-aggregate diff --git a/subscriptions-domain/subscriptions-domain-event/pom.xml b/subscriptions-domain/subscriptions-domain-event/pom.xml index cd5839c..ebad432 100644 --- a/subscriptions-domain/subscriptions-domain-event/pom.xml +++ b/subscriptions-domain/subscriptions-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT subscriptions-domain-event diff --git a/subscriptions-domain/subscriptions-domain-transformation/pom.xml b/subscriptions-domain/subscriptions-domain-transformation/pom.xml index 8a79dcf..69a057e 100644 --- a/subscriptions-domain/subscriptions-domain-transformation/pom.xml +++ b/subscriptions-domain/subscriptions-domain-transformation/pom.xml @@ -3,12 +3,12 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 subscriptions-domain-transformation - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT pom diff --git a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml index 43cfeaa..dbf2e4a 100644 --- a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml +++ b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml @@ -3,7 +3,7 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-event-sources/pom.xml b/subscriptions-event-sources/pom.xml index 52e4806..741b32d 100644 --- a/subscriptions-event-sources/pom.xml +++ b/subscriptions-event-sources/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/pom.xml b/subscriptions-event/pom.xml index 6e68886..759ad93 100755 --- a/subscriptions-event/pom.xml +++ b/subscriptions-event/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-listener/pom.xml b/subscriptions-event/subscriptions-event-listener/pom.xml index 47fea62..6be0510 100755 --- a/subscriptions-event/subscriptions-event-listener/pom.xml +++ b/subscriptions-event/subscriptions-event-listener/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/pom.xml b/subscriptions-event/subscriptions-event-processor/pom.xml index fc1f37b..2455972 100755 --- a/subscriptions-event/subscriptions-event-processor/pom.xml +++ b/subscriptions-event/subscriptions-event-processor/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java index 2c29b3a..c989969 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java index 6f3986b..0939c8e 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java index 264568a..31bb5ae 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java index c23f0a5..9b023cb 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java b/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java index 761422c..ec98a4c 100644 --- a/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java +++ b/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; diff --git a/subscriptions-healthchecks/pom.xml b/subscriptions-healthchecks/pom.xml index c4ba6e4..b93c5c6 100644 --- a/subscriptions-healthchecks/pom.xml +++ b/subscriptions-healthchecks/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/pom.xml b/subscriptions-integration-test/pom.xml index 0aaa0fa..3d23103 100755 --- a/subscriptions-integration-test/pom.xml +++ b/subscriptions-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java b/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java index 4e4f1ec..9c3b97b 100644 --- a/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java +++ b/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java @@ -13,10 +13,10 @@ import uk.gov.moj.cpp.platform.test.feature.toggle.FeatureStubber; import uk.gov.moj.cpp.subscriptions.helper.EventListener; -import javax.json.Json; import java.util.ArrayList; import java.util.List; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static com.google.common.collect.ImmutableMap.of; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; @@ -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 = 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 = 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 = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), diff --git a/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java b/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java index e180253..c7ed2fc 100644 --- a/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java +++ b/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java @@ -4,10 +4,9 @@ import static com.google.common.collect.ImmutableMap.of; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; -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; diff --git a/subscriptions-integration-test/src/test/java/it/SubscriberIT.java b/subscriptions-integration-test/src/test/java/it/SubscriberIT.java index 678b9ea..48e4487 100644 --- a/subscriptions-integration-test/src/test/java/it/SubscriberIT.java +++ b/subscriptions-integration-test/src/test/java/it/SubscriberIT.java @@ -1,6 +1,6 @@ package it; - +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static com.google.common.collect.ImmutableMap.of; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; @@ -32,8 +32,6 @@ import java.util.ArrayList; import java.util.List; -import javax.json.Json; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.jayway.jsonpath.ReadContext; @@ -127,7 +125,7 @@ private void deleteSubscriberVerify() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -181,7 +179,7 @@ private void deleteSubscriberAndDeactivateSubscriptionAndVerify() { final EventListener deleteSubscriptionEventListener = new EventListener(SUBSCRIPTION_DEACTIVATE_PUBLIC_EVENT); //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -212,7 +210,7 @@ private void deleteSubscriberAndSubscriptionAndVerify() { final EventListener deleteSubscriptionEventListener = new EventListener(SUBSCRIPTION_DELETE_PUBLIC_EVENT); //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -240,7 +238,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 = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -257,7 +255,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 = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -281,7 +279,7 @@ private void subscribeAndVerifySubscription() { final EventListener eventListener = new EventListener(SUBSCRIPTION_SUBSCRIBE_PUBLIC_EVENT); //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -316,7 +314,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 = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), diff --git a/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java b/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java index 2f0e1a5..ff779cc 100644 --- a/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java +++ b/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java @@ -8,8 +8,7 @@ import uk.gov.justice.services.common.http.HeaderConstants; import uk.gov.moj.cpp.platform.test.feature.toggle.FeatureStubber; -import javax.json.Json; - +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static com.google.common.collect.ImmutableMap.of; import static java.lang.String.format; import static java.util.UUID.randomUUID; @@ -68,7 +67,7 @@ void shouldNotAllowToCreateSubscriptionByAdmin() { @Test void shouldNotAllowUserToDeactivateSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -79,7 +78,7 @@ void shouldNotAllowUserToDeactivateSubscription() { @Test void shouldNotAllowUserToActivateSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -90,7 +89,7 @@ void shouldNotAllowUserToActivateSubscription() { @Test void shouldNotAllowUserToDeleteSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -113,7 +112,7 @@ void shouldNotAllowUserToCreateSubscription() { @Test void shouldNotAllowUserToSubscribeSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -124,7 +123,7 @@ void shouldNotAllowUserToSubscribeSubscription() { @Test void shouldNotAllowUserToSubscribeUnsubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -148,7 +147,7 @@ void shouldNotConsumeMessageFromHearingResulted() { @Test void shouldNotConsumeMessageFromNotificationSent() { final String notificationId = randomUUID().toString(); - final String payload = Json.createObjectBuilder() + final String payload = createObjectBuilder() .add("notificationId", notificationId) .add("sentTime", "2021-05-09T08:31:40Z") .build().toString(); @@ -162,7 +161,7 @@ void shouldNotConsumeMessageFromNotificationSent() { @Test void shouldNotConsumeMessageFromNotificationFailed() { final String notificationId = randomUUID().toString(); - final String payload = Json.createObjectBuilder() + final String payload = createObjectBuilder() .add("notificationId", notificationId) .add("failedTime", "2021-05-09T08:31:40Z") .add("statusCode", 500) @@ -243,7 +242,7 @@ void shouldNotAllowGetSubscriptionsForUser() { @Test void shouldNotAllowDeleteSubscriberForUser() { - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), diff --git a/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java b/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java index a1b493b..5a6dbf3 100644 --- a/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java +++ b/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.subscriptions.helper; import static java.util.UUID.randomUUID; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; @@ -21,7 +21,6 @@ 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.MultivaluedHashMap; @@ -88,7 +87,7 @@ public static String pollForResponse(final String path, public static JsonObject getJsonObject(final String jsonAsString) { final JsonObject payload; - try (final JsonReader jsonReader = Json.createReader(new StringReader(jsonAsString))) { + try (final JsonReader jsonReader = createReader(new StringReader(jsonAsString))) { payload = jsonReader.readObject(); } return payload; diff --git a/subscriptions-query/pom.xml b/subscriptions-query/pom.xml index bb401b5..31b4c97 100755 --- a/subscriptions-query/pom.xml +++ b/subscriptions-query/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/pom.xml b/subscriptions-query/subscriptions-query-api/pom.xml index 5ddc9ff..0f6d0d4 100755 --- a/subscriptions-query/subscriptions-query-api/pom.xml +++ b/subscriptions-query/subscriptions-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java b/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java index 33e2f11..6c4b925 100644 --- a/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java +++ b/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.subscriptions.query.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; diff --git a/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java b/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java index 4b15835..8476a3b 100644 --- a/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java +++ b/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java @@ -2,7 +2,7 @@ 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.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/subscriptions-query/subscriptions-query-view/pom.xml b/subscriptions-query/subscriptions-query-view/pom.xml index 8bcd1c0..bfa43c6 100755 --- a/subscriptions-query/subscriptions-query-view/pom.xml +++ b/subscriptions-query/subscriptions-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java b/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java index 6fe01d1..bc4b685 100644 --- a/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java +++ b/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.subscriptions.query; 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.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter; diff --git a/subscriptions-service/pom.xml b/subscriptions-service/pom.xml index cefe6d5..767f467 100644 --- a/subscriptions-service/pom.xml +++ b/subscriptions-service/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 diff --git a/subscriptions-viewstore/pom.xml b/subscriptions-viewstore/pom.xml index b1573f6..57715f4 100755 --- a/subscriptions-viewstore/pom.xml +++ b/subscriptions-viewstore/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT subscriptions-viewstore diff --git a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml index 23ddfc4..15df2fe 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-viewstore - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT subscriptions-viewstore-liquibase diff --git a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml index 146e278..92a237f 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ subscriptions-viewstore uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.104.46-CHD-1832-SNAPSHOT 4.0.0 From 6738eb3f612579179e6353acd5cb9ff41953b578 Mon Sep 17 00:00:00 2001 From: embedded_devops_sa Date: Tue, 3 Feb 2026 13:33:43 +0000 Subject: [PATCH 2/5] updating poms for 17.104.46-CHD-1833-SNAPSHOT development --- pom.xml | 2 +- subscriptions-command/pom.xml | 2 +- subscriptions-command/subscriptions-command-api/pom.xml | 2 +- subscriptions-command/subscriptions-command-handler/pom.xml | 2 +- subscriptions-domain/pom.xml | 2 +- subscriptions-domain/subscriptions-domain-aggregate/pom.xml | 2 +- subscriptions-domain/subscriptions-domain-event/pom.xml | 2 +- .../subscriptions-domain-transformation/pom.xml | 4 ++-- .../subscriptions-domain-value-schema/pom.xml | 2 +- subscriptions-event-sources/pom.xml | 2 +- subscriptions-event/pom.xml | 2 +- subscriptions-event/subscriptions-event-listener/pom.xml | 2 +- subscriptions-event/subscriptions-event-processor/pom.xml | 2 +- subscriptions-healthchecks/pom.xml | 2 +- subscriptions-integration-test/pom.xml | 2 +- subscriptions-query/pom.xml | 2 +- subscriptions-query/subscriptions-query-api/pom.xml | 2 +- subscriptions-query/subscriptions-query-view/pom.xml | 2 +- subscriptions-service/pom.xml | 2 +- subscriptions-viewstore/pom.xml | 2 +- .../subscriptions-viewstore-liquibase/pom.xml | 2 +- .../subscriptions-viewstore-persistence/pom.xml | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 153d152..bf51fa0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT pom Subscription Microservice - Parent Subscription Microservice - Subscription Context diff --git a/subscriptions-command/pom.xml b/subscriptions-command/pom.xml index 4fbbe56..9b778f1 100755 --- a/subscriptions-command/pom.xml +++ b/subscriptions-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/pom.xml b/subscriptions-command/subscriptions-command-api/pom.xml index e62dc23..7f0e41b 100755 --- a/subscriptions-command/subscriptions-command-api/pom.xml +++ b/subscriptions-command/subscriptions-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-handler/pom.xml b/subscriptions-command/subscriptions-command-handler/pom.xml index aa39ecd..7043ded 100644 --- a/subscriptions-command/subscriptions-command-handler/pom.xml +++ b/subscriptions-command/subscriptions-command-handler/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-domain/pom.xml b/subscriptions-domain/pom.xml index 0839d35..78f2b78 100755 --- a/subscriptions-domain/pom.xml +++ b/subscriptions-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT subscriptions-domain diff --git a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml index 696b07f..77b3a3c 100644 --- a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml +++ b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT subscriptions-domain-aggregate diff --git a/subscriptions-domain/subscriptions-domain-event/pom.xml b/subscriptions-domain/subscriptions-domain-event/pom.xml index ebad432..90e920c 100644 --- a/subscriptions-domain/subscriptions-domain-event/pom.xml +++ b/subscriptions-domain/subscriptions-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT subscriptions-domain-event diff --git a/subscriptions-domain/subscriptions-domain-transformation/pom.xml b/subscriptions-domain/subscriptions-domain-transformation/pom.xml index 69a057e..266258f 100644 --- a/subscriptions-domain/subscriptions-domain-transformation/pom.xml +++ b/subscriptions-domain/subscriptions-domain-transformation/pom.xml @@ -3,12 +3,12 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 subscriptions-domain-transformation - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT pom diff --git a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml index dbf2e4a..a303a25 100644 --- a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml +++ b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml @@ -3,7 +3,7 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-event-sources/pom.xml b/subscriptions-event-sources/pom.xml index 741b32d..cc1549b 100644 --- a/subscriptions-event-sources/pom.xml +++ b/subscriptions-event-sources/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/pom.xml b/subscriptions-event/pom.xml index 759ad93..8a4f489 100755 --- a/subscriptions-event/pom.xml +++ b/subscriptions-event/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-listener/pom.xml b/subscriptions-event/subscriptions-event-listener/pom.xml index 6be0510..c894d2d 100755 --- a/subscriptions-event/subscriptions-event-listener/pom.xml +++ b/subscriptions-event/subscriptions-event-listener/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/pom.xml b/subscriptions-event/subscriptions-event-processor/pom.xml index 2455972..3631f31 100755 --- a/subscriptions-event/subscriptions-event-processor/pom.xml +++ b/subscriptions-event/subscriptions-event-processor/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-healthchecks/pom.xml b/subscriptions-healthchecks/pom.xml index b93c5c6..628742b 100644 --- a/subscriptions-healthchecks/pom.xml +++ b/subscriptions-healthchecks/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/pom.xml b/subscriptions-integration-test/pom.xml index 3d23103..ad2c06b 100755 --- a/subscriptions-integration-test/pom.xml +++ b/subscriptions-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/pom.xml b/subscriptions-query/pom.xml index 31b4c97..ff5fa67 100755 --- a/subscriptions-query/pom.xml +++ b/subscriptions-query/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/pom.xml b/subscriptions-query/subscriptions-query-api/pom.xml index 0f6d0d4..282c153 100755 --- a/subscriptions-query/subscriptions-query-api/pom.xml +++ b/subscriptions-query/subscriptions-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-view/pom.xml b/subscriptions-query/subscriptions-query-view/pom.xml index bfa43c6..4c3ec97 100755 --- a/subscriptions-query/subscriptions-query-view/pom.xml +++ b/subscriptions-query/subscriptions-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-service/pom.xml b/subscriptions-service/pom.xml index 767f467..d27209b 100644 --- a/subscriptions-service/pom.xml +++ b/subscriptions-service/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 diff --git a/subscriptions-viewstore/pom.xml b/subscriptions-viewstore/pom.xml index 57715f4..29a784f 100755 --- a/subscriptions-viewstore/pom.xml +++ b/subscriptions-viewstore/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT subscriptions-viewstore diff --git a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml index 15df2fe..22b67e4 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-viewstore - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT subscriptions-viewstore-liquibase diff --git a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml index 92a237f..64aafbe 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ subscriptions-viewstore uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1832-SNAPSHOT + 17.104.46-CHD-1833-SNAPSHOT 4.0.0 From 3fe3c9b9c1a0172d20b5808d3795edc5df90a9f9 Mon Sep 17 00:00:00 2001 From: erolkurelihmcts <134499553+erolkurelihmcts@users.noreply.github.com> Date: Tue, 3 Feb 2026 15:18:35 +0000 Subject: [PATCH 3/5] CHD-1832: revert (#19) Co-authored-by: Erol Kureli <> --- pom.xml | 6 +++--- subscriptions-command/pom.xml | 2 +- .../subscriptions-command-api/pom.xml | 2 +- .../api/service/UserAndGroupsService.java | 2 +- .../command/api/SubscriberCommandApiTest.java | 2 +- .../api/SubscriptionCommandApiTest.java | 2 +- .../subscriptions-command-handler/pom.xml | 2 +- .../handler/SubscriberHandlerTest.java | 2 +- .../handler/SubscriptionHandlerTest.java | 2 +- subscriptions-domain/pom.xml | 2 +- .../subscriptions-domain-aggregate/pom.xml | 2 +- .../subscriptions-domain-event/pom.xml | 2 +- .../pom.xml | 4 ++-- .../subscriptions-domain-value-schema/pom.xml | 2 +- subscriptions-event-sources/pom.xml | 2 +- subscriptions-event/pom.xml | 2 +- .../subscriptions-event-listener/pom.xml | 2 +- .../subscriptions-event-processor/pom.xml | 2 +- .../processor/NotificationEventProcessor.java | 2 +- .../processor/service/EmailInfoSender.java | 2 +- .../processor/service/HearingService.java | 2 +- .../service/SubscriptionsQueryService.java | 2 +- .../NotificationEventProcessorTest.java | 2 +- subscriptions-healthchecks/pom.xml | 2 +- subscriptions-integration-test/pom.xml | 2 +- .../test/java/it/CreateSubscriptionIT.java | 8 ++++---- .../test/java/it/NotificationServiceIT.java | 3 ++- .../src/test/java/it/SubscriberIT.java | 18 ++++++++++-------- .../it/SubscriptionsFeatureDisableIT.java | 19 ++++++++++--------- .../cpp/subscriptions/helper/RestHelper.java | 5 +++-- subscriptions-query/pom.xml | 2 +- .../subscriptions-query-api/pom.xml | 2 +- .../api/service/UserAndGroupsService.java | 2 +- .../query/api/SubscriptionsQueryApiTest.java | 2 +- .../subscriptions-query-view/pom.xml | 2 +- .../query/SubscriptionsQueryView.java | 2 +- subscriptions-service/pom.xml | 2 +- subscriptions-viewstore/pom.xml | 2 +- .../subscriptions-viewstore-liquibase/pom.xml | 2 +- .../pom.xml | 2 +- 40 files changed, 67 insertions(+), 62 deletions(-) diff --git a/pom.xml b/pom.xml index bf51fa0..92b34be 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ uk.gov.moj.cpp.common service-parent-pom - 17.104.0 + 17.103.3 uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT pom Subscription Microservice - Parent Subscription Microservice - Subscription Context @@ -21,7 +21,7 @@ git file://${project.build.directory}/site true - 17.104.1 + 17.103.10 17.0.24 17.0.75 17.0.133 diff --git a/subscriptions-command/pom.xml b/subscriptions-command/pom.xml index 9b778f1..7c23190 100755 --- a/subscriptions-command/pom.xml +++ b/subscriptions-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/pom.xml b/subscriptions-command/subscriptions-command-api/pom.xml index 7f0e41b..c664c4a 100755 --- a/subscriptions-command/subscriptions-command-api/pom.xml +++ b/subscriptions-command/subscriptions-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java b/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java index 961e86f..1e3b52f 100644 --- a/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; diff --git a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java b/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java index fc09eaa..17315a1 100644 --- a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java b/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java index edd4bd0..8b5f8ae 100644 --- a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/subscriptions-command/subscriptions-command-handler/pom.xml b/subscriptions-command/subscriptions-command-handler/pom.xml index 7043ded..8489d09 100644 --- a/subscriptions-command/subscriptions-command-handler/pom.xml +++ b/subscriptions-command/subscriptions-command-handler/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java b/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java index eb85b30..e320bc9 100644 --- a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.ArgumentMatchers.any; diff --git a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java b/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java index 5374bb6..cee6620 100644 --- a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.mockito.ArgumentMatchers.any; diff --git a/subscriptions-domain/pom.xml b/subscriptions-domain/pom.xml index 78f2b78..c1b8ed9 100755 --- a/subscriptions-domain/pom.xml +++ b/subscriptions-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT subscriptions-domain diff --git a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml index 77b3a3c..8ac054b 100644 --- a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml +++ b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT subscriptions-domain-aggregate diff --git a/subscriptions-domain/subscriptions-domain-event/pom.xml b/subscriptions-domain/subscriptions-domain-event/pom.xml index 90e920c..cd5839c 100644 --- a/subscriptions-domain/subscriptions-domain-event/pom.xml +++ b/subscriptions-domain/subscriptions-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT subscriptions-domain-event diff --git a/subscriptions-domain/subscriptions-domain-transformation/pom.xml b/subscriptions-domain/subscriptions-domain-transformation/pom.xml index 266258f..8a79dcf 100644 --- a/subscriptions-domain/subscriptions-domain-transformation/pom.xml +++ b/subscriptions-domain/subscriptions-domain-transformation/pom.xml @@ -3,12 +3,12 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 subscriptions-domain-transformation - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT pom diff --git a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml index a303a25..43cfeaa 100644 --- a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml +++ b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml @@ -3,7 +3,7 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-event-sources/pom.xml b/subscriptions-event-sources/pom.xml index cc1549b..52e4806 100644 --- a/subscriptions-event-sources/pom.xml +++ b/subscriptions-event-sources/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/pom.xml b/subscriptions-event/pom.xml index 8a4f489..6e68886 100755 --- a/subscriptions-event/pom.xml +++ b/subscriptions-event/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-listener/pom.xml b/subscriptions-event/subscriptions-event-listener/pom.xml index c894d2d..47fea62 100755 --- a/subscriptions-event/subscriptions-event-listener/pom.xml +++ b/subscriptions-event/subscriptions-event-listener/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/pom.xml b/subscriptions-event/subscriptions-event-processor/pom.xml index 3631f31..fc1f37b 100755 --- a/subscriptions-event/subscriptions-event-processor/pom.xml +++ b/subscriptions-event/subscriptions-event-processor/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java index c989969..2c29b3a 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.Envelope.envelopeFrom; import static uk.gov.justice.services.messaging.Envelope.metadataFrom; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java index 0939c8e..6f3986b 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java index 31bb5ae..264568a 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java index 9b023cb..c23f0a5 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; diff --git a/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java b/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java index ec98a4c..761422c 100644 --- a/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java +++ b/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 uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.verify; diff --git a/subscriptions-healthchecks/pom.xml b/subscriptions-healthchecks/pom.xml index 628742b..c4ba6e4 100644 --- a/subscriptions-healthchecks/pom.xml +++ b/subscriptions-healthchecks/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/pom.xml b/subscriptions-integration-test/pom.xml index ad2c06b..0aaa0fa 100755 --- a/subscriptions-integration-test/pom.xml +++ b/subscriptions-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java b/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java index 9c3b97b..4e4f1ec 100644 --- a/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java +++ b/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java @@ -13,10 +13,10 @@ import uk.gov.moj.cpp.platform.test.feature.toggle.FeatureStubber; import uk.gov.moj.cpp.subscriptions.helper.EventListener; +import javax.json.Json; import java.util.ArrayList; import java.util.List; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static com.google.common.collect.ImmutableMap.of; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; @@ -88,7 +88,7 @@ public void shouldDeleteSubscriptionByAdmin() { private void deleteAndVerifySubscription() { final EventListener eventListener = new EventListener(SUBSCRIPTION_DELETE_PUBLIC_EVENT); //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.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 = createObjectBuilder().build().toString(); + final String payload = Json.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 = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), diff --git a/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java b/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java index c7ed2fc..e180253 100644 --- a/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java +++ b/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java @@ -4,9 +4,10 @@ import static com.google.common.collect.ImmutableMap.of; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.lang.String.format; +import static java.lang.System.lineSeparator; import static java.util.UUID.randomUUID; import static java.util.concurrent.TimeUnit.SECONDS; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; diff --git a/subscriptions-integration-test/src/test/java/it/SubscriberIT.java b/subscriptions-integration-test/src/test/java/it/SubscriberIT.java index 48e4487..678b9ea 100644 --- a/subscriptions-integration-test/src/test/java/it/SubscriberIT.java +++ b/subscriptions-integration-test/src/test/java/it/SubscriberIT.java @@ -1,6 +1,6 @@ package it; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; + import static com.google.common.collect.ImmutableMap.of; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; @@ -32,6 +32,8 @@ import java.util.ArrayList; import java.util.List; +import javax.json.Json; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.jayway.jsonpath.ReadContext; @@ -125,7 +127,7 @@ private void deleteSubscriberVerify() { //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -179,7 +181,7 @@ private void deleteSubscriberAndDeactivateSubscriptionAndVerify() { final EventListener deleteSubscriptionEventListener = new EventListener(SUBSCRIPTION_DEACTIVATE_PUBLIC_EVENT); //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -210,7 +212,7 @@ private void deleteSubscriberAndSubscriptionAndVerify() { final EventListener deleteSubscriptionEventListener = new EventListener(SUBSCRIPTION_DELETE_PUBLIC_EVENT); //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -238,7 +240,7 @@ private void deleteSubscriberFailed(final String reason) { final EventListener eventListener = new EventListener(SUBSCRIBER_DELETE_FAILED_PUBLIC_EVENT); //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -255,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 = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -279,7 +281,7 @@ private void subscribeAndVerifySubscription() { final EventListener eventListener = new EventListener(SUBSCRIPTION_SUBSCRIBE_PUBLIC_EVENT); //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), @@ -314,7 +316,7 @@ private void unsubscribeAndVerifySubscription(final boolean subscriptionActive) final EventListener eventListener = new EventListener(SUBSCRIPTION_UNSUBSCRIBE_PUBLIC_EVENT); //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", ID)), diff --git a/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java b/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java index ff779cc..2f0e1a5 100644 --- a/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java +++ b/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java @@ -8,7 +8,8 @@ import uk.gov.justice.services.common.http.HeaderConstants; import uk.gov.moj.cpp.platform.test.feature.toggle.FeatureStubber; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import javax.json.Json; + import static com.google.common.collect.ImmutableMap.of; import static java.lang.String.format; import static java.util.UUID.randomUUID; @@ -67,7 +68,7 @@ void shouldNotAllowToCreateSubscriptionByAdmin() { @Test void shouldNotAllowUserToDeactivateSubscription() { //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -78,7 +79,7 @@ void shouldNotAllowUserToDeactivateSubscription() { @Test void shouldNotAllowUserToActivateSubscription() { //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -89,7 +90,7 @@ void shouldNotAllowUserToActivateSubscription() { @Test void shouldNotAllowUserToDeleteSubscription() { //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -112,7 +113,7 @@ void shouldNotAllowUserToCreateSubscription() { @Test void shouldNotAllowUserToSubscribeSubscription() { //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -123,7 +124,7 @@ void shouldNotAllowUserToSubscribeSubscription() { @Test void shouldNotAllowUserToSubscribeUnsubscription() { //given - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -147,7 +148,7 @@ void shouldNotConsumeMessageFromHearingResulted() { @Test void shouldNotConsumeMessageFromNotificationSent() { final String notificationId = randomUUID().toString(); - final String payload = createObjectBuilder() + final String payload = Json.createObjectBuilder() .add("notificationId", notificationId) .add("sentTime", "2021-05-09T08:31:40Z") .build().toString(); @@ -161,7 +162,7 @@ void shouldNotConsumeMessageFromNotificationSent() { @Test void shouldNotConsumeMessageFromNotificationFailed() { final String notificationId = randomUUID().toString(); - final String payload = createObjectBuilder() + final String payload = Json.createObjectBuilder() .add("notificationId", notificationId) .add("failedTime", "2021-05-09T08:31:40Z") .add("statusCode", 500) @@ -242,7 +243,7 @@ void shouldNotAllowGetSubscriptionsForUser() { @Test void shouldNotAllowDeleteSubscriberForUser() { - final String payload = createObjectBuilder().build().toString(); + final String payload = Json.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), diff --git a/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java b/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java index 5a6dbf3..a1b493b 100644 --- a/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java +++ b/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.subscriptions.helper; import static java.util.UUID.randomUUID; -import static uk.gov.justice.services.messaging.JsonObjects.createReader; +import static javax.json.Json.createReader; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; @@ -21,6 +21,7 @@ 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.MultivaluedHashMap; @@ -87,7 +88,7 @@ public static String pollForResponse(final String path, public static JsonObject getJsonObject(final String jsonAsString) { final JsonObject payload; - try (final JsonReader jsonReader = createReader(new StringReader(jsonAsString))) { + try (final JsonReader jsonReader = Json.createReader(new StringReader(jsonAsString))) { payload = jsonReader.readObject(); } return payload; diff --git a/subscriptions-query/pom.xml b/subscriptions-query/pom.xml index ff5fa67..bb401b5 100755 --- a/subscriptions-query/pom.xml +++ b/subscriptions-query/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/pom.xml b/subscriptions-query/subscriptions-query-api/pom.xml index 282c153..5ddc9ff 100755 --- a/subscriptions-query/subscriptions-query-api/pom.xml +++ b/subscriptions-query/subscriptions-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java b/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java index 6c4b925..33e2f11 100644 --- a/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java +++ b/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.subscriptions.query.api.service; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.slf4j.LoggerFactory.getLogger; import static uk.gov.justice.services.core.annotation.Component.COMMAND_API; diff --git a/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java b/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java index 8476a3b..4b15835 100644 --- a/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java +++ b/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java @@ -2,7 +2,7 @@ import static java.util.Optional.ofNullable; import static java.util.UUID.randomUUID; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/subscriptions-query/subscriptions-query-view/pom.xml b/subscriptions-query/subscriptions-query-view/pom.xml index 4c3ec97..8bcd1c0 100755 --- a/subscriptions-query/subscriptions-query-view/pom.xml +++ b/subscriptions-query/subscriptions-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java b/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java index bc4b685..6fe01d1 100644 --- a/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java +++ b/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.subscriptions.query; import static java.util.stream.Collectors.toList; -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static javax.json.Json.createObjectBuilder; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter; diff --git a/subscriptions-service/pom.xml b/subscriptions-service/pom.xml index d27209b..cefe6d5 100644 --- a/subscriptions-service/pom.xml +++ b/subscriptions-service/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 diff --git a/subscriptions-viewstore/pom.xml b/subscriptions-viewstore/pom.xml index 29a784f..b1573f6 100755 --- a/subscriptions-viewstore/pom.xml +++ b/subscriptions-viewstore/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT subscriptions-viewstore diff --git a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml index 22b67e4..23ddfc4 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-viewstore - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT subscriptions-viewstore-liquibase diff --git a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml index 64aafbe..146e278 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ subscriptions-viewstore uk.gov.moj.cpp.subscriptions - 17.104.46-CHD-1833-SNAPSHOT + 17.0.46-SNAPSHOT 4.0.0 From 964cefea0519773e0081030e15d891fedfb72606 Mon Sep 17 00:00:00 2001 From: Mohamed Sherefudheen Date: Mon, 22 Dec 2025 11:31:08 +0000 Subject: [PATCH 4/5] PEG-2857: Upgrade framework --- pom.xml | 4 ++-- subscriptions-command/pom.xml | 2 +- .../subscriptions-command-api/pom.xml | 2 +- .../api/service/UserAndGroupsService.java | 2 +- .../command/api/SubscriberCommandApiTest.java | 2 +- .../api/SubscriptionCommandApiTest.java | 2 +- .../subscriptions-command-handler/pom.xml | 2 +- .../command/handler/SubscriberHandlerTest.java | 2 +- .../handler/SubscriptionHandlerTest.java | 2 +- subscriptions-domain/pom.xml | 2 +- .../subscriptions-domain-aggregate/pom.xml | 2 +- .../subscriptions-domain-event/pom.xml | 2 +- .../pom.xml | 4 ++-- .../subscriptions-domain-value-schema/pom.xml | 2 +- subscriptions-event-sources/pom.xml | 2 +- subscriptions-event/pom.xml | 2 +- .../subscriptions-event-listener/pom.xml | 2 +- .../subscriptions-event-processor/pom.xml | 2 +- .../processor/NotificationEventProcessor.java | 2 +- .../processor/service/EmailInfoSender.java | 2 +- .../processor/service/HearingService.java | 2 +- .../service/SubscriptionsQueryService.java | 2 +- .../NotificationEventProcessorTest.java | 2 +- subscriptions-healthchecks/pom.xml | 2 +- subscriptions-integration-test/pom.xml | 2 +- .../src/test/java/it/CreateSubscriptionIT.java | 8 ++++---- .../test/java/it/NotificationServiceIT.java | 2 +- .../src/test/java/it/SubscriberIT.java | 16 ++++++++-------- .../java/it/SubscriptionsFeatureDisableIT.java | 18 +++++++++--------- .../cpp/subscriptions/helper/RestHelper.java | 6 +++--- subscriptions-query/pom.xml | 2 +- .../subscriptions-query-api/pom.xml | 2 +- .../api/service/UserAndGroupsService.java | 2 +- .../query/api/SubscriptionsQueryApiTest.java | 2 +- .../subscriptions-query-view/pom.xml | 2 +- .../query/SubscriptionsQueryView.java | 2 +- subscriptions-service/pom.xml | 2 +- subscriptions-viewstore/pom.xml | 2 +- .../subscriptions-viewstore-liquibase/pom.xml | 2 +- .../pom.xml | 2 +- 40 files changed, 62 insertions(+), 62 deletions(-) diff --git a/pom.xml b/pom.xml index 92b34be..bed45cb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.3 + 17.103.9-M1 uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT pom Subscription Microservice - Parent Subscription Microservice - Subscription Context diff --git a/subscriptions-command/pom.xml b/subscriptions-command/pom.xml index 7c23190..7259840 100755 --- a/subscriptions-command/pom.xml +++ b/subscriptions-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/pom.xml b/subscriptions-command/subscriptions-command-api/pom.xml index c664c4a..b01326f 100755 --- a/subscriptions-command/subscriptions-command-api/pom.xml +++ b/subscriptions-command/subscriptions-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java b/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java index 1e3b52f..961e86f 100644 --- a/subscriptions-command/subscriptions-command-api/src/main/java/uk/gov/moj/cpp/subscriptions/command/api/service/UserAndGroupsService.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java b/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java index 17315a1..fc09eaa 100644 --- a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriberCommandApiTest.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java b/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java index 8b5f8ae..edd4bd0 100644 --- a/subscriptions-command/subscriptions-command-api/src/test/java/uk/gov/moj/cpp/subscriptions/command/api/SubscriptionCommandApiTest.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-handler/pom.xml b/subscriptions-command/subscriptions-command-handler/pom.xml index 8489d09..949183d 100644 --- a/subscriptions-command/subscriptions-command-handler/pom.xml +++ b/subscriptions-command/subscriptions-command-handler/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java b/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java index e320bc9..eb85b30 100644 --- a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriberHandlerTest.java +++ b/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; diff --git a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java b/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java index cee6620..5374bb6 100644 --- a/subscriptions-command/subscriptions-command-handler/src/test/java/uk/gov/moj/cpp/subscriptions/command/handler/SubscriptionHandlerTest.java +++ b/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; diff --git a/subscriptions-domain/pom.xml b/subscriptions-domain/pom.xml index c1b8ed9..625105c 100755 --- a/subscriptions-domain/pom.xml +++ b/subscriptions-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT subscriptions-domain diff --git a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml index 8ac054b..1b80a0e 100644 --- a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml +++ b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT subscriptions-domain-aggregate diff --git a/subscriptions-domain/subscriptions-domain-event/pom.xml b/subscriptions-domain/subscriptions-domain-event/pom.xml index cd5839c..f9a23e9 100644 --- a/subscriptions-domain/subscriptions-domain-event/pom.xml +++ b/subscriptions-domain/subscriptions-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT subscriptions-domain-event diff --git a/subscriptions-domain/subscriptions-domain-transformation/pom.xml b/subscriptions-domain/subscriptions-domain-transformation/pom.xml index 8a79dcf..f8ebda8 100644 --- a/subscriptions-domain/subscriptions-domain-transformation/pom.xml +++ b/subscriptions-domain/subscriptions-domain-transformation/pom.xml @@ -3,12 +3,12 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 subscriptions-domain-transformation - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT pom diff --git a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml index 43cfeaa..55175b0 100644 --- a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml +++ b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml @@ -3,7 +3,7 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event-sources/pom.xml b/subscriptions-event-sources/pom.xml index 52e4806..93d3d40 100644 --- a/subscriptions-event-sources/pom.xml +++ b/subscriptions-event-sources/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/pom.xml b/subscriptions-event/pom.xml index 6e68886..26de751 100755 --- a/subscriptions-event/pom.xml +++ b/subscriptions-event/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-listener/pom.xml b/subscriptions-event/subscriptions-event-listener/pom.xml index 47fea62..ca39614 100755 --- a/subscriptions-event/subscriptions-event-listener/pom.xml +++ b/subscriptions-event/subscriptions-event-listener/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/pom.xml b/subscriptions-event/subscriptions-event-processor/pom.xml index fc1f37b..45903d8 100755 --- a/subscriptions-event/subscriptions-event-processor/pom.xml +++ b/subscriptions-event/subscriptions-event-processor/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java index 2c29b3a..c989969 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessor.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java index 6f3986b..0939c8e 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/EmailInfoSender.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java index 264568a..31bb5ae 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/HearingService.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java b/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java index c23f0a5..9b023cb 100644 --- a/subscriptions-event/subscriptions-event-processor/src/main/java/uk/gov/moj/cpp/subscriptions/event/processor/service/SubscriptionsQueryService.java +++ b/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; diff --git a/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java b/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java index 761422c..ec98a4c 100644 --- a/subscriptions-event/subscriptions-event-processor/src/test/java/uk/gov/moj/cpp/subscriptions/event/processor/NotificationEventProcessorTest.java +++ b/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; diff --git a/subscriptions-healthchecks/pom.xml b/subscriptions-healthchecks/pom.xml index c4ba6e4..0899b15 100644 --- a/subscriptions-healthchecks/pom.xml +++ b/subscriptions-healthchecks/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/pom.xml b/subscriptions-integration-test/pom.xml index 0aaa0fa..44d881f 100755 --- a/subscriptions-integration-test/pom.xml +++ b/subscriptions-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java b/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java index 4e4f1ec..74faddf 100644 --- a/subscriptions-integration-test/src/test/java/it/CreateSubscriptionIT.java +++ b/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)), diff --git a/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java b/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java index e180253..5559455 100644 --- a/subscriptions-integration-test/src/test/java/it/NotificationServiceIT.java +++ b/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; diff --git a/subscriptions-integration-test/src/test/java/it/SubscriberIT.java b/subscriptions-integration-test/src/test/java/it/SubscriberIT.java index 678b9ea..b81bb87 100644 --- a/subscriptions-integration-test/src/test/java/it/SubscriberIT.java +++ b/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)), diff --git a/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java b/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java index 2f0e1a5..66a7f73 100644 --- a/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java +++ b/subscriptions-integration-test/src/test/java/it/SubscriptionsFeatureDisableIT.java @@ -8,7 +8,7 @@ import uk.gov.justice.services.common.http.HeaderConstants; import uk.gov.moj.cpp.platform.test.feature.toggle.FeatureStubber; -import javax.json.Json; +import uk.gov.justice.services.messaging.JsonObjects; import static com.google.common.collect.ImmutableMap.of; import static java.lang.String.format; @@ -68,7 +68,7 @@ void shouldNotAllowToCreateSubscriptionByAdmin() { @Test void shouldNotAllowUserToDeactivateSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = JsonObjects.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -79,7 +79,7 @@ void shouldNotAllowUserToDeactivateSubscription() { @Test void shouldNotAllowUserToActivateSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = JsonObjects.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -90,7 +90,7 @@ void shouldNotAllowUserToActivateSubscription() { @Test void shouldNotAllowUserToDeleteSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = JsonObjects.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -113,7 +113,7 @@ void shouldNotAllowUserToCreateSubscription() { @Test void shouldNotAllowUserToSubscribeSubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = JsonObjects.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -124,7 +124,7 @@ void shouldNotAllowUserToSubscribeSubscription() { @Test void shouldNotAllowUserToSubscribeUnsubscription() { //given - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = JsonObjects.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), @@ -148,7 +148,7 @@ void shouldNotConsumeMessageFromHearingResulted() { @Test void shouldNotConsumeMessageFromNotificationSent() { final String notificationId = randomUUID().toString(); - final String payload = Json.createObjectBuilder() + final String payload = JsonObjects.createObjectBuilder() .add("notificationId", notificationId) .add("sentTime", "2021-05-09T08:31:40Z") .build().toString(); @@ -162,7 +162,7 @@ void shouldNotConsumeMessageFromNotificationSent() { @Test void shouldNotConsumeMessageFromNotificationFailed() { final String notificationId = randomUUID().toString(); - final String payload = Json.createObjectBuilder() + final String payload = JsonObjects.createObjectBuilder() .add("notificationId", notificationId) .add("failedTime", "2021-05-09T08:31:40Z") .add("statusCode", 500) @@ -243,7 +243,7 @@ void shouldNotAllowGetSubscriptionsForUser() { @Test void shouldNotAllowDeleteSubscriberForUser() { - final String payload = Json.createObjectBuilder().build().toString(); + final String payload = JsonObjects.createObjectBuilder().build().toString(); //when makePostCall(getWriteUrl(format("/subscriptions/%s", id)), diff --git a/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java b/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java index a1b493b..58da041 100644 --- a/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java +++ b/subscriptions-integration-test/src/test/java/uk/gov/moj/cpp/subscriptions/helper/RestHelper.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.subscriptions.helper; import static java.util.UUID.randomUUID; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; @@ -21,7 +21,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; import javax.ws.rs.core.MultivaluedHashMap; @@ -88,7 +88,7 @@ public static String pollForResponse(final String path, public static JsonObject getJsonObject(final String jsonAsString) { final JsonObject payload; - try (final JsonReader jsonReader = Json.createReader(new StringReader(jsonAsString))) { + try (final JsonReader jsonReader = JsonObjects.createReader(new StringReader(jsonAsString))) { payload = jsonReader.readObject(); } return payload; diff --git a/subscriptions-query/pom.xml b/subscriptions-query/pom.xml index bb401b5..ee2f109 100755 --- a/subscriptions-query/pom.xml +++ b/subscriptions-query/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/pom.xml b/subscriptions-query/subscriptions-query-api/pom.xml index 5ddc9ff..5bf1c6a 100755 --- a/subscriptions-query/subscriptions-query-api/pom.xml +++ b/subscriptions-query/subscriptions-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java b/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java index 33e2f11..6c4b925 100644 --- a/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java +++ b/subscriptions-query/subscriptions-query-api/src/main/java/uk/gov/moj/cpp/subscriptions/query/api/service/UserAndGroupsService.java @@ -1,6 +1,6 @@ package uk.gov.moj.cpp.subscriptions.query.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; diff --git a/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java b/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java index 4b15835..8476a3b 100644 --- a/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java +++ b/subscriptions-query/subscriptions-query-api/src/test/java/uk/gov/moj/cpp/subscriptions/query/api/SubscriptionsQueryApiTest.java @@ -2,7 +2,7 @@ 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.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/subscriptions-query/subscriptions-query-view/pom.xml b/subscriptions-query/subscriptions-query-view/pom.xml index 8bcd1c0..73eac4d 100755 --- a/subscriptions-query/subscriptions-query-view/pom.xml +++ b/subscriptions-query/subscriptions-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java b/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java index 6fe01d1..bc4b685 100644 --- a/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java +++ b/subscriptions-query/subscriptions-query-view/src/main/java/uk/gov/moj/cpp/subscriptions/query/SubscriptionsQueryView.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.subscriptions.query; 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.messaging.JsonEnvelope.envelopeFrom; import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter; diff --git a/subscriptions-service/pom.xml b/subscriptions-service/pom.xml index cefe6d5..65bd264 100644 --- a/subscriptions-service/pom.xml +++ b/subscriptions-service/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-viewstore/pom.xml b/subscriptions-viewstore/pom.xml index b1573f6..49b7d82 100755 --- a/subscriptions-viewstore/pom.xml +++ b/subscriptions-viewstore/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT subscriptions-viewstore diff --git a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml index 23ddfc4..ad30cfa 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-viewstore - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT subscriptions-viewstore-liquibase diff --git a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml index 146e278..71072d4 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ subscriptions-viewstore uk.gov.moj.cpp.subscriptions - 17.0.46-SNAPSHOT + 17.0.46-PEG-2848-SNAPSHOT 4.0.0 From 1f2cbe1ac77e92588be1946e8f7827b9f1100db8 Mon Sep 17 00:00:00 2001 From: devops-team Date: Wed, 21 Jan 2026 13:43:57 +0000 Subject: [PATCH 5/5] New 17.0.47-PEG-2848-SNAPSHOT --- pom.xml | 2 +- subscriptions-command/pom.xml | 2 +- subscriptions-command/subscriptions-command-api/pom.xml | 2 +- subscriptions-command/subscriptions-command-handler/pom.xml | 2 +- subscriptions-domain/pom.xml | 2 +- subscriptions-domain/subscriptions-domain-aggregate/pom.xml | 2 +- subscriptions-domain/subscriptions-domain-event/pom.xml | 2 +- .../subscriptions-domain-transformation/pom.xml | 4 ++-- .../subscriptions-domain-value-schema/pom.xml | 2 +- subscriptions-event-sources/pom.xml | 2 +- subscriptions-event/pom.xml | 2 +- subscriptions-event/subscriptions-event-listener/pom.xml | 2 +- subscriptions-event/subscriptions-event-processor/pom.xml | 2 +- subscriptions-healthchecks/pom.xml | 2 +- subscriptions-integration-test/pom.xml | 2 +- subscriptions-query/pom.xml | 2 +- subscriptions-query/subscriptions-query-api/pom.xml | 2 +- subscriptions-query/subscriptions-query-view/pom.xml | 2 +- subscriptions-service/pom.xml | 2 +- subscriptions-viewstore/pom.xml | 2 +- .../subscriptions-viewstore-liquibase/pom.xml | 2 +- .../subscriptions-viewstore-persistence/pom.xml | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index bed45cb..9691ae7 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT pom Subscription Microservice - Parent Subscription Microservice - Subscription Context diff --git a/subscriptions-command/pom.xml b/subscriptions-command/pom.xml index 7259840..727c4ba 100755 --- a/subscriptions-command/pom.xml +++ b/subscriptions-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-api/pom.xml b/subscriptions-command/subscriptions-command-api/pom.xml index b01326f..2e5e6a1 100755 --- a/subscriptions-command/subscriptions-command-api/pom.xml +++ b/subscriptions-command/subscriptions-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-command/subscriptions-command-handler/pom.xml b/subscriptions-command/subscriptions-command-handler/pom.xml index 949183d..a15a41d 100644 --- a/subscriptions-command/subscriptions-command-handler/pom.xml +++ b/subscriptions-command/subscriptions-command-handler/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-command - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-domain/pom.xml b/subscriptions-domain/pom.xml index 625105c..c6c6d58 100755 --- a/subscriptions-domain/pom.xml +++ b/subscriptions-domain/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT subscriptions-domain diff --git a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml index 1b80a0e..023ce6f 100644 --- a/subscriptions-domain/subscriptions-domain-aggregate/pom.xml +++ b/subscriptions-domain/subscriptions-domain-aggregate/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT subscriptions-domain-aggregate diff --git a/subscriptions-domain/subscriptions-domain-event/pom.xml b/subscriptions-domain/subscriptions-domain-event/pom.xml index f9a23e9..9d8dd69 100644 --- a/subscriptions-domain/subscriptions-domain-event/pom.xml +++ b/subscriptions-domain/subscriptions-domain-event/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-domain - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT subscriptions-domain-event diff --git a/subscriptions-domain/subscriptions-domain-transformation/pom.xml b/subscriptions-domain/subscriptions-domain-transformation/pom.xml index f8ebda8..19597b9 100644 --- a/subscriptions-domain/subscriptions-domain-transformation/pom.xml +++ b/subscriptions-domain/subscriptions-domain-transformation/pom.xml @@ -3,12 +3,12 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 subscriptions-domain-transformation - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT pom diff --git a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml index 55175b0..adbf234 100644 --- a/subscriptions-domain/subscriptions-domain-value-schema/pom.xml +++ b/subscriptions-domain/subscriptions-domain-value-schema/pom.xml @@ -3,7 +3,7 @@ subscriptions-domain uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event-sources/pom.xml b/subscriptions-event-sources/pom.xml index 93d3d40..c147cee 100644 --- a/subscriptions-event-sources/pom.xml +++ b/subscriptions-event-sources/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/pom.xml b/subscriptions-event/pom.xml index 26de751..6a7c969 100755 --- a/subscriptions-event/pom.xml +++ b/subscriptions-event/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-listener/pom.xml b/subscriptions-event/subscriptions-event-listener/pom.xml index ca39614..ac69e0e 100755 --- a/subscriptions-event/subscriptions-event-listener/pom.xml +++ b/subscriptions-event/subscriptions-event-listener/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/subscriptions-event-processor/pom.xml b/subscriptions-event/subscriptions-event-processor/pom.xml index 45903d8..26705f7 100755 --- a/subscriptions-event/subscriptions-event-processor/pom.xml +++ b/subscriptions-event/subscriptions-event-processor/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-event - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-healthchecks/pom.xml b/subscriptions-healthchecks/pom.xml index 0899b15..b742278 100644 --- a/subscriptions-healthchecks/pom.xml +++ b/subscriptions-healthchecks/pom.xml @@ -3,7 +3,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-integration-test/pom.xml b/subscriptions-integration-test/pom.xml index 44d881f..7ccea61 100755 --- a/subscriptions-integration-test/pom.xml +++ b/subscriptions-integration-test/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/pom.xml b/subscriptions-query/pom.xml index ee2f109..216e783 100755 --- a/subscriptions-query/pom.xml +++ b/subscriptions-query/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-api/pom.xml b/subscriptions-query/subscriptions-query-api/pom.xml index 5bf1c6a..b2812f2 100755 --- a/subscriptions-query/subscriptions-query-api/pom.xml +++ b/subscriptions-query/subscriptions-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-query/subscriptions-query-view/pom.xml b/subscriptions-query/subscriptions-query-view/pom.xml index 73eac4d..793c773 100755 --- a/subscriptions-query/subscriptions-query-view/pom.xml +++ b/subscriptions-query/subscriptions-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-query - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-service/pom.xml b/subscriptions-service/pom.xml index 65bd264..baa41e4 100644 --- a/subscriptions-service/pom.xml +++ b/subscriptions-service/pom.xml @@ -4,7 +4,7 @@ subscriptions-parent uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-viewstore/pom.xml b/subscriptions-viewstore/pom.xml index 49b7d82..c2660bb 100755 --- a/subscriptions-viewstore/pom.xml +++ b/subscriptions-viewstore/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-parent - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT subscriptions-viewstore diff --git a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml index ad30cfa..b25ebda 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-liquibase/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.subscriptions subscriptions-viewstore - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT subscriptions-viewstore-liquibase diff --git a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml index 71072d4..fc3bcc3 100755 --- a/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml +++ b/subscriptions-viewstore/subscriptions-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ subscriptions-viewstore uk.gov.moj.cpp.subscriptions - 17.0.46-PEG-2848-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0