diff --git a/listing-command/listing-command-api/pom.xml b/listing-command/listing-command-api/pom.xml index 63b7d09b1..339cb16d9 100644 --- a/listing-command/listing-command-api/pom.xml +++ b/listing-command/listing-command-api/pom.xml @@ -4,7 +4,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-handler/pom.xml b/listing-command/listing-command-handler/pom.xml index 9d9e10156..2be581154 100644 --- a/listing-command/listing-command-handler/pom.xml +++ b/listing-command/listing-command-handler/pom.xml @@ -3,7 +3,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-command/pom.xml b/listing-command/pom.xml index fb9a41821..a829b4f27 100644 --- a/listing-command/pom.xml +++ b/listing-command/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-common/pom.xml b/listing-common/pom.xml index 30a9426b6..b2e170503 100644 --- a/listing-common/pom.xml +++ b/listing-common/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-aggregate/pom.xml b/listing-domain/listing-domain-aggregate/pom.xml index 8974bd2c4..f718ee319 100644 --- a/listing-domain/listing-domain-aggregate/pom.xml +++ b/listing-domain/listing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-common/pom.xml b/listing-domain/listing-domain-common/pom.xml index 3a6b164aa..6692a5305 100644 --- a/listing-domain/listing-domain-common/pom.xml +++ b/listing-domain/listing-domain-common/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-event/pom.xml b/listing-domain/listing-domain-event/pom.xml index 20e5fe5a0..25e6ca650 100644 --- a/listing-domain/listing-domain-event/pom.xml +++ b/listing-domain/listing-domain-event/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-xhibit/pom.xml b/listing-domain/listing-domain-xhibit/pom.xml index f3c99cfbc..f8308ab87 100644 --- a/listing-domain/listing-domain-xhibit/pom.xml +++ b/listing-domain/listing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-domain/pom.xml b/listing-domain/pom.xml index 31cb7ec85..9ec69eced 100644 --- a/listing-domain/pom.xml +++ b/listing-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT listing-domain diff --git a/listing-event-sources/pom.xml b/listing-event-sources/pom.xml index 6983823b1..1bc31ab28 100644 --- a/listing-event-sources/pom.xml +++ b/listing-event-sources/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-listener/pom.xml b/listing-event/listing-event-listener/pom.xml index a4ab8b610..6e5da67de 100644 --- a/listing-event/listing-event-listener/pom.xml +++ b/listing-event/listing-event-listener/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-processor/pom.xml b/listing-event/listing-event-processor/pom.xml index 1c7d6abb8..418687883 100644 --- a/listing-event/listing-event-processor/pom.xml +++ b/listing-event/listing-event-processor/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-event/pom.xml b/listing-event/pom.xml index 4a0be8d76..e496400f6 100644 --- a/listing-event/pom.xml +++ b/listing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-healthchecks/pom.xml b/listing-healthchecks/pom.xml index 6716e50c1..1a9a5dffd 100644 --- a/listing-healthchecks/pom.xml +++ b/listing-healthchecks/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-integration-test-persistence/pom.xml b/listing-integration-test-persistence/pom.xml index be814597d..88e02fff6 100644 --- a/listing-integration-test-persistence/pom.xml +++ b/listing-integration-test-persistence/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/pom.xml b/listing-integration-test/pom.xml index 652a55f9f..652f50e75 100644 --- a/listing-integration-test/pom.xml +++ b/listing-integration-test/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java index 51c8e4799..86b42610b 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java @@ -73,7 +73,7 @@ void setUp() { setupProgressionNotesStubs(); setupUsersGroupPermissionsForApplicationTypeStub(); databaseCleaner.cleanEventStoreTables(CONTEXT_NAME); - databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, "stream_status", + databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, "stream_status","processed_event", "stream_buffer", "hearing", "hearing_days", "listing_notes", "cache_refdata_courtroom", "court_list_publish_status", "published_court_list"); } diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java index cbe83d4f6..94465aa6b 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java @@ -43,7 +43,6 @@ @SuppressWarnings({"squid:S1607"}) public class RangeSearchQueryForCourtCalendarIT extends AbstractIT { - private static final String CONTEXT_NAME = "listing"; private static final Map COURT_ROOMS = new LinkedHashMap<>() {{ put(fromString("1d0199f8-8812-48a2-b13c-837e1c03ff19"), "Courtroom 01"); put(fromString("18982e9c-2475-36a4-a852-09ab720acfc9"), "Courtroom 03"); diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java index dda443fc1..84b8ad467 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java @@ -7,7 +7,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.Matchers.is; import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.getHearingFilter; import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.pollForHearing; import static uk.gov.moj.cpp.listing.steps.UpdateHearingSteps.DEFAULT_DURATION_HOURS_MINS; @@ -46,10 +46,17 @@ public void whenHearingIsUpdatedForListingForWeekCommencingDate() { request = prepareJsonForUpdatedHearingData(updatedHearingData); - final Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING, - request, getLoggedInHeader()); - - assertThat(response.getStatus(), equalTo(SC_ACCEPTED)); + try (Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING, request, getLoggedInHeader())) { + + String responseBody = ""; + try { + responseBody = response.readEntity(String.class); + } catch (IllegalStateException e) { + //no-op in case of no response + } + assertThat(format("Post returned not expected status code with body: %s", responseBody), + response.getStatus(), is(SC_ACCEPTED)); + } } public void verifyHearingUpdatedWithWeekCommencingDateAndUnallocatedWhenQueryingFromAPI() { diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java index b26641c28..2bd993f6a 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.listing.utils; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.apache.commons.io.FileUtils.readFileToString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/listing-json/pom.xml b/listing-json/pom.xml index c428e9ca8..dfe52e517 100644 --- a/listing-json/pom.xml +++ b/listing-json/pom.xml @@ -4,7 +4,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT listing-json diff --git a/listing-performance-test/pom.xml b/listing-performance-test/pom.xml index 4b8adc92e..88ad70531 100644 --- a/listing-performance-test/pom.xml +++ b/listing-performance-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT listing-performance-test diff --git a/listing-query/listing-query-api/pom.xml b/listing-query/listing-query-api/pom.xml index e2b989ce7..3b7851a9e 100644 --- a/listing-query/listing-query-api/pom.xml +++ b/listing-query/listing-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT listing-query-api diff --git a/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java b/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java index af4fa7adb..1037063e1 100644 --- a/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java +++ b/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java @@ -44,7 +44,6 @@ import javax.inject.Inject; import uk.gov.justice.services.messaging.JsonObjects; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -373,7 +372,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope if (appDetails.isPresent()) { final CourtApplication courtApplicationObj = jsonObjectToObjectConverter.convert(appDetails.get().getJsonObject("courtApplication"), CourtApplication.class); - final JsonObjectBuilder appBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder appBuilder = JsonObjects.createObjectBuilder(); application.forEach(appBuilder::add); appBuilder.add("applicationTypeCode", courtApplicationObj.getType().getCode()); applicationsBuilder.add(appBuilder.build()); @@ -389,7 +388,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope } private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonObject hearing, final JsonArrayBuilder applicationsBuilder) { - final JsonObjectBuilder hearingBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder hearingBuilder = JsonObjects.createObjectBuilder(); hearing.forEach((key, value) -> { if (!COURT_APPLICATIONS.equals(key)) { hearingBuilder.add(key, value); @@ -400,7 +399,7 @@ private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonO } private static @NonNull JsonObjectBuilder buildResponsePayloadWithUpdatedHearing(final JsonObject payload, final JsonArrayBuilder hearingsBuilder) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payload.forEach((key, value) -> { if (!HEARINGS.equals(key)) { payloadBuilder.add(key, value); diff --git a/listing-query/listing-query-view/pom.xml b/listing-query/listing-query-view/pom.xml index db16fe9f6..c6b1807d0 100644 --- a/listing-query/listing-query-view/pom.xml +++ b/listing-query/listing-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT listing-query-view diff --git a/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java b/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java index 8726239de..d36ca2b4b 100644 --- a/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java +++ b/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.listing.query.view.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/listing-query/pom.xml b/listing-query/pom.xml index 6051ba1a7..5df7e5ff9 100644 --- a/listing-query/pom.xml +++ b/listing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-service/pom.xml b/listing-service/pom.xml index 6413e2006..157aad1e7 100644 --- a/listing-service/pom.xml +++ b/listing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-liquibase/pom.xml b/listing-viewstore/listing-viewstore-liquibase/pom.xml index 23a726e2f..872b4ae3e 100644 --- a/listing-viewstore/listing-viewstore-liquibase/pom.xml +++ b/listing-viewstore/listing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ listing-viewstore uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-persistence/pom.xml b/listing-viewstore/listing-viewstore-persistence/pom.xml index 08b75062a..692654023 100644 --- a/listing-viewstore/listing-viewstore-persistence/pom.xml +++ b/listing-viewstore/listing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-viewstore - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/pom.xml b/listing-viewstore/pom.xml index 68588c765..ad676fc1a 100644 --- a/listing-viewstore/pom.xml +++ b/listing-viewstore/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 7cf82bbb1..515cf5c14 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.8 + 17.104.1 4.0.0 uk.gov.moj.cpp.listing listing-parent - 17.103.181-PAST-SNAPSHOT + 17.104.4-PAST-SNAPSHOT pom Listing Context Microservice Parent @@ -29,7 +29,7 @@ sonar-report.json git file://${project.build.directory}/site - 17.103.13 + 17.104.3 17.103.133 1.0.4 5.7 @@ -99,6 +99,25 @@ + + + net.minidev + json-smart + 2.5.2 + uk.gov.justice.services domain-test-dsl