Tmp/merge from main after 2616

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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

listing-integration-test/pom.xml

@@ -3,22 +3,14 @@
     <parent>
         <artifactId>listing-parent</artifactId>
         <groupId>uk.gov.moj.cpp.listing</groupId>
-        <version>17.103.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>listing-integration-test</artifactId>
 
     <properties>
         <jboss-logging.version>3.3.1.Final</jboss-logging.version>
-        <!--
-          Optional frozen-clock override for ItClock. Empty by default (live system UTC clock);
-          set -Dit.clock=2026-06-15T00:30:00+01:00[Europe/London] to simulate the 00:00-01:00 BST
-          band without waiting for real midnight (see run-it-midnight.sh). Declared here so the
-          failsafe systemPropertyVariables interpolation below resolves to "" when unset rather than
-          leaking the literal ${it.clock}.
-        -->
-        <it.clock />
     </properties>
 
     <dependencies>
@@ -202,48 +194,6 @@
                             <skip>true</skip>
                         </configuration>
                     </plugin>
-                    <!--
-                      Guard rail (Phase 4): fail the build if any IT source reads the wall clock
-                      directly instead of going through ItClock. Only the NO-ARG now() overloads and
-                      new Date() are banned; ItClock itself uses the Clock-argument overloads
-                      (LocalDate.now(CLOCK), ZonedDateTime.now(CLOCK)) so it is not flagged. The two
-                      timing/logging infra classes are excluded — their Instant.now() measures elapsed
-                      time, not a calendar date. Runs in the default build (mvn install); the
-                      command-line -P listing-integration-test profile deactivates this activeByDefault
-                      profile, so the guard adds zero overhead to the IT run itself.
-                    -->
-                    <plugin>
-                        <groupId>de.thetaphi</groupId>
-                        <artifactId>forbiddenapis</artifactId>
-                        <version>3.7</version>
-                        <configuration>
-                            <failOnUnresolvableSignatures>false</failOnUnresolvableSignatures>
-                            <signatures>
-                                java.time.LocalDate#now() @ Use ItClock.today() — the single anchored test clock
-                                java.time.LocalDateTime#now() @ Use ItClock.nowLocalDateTime()
-                                java.time.LocalTime#now() @ Derive from ItClock
-                                java.time.ZonedDateTime#now() @ Use ItClock.nowUtc() / ItClock.nowLondon()
-                                java.time.OffsetDateTime#now() @ Derive from ItClock
-                                java.time.Instant#now() @ Use ItClock.nowInstant() for data dates (elapsed-time infra is excluded)
-                                java.time.Year#now() @ Derive from ItClock
-                                java.util.Date#&lt;init&gt;() @ Use ItClock — new Date() reads the host clock/zone
-                            </signatures>
-                            <excludes>
-                                <exclude>**/it/util/ItClock.class</exclude>
-                                <exclude>**/TestDurationListener.class</exclude>
-                                <exclude>**/ServerLogTestMarkerExtension.class</exclude>
-                            </excludes>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>ban-direct-wall-clock-reads</id>
-                                <phase>process-test-classes</phase>
-                                <goals>
-                                    <goal>testCheck</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -279,14 +229,6 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <!--
-                              Forward the optional frozen-clock anchor into the forked IT JVM so
-                              ItClock.resolveClock() can read it. Empty when -Dit.clock is not given,
-                              which ItClock treats as "live system UTC clock" (see run-it-midnight.sh).
-                            -->
-                            <systemPropertyVariables>
-                                <it.clock>${it.clock}</it.clock>
-                            </systemPropertyVariables>
                             <includes>
                                 <include>**/*IT.java</include>
                             </includes>

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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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;
@@ -568,7 +567,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());
@@ -584,7 +583,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);
@@ -595,7 +594,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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-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.201-cct-1981-SNAPSHOT</version>
+        <version>17.104.4-cct-1981-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>