diff --git a/pom.xml b/pom.xml index 92b34be..9691ae7 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.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 7c23190..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-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 c664c4a..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-SNAPSHOT + 17.0.47-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..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-SNAPSHOT + 17.0.47-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..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-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 8ac054b..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-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 cd5839c..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-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 8a79dcf..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-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 subscriptions-domain-transformation - 17.0.46-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 43cfeaa..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-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 52e4806..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-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-event/pom.xml b/subscriptions-event/pom.xml index 6e68886..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-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 47fea62..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-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 fc1f37b..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-SNAPSHOT + 17.0.47-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..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-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 0aaa0fa..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-SNAPSHOT + 17.0.47-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..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-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 5ddc9ff..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-SNAPSHOT + 17.0.47-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..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-SNAPSHOT + 17.0.47-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..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-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0 diff --git a/subscriptions-viewstore/pom.xml b/subscriptions-viewstore/pom.xml index b1573f6..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-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 23ddfc4..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-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 146e278..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-SNAPSHOT + 17.0.47-PEG-2848-SNAPSHOT 4.0.0