Dev/rebasepastfrommain2617

listing-command/listing-command-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>listing-command</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-command/listing-command-handler/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-command</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-command/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-aggregate/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-common/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-event/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/listing-domain-xhibit/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-domain</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-domain/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-domain</artifactId>

listing-event-sources/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-event/listing-event-listener/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-event</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-event/listing-event-processor/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-event</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-event/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-healthchecks/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-integration-test-persistence/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-integration-test/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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");
     }
 

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<UUID, String> COURT_ROOMS = new LinkedHashMap<>() {{
         put(fromString("1d0199f8-8812-48a2-b13c-837e1c03ff19"), "Courtroom 01");
         put(fromString("18982e9c-2475-36a4-a852-09ab720acfc9"), "Courtroom 03");

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() {

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;

listing-json/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-json</artifactId>

listing-performance-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-performance-test</artifactId>

listing-query/listing-query-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-query</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-query-api</artifactId>

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);

listing-query/listing-query-view/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-query</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
 
     <artifactId>listing-query-view</artifactId>

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;

listing-query/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-service/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-parent</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-viewstore/listing-viewstore-liquibase/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-viewstore</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-viewstore/listing-viewstore-persistence/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.listing</groupId>
         <artifactId>listing-viewstore</artifactId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-viewstore/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.181-PAST-SNAPSHOT</version>
+        <version>17.104.4-PAST-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>uk.gov.moj.cpp.common</groupId>
         <artifactId>service-parent-pom</artifactId>
-        <version>17.103.8</version>
+        <version>17.104.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
 
     <groupId>uk.gov.moj.cpp.listing</groupId>
     <artifactId>listing-parent</artifactId>
-    <version>17.103.181-PAST-SNAPSHOT</version>
+    <version>17.104.4-PAST-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Listing Context Microservice Parent</name>
@@ -29,7 +29,7 @@
         <sonar.report.export.path>sonar-report.json</sonar.report.export.path>
         <sonar.scm.provider>git</sonar.scm.provider>
         <mvn.site.url>file://${project.build.directory}/site</mvn.site.url>
-        <coredomain.version>17.103.13</coredomain.version>
+        <coredomain.version>17.104.3</coredomain.version>
         <referencedata.version>17.103.133</referencedata.version>
         <documentgenerator-client.version>1.0.4</documentgenerator-client.version>
         <sardine.version>5.7</sardine.version>
@@ -99,6 +99,25 @@
 
     <dependencyManagement>
         <dependencies>
+            <!--
+              Pin json-smart to 2.5.2. The 17.104 framework line pulls json-path 2.9.0 -> json-smart
+              2.4.9 transitively (compile scope in listing-event-processor, test scope elsewhere via
+              RestPoller). json-smart 2.4.9 has a regression in its depth guard: the nesting counter
+              is not decremented correctly, so the hardcoded MAX_DEPTH=400 effectively caps the total
+              number of objects/arrays in a document rather than actual nesting depth. Legitimate
+              large payloads (~64KB+) then fail with "Malicious payload, having non natural depths"
+              (InvalidJsonException), breaking any JsonPath evaluation over a big document — e.g.
+              RangeSearchQueryForCourtCalendarIT, whose court-centre verify response exceeds 64KB once
+              it holds 5 hearings — and a latent production risk in the event processor. 2.5.x fixes
+              the counter (correct depth accounting) while keeping the guard. 2.5.2 verified against
+              the failing payload and compatible with json-path 2.9.0.
+              https://github.com/aws-solutions/distributed-load-testing-on-aws/issues/146
+            -->
+            <dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>2.5.2</version>
+            </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>domain-test-dsl</artifactId>