From 965dd148ad40b049c0f30845046878b2c03d3cb4 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Thu, 4 Jun 2026 09:06:16 +0100 Subject: [PATCH 01/11] pom version --- hearing-command/hearing-command-api/pom.xml | 2 +- hearing-command/hearing-command-handler/pom.xml | 2 +- hearing-command/pom.xml | 2 +- hearing-common/pom.xml | 2 +- hearing-domain/hearing-domain-aggregate/pom.xml | 2 +- hearing-domain/hearing-domain-common/pom.xml | 2 +- hearing-domain/hearing-domain-event/pom.xml | 2 +- hearing-domain/hearing-domain-xhibit/pom.xml | 2 +- hearing-domain/pom.xml | 2 +- hearing-event-sources/pom.xml | 2 +- hearing-event/hearing-event-listener/pom.xml | 2 +- hearing-event/hearing-event-processor/pom.xml | 2 +- hearing-event/pom.xml | 2 +- hearing-healthchecks/pom.xml | 2 +- hearing-integration-test/pom.xml | 2 +- hearing-json/pom.xml | 2 +- hearing-query/hearing-query-api/pom.xml | 2 +- hearing-query/hearing-query-view/pom.xml | 2 +- hearing-query/pom.xml | 2 +- hearing-service/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-liquibase/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-persistence/pom.xml | 2 +- hearing-viewstore/pom.xml | 2 +- pojo-plugin/pom.xml | 2 +- pom.xml | 2 +- test-utilities/pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hearing-command/hearing-command-api/pom.xml b/hearing-command/hearing-command-api/pom.xml index 79eea6087..7303685a4 100644 --- a/hearing-command/hearing-command-api/pom.xml +++ b/hearing-command/hearing-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index 818d80b5f..c05f6a10c 100644 --- a/hearing-command/hearing-command-handler/pom.xml +++ b/hearing-command/hearing-command-handler/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-command-handler war diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index 1d2a040f9..dc0bd3b72 100644 --- a/hearing-command/pom.xml +++ b/hearing-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index 16a209f0c..49a476960 100644 --- a/hearing-common/pom.xml +++ b/hearing-common/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index 4e3c08136..aba9a78e8 100644 --- a/hearing-domain/hearing-domain-aggregate/pom.xml +++ b/hearing-domain/hearing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index e60e847c2..d9cefccbc 100644 --- a/hearing-domain/hearing-domain-common/pom.xml +++ b/hearing-domain/hearing-domain-common/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index 3a88674de..521b3bec6 100644 --- a/hearing-domain/hearing-domain-event/pom.xml +++ b/hearing-domain/hearing-domain-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index 2b9e78c34..ab988944a 100644 --- a/hearing-domain/hearing-domain-xhibit/pom.xml +++ b/hearing-domain/hearing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index 3930703ac..c91773333 100644 --- a/hearing-domain/pom.xml +++ b/hearing-domain/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index 365e2e233..9f8008944 100644 --- a/hearing-event-sources/pom.xml +++ b/hearing-event-sources/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hearing-event/hearing-event-listener/pom.xml b/hearing-event/hearing-event-listener/pom.xml index b1d3032f2..ab45499e0 100644 --- a/hearing-event/hearing-event-listener/pom.xml +++ b/hearing-event/hearing-event-listener/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-event - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index 6efb867c2..de476826e 100644 --- a/hearing-event/hearing-event-processor/pom.xml +++ b/hearing-event/hearing-event-processor/pom.xml @@ -3,7 +3,7 @@ hearing-event uk.gov.moj.cpp.hearing - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT 4.0.0 war diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index 170c2d456..6e08466ba 100644 --- a/hearing-event/pom.xml +++ b/hearing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index 52a05a937..6d09ed7f2 100644 --- a/hearing-healthchecks/pom.xml +++ b/hearing-healthchecks/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index 125e6781e..b6fee6a2b 100644 --- a/hearing-integration-test/pom.xml +++ b/hearing-integration-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-integration-test diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index c5b5da6ee..52571b256 100644 --- a/hearing-json/pom.xml +++ b/hearing-json/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index 39b5f3206..2c5f2ee7d 100644 --- a/hearing-query/hearing-query-api/pom.xml +++ b/hearing-query/hearing-query-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index bf018a115..579bd2c7d 100644 --- a/hearing-query/hearing-query-view/pom.xml +++ b/hearing-query/hearing-query-view/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index e9bf51e63..f6fc95096 100644 --- a/hearing-query/pom.xml +++ b/hearing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index 12bfa14a1..ba8434d1a 100644 --- a/hearing-service/pom.xml +++ b/hearing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index 452650e6d..3258663ab 100644 --- a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml +++ b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index 559c4f6d0..558f67e4e 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/pom.xml +++ b/hearing-viewstore/hearing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index ba236614b..e1daf5a3c 100644 --- a/hearing-viewstore/pom.xml +++ b/hearing-viewstore/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index 9ff7c038b..d6b4b2400 100644 --- a/pojo-plugin/pom.xml +++ b/pojo-plugin/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index 643f19ea0..068080291 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT pom Hearing Context - Parent Module diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index 8c2e8a7f4..ea723c4b5 100644 --- a/test-utilities/pom.xml +++ b/test-utilities/pom.xml @@ -7,7 +7,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-SNAPSHOT + 17.104.169-lpt2325-SNAPSHOT From 71f3aefed1de5dcc1c874f3ec0a2e9730349f769 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Wed, 3 Jun 2026 21:46:55 +0100 Subject: [PATCH 02/11] Restriction int tests fix --- .../hearing/it/CourtListRestrictionIT.java | 36 +++++++++++++++++++ .../steps/CourtListRestrictionSteps.java | 34 ++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java index 00ea86154..6c3b8d64b 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java @@ -71,6 +71,10 @@ public void shouldRequestToPublishCourtListWithCaseRestriction() throws Exceptio withJsonPath("$.caseIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for the restriction projection to land before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(0))); + JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -96,6 +100,10 @@ public void shouldRequestToPublishCourtListWithCaseRestriction() throws Exceptio withJsonPath("$.caseIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for the un-restriction projection to land before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(1))); + publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); @@ -127,6 +135,10 @@ public void shouldRequestToPublishCourtListWithDefendantRestrictionOnOff() throw withJsonPath("$.defendantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for defendant restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants", hasSize(0))); + final JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -155,6 +167,10 @@ public void shouldRequestToPublishCourtListWithDefendantRestrictionOnOff() throw withJsonPath("$.defendantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for defendant un-restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants", hasSize(1))); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); @@ -191,6 +207,10 @@ public void shouldRequestToPublishCourtListForApplicationRestrictionOnOff() thro withJsonPath("$.courtApplicationIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for application restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(0))); + JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -216,6 +236,10 @@ public void shouldRequestToPublishCourtListForApplicationRestrictionOnOff() thro withJsonPath("$.courtApplicationIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for application un-restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails", hasSize(1))); + publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); @@ -249,6 +273,10 @@ public void shouldRequestToPublishCourtListForApplicationApplicantRestrictionOnO withJsonPath("$.courtApplicationApplicantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(true))))); + // Wait for applicant restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0].firstName", org.hamcrest.CoreMatchers.nullValue())); + JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); @@ -274,6 +302,10 @@ public void shouldRequestToPublishCourtListForApplicationApplicantRestrictionOnO withJsonPath("$.courtApplicationApplicantIds", hasSize(1)), withJsonPath("$.restrictCourtList", is(false))))); + // Wait for applicant un-restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0].firstName", org.hamcrest.CoreMatchers.notNullValue())); + publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); @@ -308,6 +340,10 @@ public void shouldRequestToPublishCourtListWhenYoungDefendantIsRestrictedOnIniti caseId, randomUUID(), courtRoom2Id, randomUUID().toString(), OPEN_CASE_PROSECUTION_EVENT_DEFINITION_ID, eventTime, of(hearingTypeId), courtCentreId, eventTime.toLocalDate()); + // Wait for the young-defendant restriction to land in the projection before publishing + courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), + withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants", hasSize(0))); + final JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); final PublishCourtListSteps publishCourtListSteps = new PublishCourtListSteps(); diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java index 65423c2ed..aa7743c5a 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java @@ -3,11 +3,21 @@ import static com.google.common.collect.Lists.newArrayList; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; +import static java.text.MessageFormat.format; import static java.util.UUID.fromString; import static java.util.UUID.randomUUID; +import static java.util.concurrent.TimeUnit.SECONDS; +import static javax.ws.rs.core.Response.Status.OK; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; +import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; +import static uk.gov.justice.services.test.utils.core.http.BaseUriProvider.getBaseUri; +import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; +import static uk.gov.justice.services.test.utils.core.http.RestPoller.poll; +import static uk.gov.justice.services.test.utils.core.matchers.ResponsePayloadMatcher.payload; +import static uk.gov.justice.services.test.utils.core.matchers.ResponseStatusMatcher.status; +import static uk.gov.moj.cpp.hearing.utils.WireMockStubUtils.setupAsAuthorizedAndSystemUser; import static uk.gov.justice.hearing.courts.CourtListRestricted.courtListRestricted; import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; import static uk.gov.moj.cpp.hearing.it.UseCases.asDefault; @@ -87,6 +97,30 @@ public JsonPath hearingEventsCourtListRestrictedReceived(final Matcher matche } } + /** + * Polls the publish-side query {@code hearing.latest-hearings-by-court-centres} until the + * restriction projection has reached the expected state. The publish flow internally consumes + * the same query — once it reflects the toggle, the next {@code publish-court-list} command is + * guaranteed to see the same state. + *

+ * Required because {@link #hearingEventsCourtListRestrictedReceived(Matcher)} only confirms the + * hearing event was emitted; the listener that projects it into the JPA entity runs in a + * separate transaction and may lag behind the publish command if not waited for. + */ + public void waitForRestrictionProjection(final String courtCentreId, + final LocalDate hearingDate, + final Matcher expectedPayload) { + setupAsAuthorizedAndSystemUser(USER_ID_VALUE_AS_ADMIN); + final String queryPart = format(ENDPOINT_PROPERTIES.getProperty("hearing.latest-hearings-by-court-centres"), courtCentreId, hearingDate); + final String searchCourtListUrl = String.format("%s/%s", getBaseUri(), queryPart); + + poll(requestParams(searchCourtListUrl, "application/vnd.hearing.latest-hearings-by-court-centres+json") + .withHeader(USER_ID, getLoggedInSystemUserHeader())) + .timeout(60, SECONDS) + .pollInterval(1, SECONDS) + .until(status().is(OK), payload().isJson(expectedPayload)); + } + private void sendListingPublicEvent(final JsonObject restrictCourtListDataObject) { sendMessage( getPublicTopicInstance().createProducer(), From af3df32e2493a5b89c7c100d6fba12deeff02610 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Thu, 4 Jun 2026 09:10:33 +0100 Subject: [PATCH 03/11] further int test fixes --- .../hearing/it/CourtListRestrictionIT.java | 27 ++++++++++++++++++- .../gov/moj/cpp/hearing/utils/WebDavStub.java | 20 ++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java index 6c3b8d64b..44ad0c3c2 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java @@ -1,5 +1,6 @@ package uk.gov.moj.cpp.hearing.it; +import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath; import static com.jayway.jsonpath.matchers.JsonPathMatchers.isJson; import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; import static java.util.Optional.of; @@ -11,6 +12,10 @@ import static org.hamcrest.Matchers.is; import static uk.gov.moj.cpp.hearing.it.PublishLatestCourtCentreHearingEventsIT.XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26; import static uk.gov.moj.cpp.hearing.steps.HearingEventStepDefinitions.OPEN_CASE_PROSECUTION_EVENT_DEFINITION_ID; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.awaitNewFile; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.awaitNewSentXmlForPubDisplay; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.countFilesAt; +import static uk.gov.moj.cpp.hearing.utils.WebDavStub.countSentXmlForPubDisplay; import static uk.gov.moj.cpp.hearing.utils.WebDavStub.getFileForPath; import static uk.gov.moj.cpp.hearing.utils.WebDavStub.getSentXmlForPubDisplay; @@ -106,9 +111,14 @@ public void shouldRequestToPublishCourtListWithCaseRestriction() throws Exceptio publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); @@ -171,8 +181,13 @@ public void shouldRequestToPublishCourtListWithDefendantRestrictionOnOff() throw courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants", hasSize(1))); + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); @@ -242,9 +257,14 @@ public void shouldRequestToPublishCourtListForApplicationRestrictionOnOff() thro publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); @@ -275,7 +295,7 @@ public void shouldRequestToPublishCourtListForApplicationApplicantRestrictionOnO // Wait for applicant restriction to land in the projection before publishing courtListRestrictionSteps.waitForRestrictionProjection(courtCentreId, eventTime.toLocalDate(), - withJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0].firstName", org.hamcrest.CoreMatchers.nullValue())); + hasNoJsonPath("$.court.courtSites[0].courtRooms[0].cases.casesDetails[0].defendants[0].firstName")); JsonObject publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); @@ -308,9 +328,14 @@ public void shouldRequestToPublishCourtListForApplicationApplicantRestrictionOnO publishCourtListJsonObject = buildPublishCourtListJsonString(courtCentreId, "26"); + final int webPageCountBeforeSecondPublish = countFilesAt(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); + final int pubDisplayCountBeforeSecondPublish = countSentXmlForPubDisplay(); + courtCentreId = sendPublishCourtListCommand(publishCourtListJsonObject, courtCentreId); publishCourtListSteps.verifyCourtListPublishStatusReturnedWhenQueryingFromAPI(courtCentreId); + awaitNewFile(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26, webPageCountBeforeSecondPublish); + awaitNewSentXmlForPubDisplay(pubDisplayCountBeforeSecondPublish); filePayload = getFileForPath(XHIBIT_GATEWAY_SEND_WEB_PAGE_TO_XHIBIT_FILE_NAME_26); filePayloadForPubDisplay = getSentXmlForPubDisplay(); diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java index 7c30374ed..8411194ea 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/utils/WebDavStub.java @@ -7,11 +7,13 @@ import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static javax.ws.rs.core.Response.Status.OK; +import static org.awaitility.Durations.ONE_MINUTE; import java.util.List; import java.util.UUID; import com.github.tomakehurst.wiremock.verification.LoggedRequest; +import org.awaitility.Awaitility; public class WebDavStub { @@ -35,4 +37,22 @@ public static String getFileForPath(final String filePath) { return loggedRequest.getBodyAsString(); } + + public static int countFilesAt(final String filePath) { + return findAll(putRequestedFor(urlPathMatching(filePath))).size(); + } + + public static int countSentXmlForPubDisplay() { + return countFilesAt(XHIBIT_GATEWAY_SEND_PUB_DISP_TO_XHIBIT_FILE_PATH_REG_EX); + } + + public static void awaitNewFile(final String filePath, final int previousCount) { + Awaitility.await() + .atMost(ONE_MINUTE) + .until(() -> countFilesAt(filePath) > previousCount); + } + + public static void awaitNewSentXmlForPubDisplay(final int previousCount) { + awaitNewFile(XHIBIT_GATEWAY_SEND_PUB_DISP_TO_XHIBIT_FILE_PATH_REG_EX, previousCount); + } } From afb0b3efca3a1b072768012756ea80f97f7ad083 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Thu, 4 Jun 2026 09:10:33 +0100 Subject: [PATCH 04/11] further int test fixes --- .../cpp/hearing/steps/CourtListRestrictionSteps.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java index aa7743c5a..849e1b598 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java @@ -11,6 +11,7 @@ import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; import static uk.gov.justice.services.common.http.HeaderConstants.USER_ID; import static uk.gov.justice.services.test.utils.core.http.BaseUriProvider.getBaseUri; import static uk.gov.justice.services.test.utils.core.http.RequestParamsBuilder.requestParams; @@ -106,6 +107,12 @@ public JsonPath hearingEventsCourtListRestrictedReceived(final Matcher matche * Required because {@link #hearingEventsCourtListRestrictedReceived(Matcher)} only confirms the * hearing event was emitted; the listener that projects it into the JPA entity runs in a * separate transaction and may lag behind the publish command if not waited for. + *

+ * A hearing-visibility precondition ({@code courtRoomId notNullValue}) is prepended to the + * caller's matcher to prevent the poll from short-circuiting on the empty/not-yet-projected + * state — without this, lenient matchers such as {@code hasNoJsonPath(...)} or + * {@code withJsonPath(..., hasSize(0))} would match an empty {@code {}} response and return + * before the restriction event has actually been processed. */ public void waitForRestrictionProjection(final String courtCentreId, final LocalDate hearingDate, @@ -118,7 +125,9 @@ public void waitForRestrictionProjection(final String courtCentreId, .withHeader(USER_ID, getLoggedInSystemUserHeader())) .timeout(60, SECONDS) .pollInterval(1, SECONDS) - .until(status().is(OK), payload().isJson(expectedPayload)); + .until(status().is(OK), payload().isJson(allOf( + withJsonPath("$.court.courtSites[0].courtRooms[0].courtRoomId", notNullValue()), + expectedPayload))); } private void sendListingPublicEvent(final JsonObject restrictCourtListDataObject) { From 7312be9153d3ee70fa8ac7d81a848380693b1727 Mon Sep 17 00:00:00 2001 From: devops-team Date: Thu, 4 Jun 2026 13:04:23 +0000 Subject: [PATCH 05/11] New 17.104.170-lpt2325-SNAPSHOT --- hearing-command/hearing-command-api/pom.xml | 2 +- hearing-command/hearing-command-handler/pom.xml | 2 +- hearing-command/pom.xml | 2 +- hearing-common/pom.xml | 2 +- hearing-domain/hearing-domain-aggregate/pom.xml | 2 +- hearing-domain/hearing-domain-common/pom.xml | 2 +- hearing-domain/hearing-domain-event/pom.xml | 2 +- hearing-domain/hearing-domain-xhibit/pom.xml | 2 +- hearing-domain/pom.xml | 2 +- hearing-event-sources/pom.xml | 2 +- hearing-event/hearing-event-listener/pom.xml | 2 +- hearing-event/hearing-event-processor/pom.xml | 2 +- hearing-event/pom.xml | 2 +- hearing-healthchecks/pom.xml | 2 +- hearing-integration-test/pom.xml | 2 +- hearing-json/pom.xml | 2 +- hearing-query/hearing-query-api/pom.xml | 2 +- hearing-query/hearing-query-view/pom.xml | 2 +- hearing-query/pom.xml | 2 +- hearing-service/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-liquibase/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-persistence/pom.xml | 2 +- hearing-viewstore/pom.xml | 2 +- pojo-plugin/pom.xml | 2 +- pom.xml | 2 +- test-utilities/pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hearing-command/hearing-command-api/pom.xml b/hearing-command/hearing-command-api/pom.xml index 7303685a4..5c436b1fd 100644 --- a/hearing-command/hearing-command-api/pom.xml +++ b/hearing-command/hearing-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index c05f6a10c..fa039ea76 100644 --- a/hearing-command/hearing-command-handler/pom.xml +++ b/hearing-command/hearing-command-handler/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-command-handler war diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index dc0bd3b72..8ac41f2a9 100644 --- a/hearing-command/pom.xml +++ b/hearing-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index 49a476960..644b19adf 100644 --- a/hearing-common/pom.xml +++ b/hearing-common/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index aba9a78e8..a21368690 100644 --- a/hearing-domain/hearing-domain-aggregate/pom.xml +++ b/hearing-domain/hearing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index d9cefccbc..621caeb9d 100644 --- a/hearing-domain/hearing-domain-common/pom.xml +++ b/hearing-domain/hearing-domain-common/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index 521b3bec6..d6ef018ea 100644 --- a/hearing-domain/hearing-domain-event/pom.xml +++ b/hearing-domain/hearing-domain-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index ab988944a..4e89a3876 100644 --- a/hearing-domain/hearing-domain-xhibit/pom.xml +++ b/hearing-domain/hearing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index c91773333..a855a4e06 100644 --- a/hearing-domain/pom.xml +++ b/hearing-domain/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index 9f8008944..f083ac486 100644 --- a/hearing-event-sources/pom.xml +++ b/hearing-event-sources/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hearing-event/hearing-event-listener/pom.xml b/hearing-event/hearing-event-listener/pom.xml index ab45499e0..005fa7e5c 100644 --- a/hearing-event/hearing-event-listener/pom.xml +++ b/hearing-event/hearing-event-listener/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-event - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index de476826e..686cbd001 100644 --- a/hearing-event/hearing-event-processor/pom.xml +++ b/hearing-event/hearing-event-processor/pom.xml @@ -3,7 +3,7 @@ hearing-event uk.gov.moj.cpp.hearing - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT 4.0.0 war diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index 6e08466ba..46dfd89fa 100644 --- a/hearing-event/pom.xml +++ b/hearing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index 6d09ed7f2..234c03211 100644 --- a/hearing-healthchecks/pom.xml +++ b/hearing-healthchecks/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index b6fee6a2b..200f5bfda 100644 --- a/hearing-integration-test/pom.xml +++ b/hearing-integration-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-integration-test diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index 52571b256..7c4345478 100644 --- a/hearing-json/pom.xml +++ b/hearing-json/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index 2c5f2ee7d..429fd99f0 100644 --- a/hearing-query/hearing-query-api/pom.xml +++ b/hearing-query/hearing-query-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index 579bd2c7d..f5819ee66 100644 --- a/hearing-query/hearing-query-view/pom.xml +++ b/hearing-query/hearing-query-view/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index f6fc95096..a8c1e61c5 100644 --- a/hearing-query/pom.xml +++ b/hearing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index ba8434d1a..2bca81d46 100644 --- a/hearing-service/pom.xml +++ b/hearing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index 3258663ab..a845db03e 100644 --- a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml +++ b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index 558f67e4e..2ee14628a 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/pom.xml +++ b/hearing-viewstore/hearing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index e1daf5a3c..38bd02537 100644 --- a/hearing-viewstore/pom.xml +++ b/hearing-viewstore/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index d6b4b2400..7fbd2d598 100644 --- a/pojo-plugin/pom.xml +++ b/pojo-plugin/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index 068080291..37d487811 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT pom Hearing Context - Parent Module diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index ea723c4b5..78aec3d96 100644 --- a/test-utilities/pom.xml +++ b/test-utilities/pom.xml @@ -7,7 +7,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-lpt2325-SNAPSHOT + 17.104.170-lpt2325-SNAPSHOT From 3d02a5a7d147de9f1f90a1e03f4f0d2b80ecdee9 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou HMCTS Date: Thu, 4 Jun 2026 16:22:15 +0100 Subject: [PATCH 06/11] Update README.md From 7052ce5d75101f66f0489d55ff99df5a193f8b40 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Fri, 5 Jun 2026 10:22:40 +0100 Subject: [PATCH 07/11] further int test fixes --- .../steps/CourtListRestrictionSteps.java | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java index 849e1b598..6fb6f8999 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java @@ -130,6 +130,33 @@ public void waitForRestrictionProjection(final String courtCentreId, expectedPayload))); } + /** + * Polls the publish-side query {@code hearing.latest-hearings-by-court-centres} until the + * just-created hearing is observable. MUST be called after {@code createHearingEvent*} and + * BEFORE any {@code hide*FromXhibit} call. + *

+ * Without this wait, the {@code public.listing.court-list-restricted} → ... → + * {@code hearing.event.court-list-restricted} chain can reach + * {@link uk.gov.moj.cpp.hearing.event.listener.CourtListRestrictionEventListener} before the + * hearing-creation projection has committed to {@code ha_hearing}. The listener does + * {@code hearingRepository.findOptionalBy(hearingId)} and, if the row is missing, silently + * returns (the message is consumed and never replayed). The restriction is then lost, the + * subsequent publish reads the un-restricted hearing, and the assertion on the redacted XML + * fails. This flake reproduced ~2/3 of CI runs on team/rv-2616. + */ + public void waitForHearingVisible(final String courtCentreId, final LocalDate hearingDate) { + setupAsAuthorizedAndSystemUser(USER_ID_VALUE_AS_ADMIN); + final String queryPart = format(ENDPOINT_PROPERTIES.getProperty("hearing.latest-hearings-by-court-centres"), courtCentreId, hearingDate); + final String searchCourtListUrl = String.format("%s/%s", getBaseUri(), queryPart); + + poll(requestParams(searchCourtListUrl, "application/vnd.hearing.latest-hearings-by-court-centres+json") + .withHeader(USER_ID, getLoggedInSystemUserHeader())) + .timeout(60, SECONDS) + .pollInterval(1, SECONDS) + .until(status().is(OK), payload().isJson( + withJsonPath("$.court.courtSites[0].courtRooms[0].courtRoomId", notNullValue()))); + } + private void sendListingPublicEvent(final JsonObject restrictCourtListDataObject) { sendMessage( getPublicTopicInstance().createProducer(), @@ -142,11 +169,12 @@ public CommandHelpers.InitiateHearingCommandHelper createHearingEvent(final UUID final UUID eventDefinitionId, final ZonedDateTime eventTime, final Optional hearingTypeId, String courtCenter, LocalDate localDate) throws NoSuchAlgorithmException { final CommandHelpers.InitiateHearingCommandHelper hearing = h(UseCases.initiateHearingWithNsp(getRequestSpec(), initiateHearingTemplateWithParamNoReportingRestriction(fromString(courtCenter), fromString(courtRoomId), "CourtRoom 1", localDate, fromString(defenceCounselId), caseId, hearingTypeId))); logEvent(hearingEventId, getRequestSpec(), asDefault(), hearing.it(), eventDefinitionId, false, fromString(defenceCounselId), eventTime, null); + waitForHearingVisible(courtCenter, eventTime.toLocalDate()); return hearing; } public CommandHelpers.InitiateHearingCommandHelper createHearingEventWithYoungDefendant(final UUID caseId, final UUID hearingEventId, final String courtRoomId, final String defenceCounselId, - final UUID eventDefinitionId, final ZonedDateTime eventTime, final Optional hearingTypeId, final String courtCenter, final LocalDate localDate) throws NoSuchAlgorithmException { + final UUID eventDefinitionId, final ZonedDateTime eventTime, final Optional hearingTypeId, final String courtCenter, final LocalDate localDate) throws NoSuchAlgorithmException { try (final Utilities.EventListener eventListener = listenFor(HEARING_EVENTS_COURT_LIST_RESTRICTED, HEARING_EVENT) .withFilter(isJson(allOf( withJsonPath("$.defendantIds", hasSize(1)), @@ -155,6 +183,7 @@ public CommandHelpers.InitiateHearingCommandHelper createHearingEventWithYoungDe initiateHearingTemplateWithParamNoReportingRestrictionYoungDefendant(fromString(courtCenter), fromString(courtRoomId), "CourtRoom 1", localDate, fromString(defenceCounselId), caseId, hearingTypeId))); logEvent(hearingEventId, getRequestSpec(), asDefault(), hearing.it(), eventDefinitionId, false, fromString(defenceCounselId), eventTime, null); eventListener.waitFor(); + waitForHearingVisible(courtCenter, eventTime.toLocalDate()); return hearing; } } @@ -164,6 +193,7 @@ public CommandHelpers.InitiateHearingCommandHelper createHearingEventForApplicat final CommandHelpers.InitiateHearingCommandHelper hearing = h(initiateHearingForApplication(getRequestSpec(), initiateHearingTemplateForApplicationNoReportingRestriction(fromString(courtCenter), fromString(courtRoomId), "CourtRoom 1", localDate, fromString(defenceCounselId), caseId, hearingTypeId))); givenAUserHasLoggedInAsACourtClerk(randomUUID()); logEvent(hearingEventId, getRequestSpec(), asDefault(), hearing.it(), eventDefinitionId, false, fromString(defenceCounselId), eventTime, null); + waitForHearingVisible(courtCenter, eventTime.toLocalDate()); return hearing; } From 77ff7a5ee8f3608219613d42a7224bfe0dd20969 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Fri, 5 Jun 2026 13:11:30 +0100 Subject: [PATCH 08/11] further int test fixes --- .../uk/gov/moj/cpp/hearing/it/AbstractIT.java | 4 +- .../hearing/it/CourtListRestrictionIT.java | 24 +++++- .../steps/CourtListRestrictionSteps.java | 75 +++++++++++++++---- 3 files changed, 84 insertions(+), 19 deletions(-) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java index 616ab69dc..ec4743129 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/AbstractIT.java @@ -294,8 +294,8 @@ protected void stubProsecutionCases(final Hearing hearing) { hearing.getProsecutionCases().forEach(prosecutionCase -> stubGetProgressionProsecutionCases(prosecutionCase.getId())); } - protected void cleanDatabase(final String dbTableName) { + protected void cleanDatabase(final String dbTableName, final String... additionalTables) { final DatabaseCleaner databaseCleaner = new DatabaseCleaner(); - databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, dbTableName); + databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, dbTableName, additionalTables); } } diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java index 44ad0c3c2..d25881ed9 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java @@ -40,9 +40,29 @@ public class CourtListRestrictionIT extends AbstractPublishLatestCourtCentreHear private ZonedDateTime eventTime; + /** + * Clean every table that can carry state across tests in this class. All five tests bind + * their hearings to the SAME static {@code caseId} (see + * {@link AbstractPublishLatestCourtCentreHearingIT}), so residual + * {@code is_court_list_restricted=true} on {@code ha_prosecution_case} or + * {@code ha_defendant} from one test poisons the next. The + * {@code court_list_publish_status} row is also dropped so the FIRST publish in this class + * cannot inherit {@code EXPORT_SUCCESSFUL} from a prior test class's publish — without + * this, {@code verifyCourtListPublishStatusReturnedWhenQueryingFromAPI} returns on the + * stale status before the current publish has produced a file. + */ + private void cleanRestrictionTables() { + cleanDatabase("ha_hearing", + "ha_prosecution_case", + "ha_defendant", + "ha_hearing_day", + "ha_hearing_event", + "court_list_publish_status"); + } + @BeforeEach public void setUpTest() { - cleanDatabase("ha_hearing"); + cleanRestrictionTables(); eventTime = new UtcClock().now().minusMinutes(5L); } @@ -59,7 +79,7 @@ public void setUpTest() { */ @AfterEach public void tearDownTest() { - cleanDatabase("ha_hearing"); + cleanRestrictionTables(); } @Test diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java index 6fb6f8999..cf1ddea89 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/steps/CourtListRestrictionSteps.java @@ -43,6 +43,10 @@ import uk.gov.moj.cpp.hearing.test.CommandHelpers; import java.security.NoSuchAlgorithmException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.Optional; @@ -53,8 +57,11 @@ import io.restassured.path.json.JsonPath; import com.fasterxml.jackson.databind.ObjectMapper; +import org.awaitility.Awaitility; import org.hamcrest.Matcher; import org.junit.jupiter.api.BeforeEach; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CourtListRestrictionSteps extends AbstractIT { @@ -131,32 +138,70 @@ public void waitForRestrictionProjection(final String courtCentreId, } /** - * Polls the publish-side query {@code hearing.latest-hearings-by-court-centres} until the - * just-created hearing is observable. MUST be called after {@code createHearingEvent*} and - * BEFORE any {@code hide*FromXhibit} call. - *

+ * Polls the view-store DB directly until the just-created hearing has BOTH + * {@code ha_hearing} AND {@code ha_hearing_day} rows for the given courtCentreId/date. + * MUST be called after {@code createHearingEvent*} and BEFORE any {@code hide*FromXhibit} + * call or any {@code sendPublishCourtListCommand}. + * + *

Two races this closes

+ * + *

1. The listener silent-drop race. * Without this wait, the {@code public.listing.court-list-restricted} → ... → * {@code hearing.event.court-list-restricted} chain can reach * {@link uk.gov.moj.cpp.hearing.event.listener.CourtListRestrictionEventListener} before the * hearing-creation projection has committed to {@code ha_hearing}. The listener does * {@code hearingRepository.findOptionalBy(hearingId)} and, if the row is missing, silently - * returns (the message is consumed and never replayed). The restriction is then lost, the + * returns — the message is consumed and never replayed, the restriction is lost, the * subsequent publish reads the un-restricted hearing, and the assertion on the redacted XML - * fails. This flake reproduced ~2/3 of CI runs on team/rv-2616. + * fails. + * + *

2. The pub-display empty-XML race. + * Even when {@code ha_hearing} is populated, the publish's pub-display query + * ({@code findHearingsByDateAndCourtCentreList}) INNER-JOINs {@code ha_hearing.hearingDays} + * filtered by date. If {@code ha_hearing_day} hasn't been projected yet when the publish + * runs, the pub-display query returns thin/empty data and the publish writes an XML with + * empty fields (empty courtname, cppurn, defendant fields, no {@code currentstatus} block). + * The web-page publish (which goes via {@code ha_hearing_event}) is unaffected and writes + * correct XML, so the test sees a mismatch where the same publish call produces correct + * web-page XML but stub pub-display XML. + * + *

Polling JDBC directly is more robust than polling either REST endpoint because both + * publish-side queries are gated on the same two tables; once both are populated, both + * publishes will see fresh data. */ public void waitForHearingVisible(final String courtCentreId, final LocalDate hearingDate) { - setupAsAuthorizedAndSystemUser(USER_ID_VALUE_AS_ADMIN); - final String queryPart = format(ENDPOINT_PROPERTIES.getProperty("hearing.latest-hearings-by-court-centres"), courtCentreId, hearingDate); - final String searchCourtListUrl = String.format("%s/%s", getBaseUri(), queryPart); + Awaitility.await() + .atMost(60, SECONDS) + .pollInterval(500, java.util.concurrent.TimeUnit.MILLISECONDS) + .until(() -> hearingProjectedFor(courtCentreId, hearingDate)); + } - poll(requestParams(searchCourtListUrl, "application/vnd.hearing.latest-hearings-by-court-centres+json") - .withHeader(USER_ID, getLoggedInSystemUserHeader())) - .timeout(60, SECONDS) - .pollInterval(1, SECONDS) - .until(status().is(OK), payload().isJson( - withJsonPath("$.court.courtSites[0].courtRooms[0].courtRoomId", notNullValue()))); + private boolean hearingProjectedFor(final String courtCentreId, final LocalDate hearingDate) { + // Both publish paths need all three tables. Web-page goes via ha_hearing_event; + // pub-display additionally INNER-JOINs ha_hearing_day. + final String sql = String.format( + "SELECT count(1) FROM ha_hearing h " + + "INNER JOIN ha_hearing_day day ON day.hearing_id = h.id " + + "INNER JOIN ha_hearing_event ev ON ev.hearing_id = h.id " + + "WHERE h.court_centre_id = '%s' " + + "AND day.date = '%s' " + + "AND ev.event_date = '%s' " + + "AND ev.deleted = false", + courtCentreId, hearingDate, hearingDate); + try (final Connection connection = testJdbcConnectionProvider.getViewStoreConnection("hearing"); + final Statement statement = connection.createStatement(); + final ResultSet resultSet = statement.executeQuery(sql)) { + if (resultSet.next()) { + return resultSet.getInt(1) > 0; + } + } catch (final SQLException e) { + HEARING_VISIBILITY_LOGGER.warn("Failed to query view store for visibility check: {}", e.getMessage()); + } + return false; } + private static final Logger HEARING_VISIBILITY_LOGGER = LoggerFactory.getLogger(CourtListRestrictionSteps.class); + private void sendListingPublicEvent(final JsonObject restrictCourtListDataObject) { sendMessage( getPublicTopicInstance().createProducer(), From 9a3fc42cdb2cc8bcda77830ccb28d1258bebcbb8 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Fri, 5 Jun 2026 16:47:10 +0100 Subject: [PATCH 09/11] further2 int test fixes --- .../cpp/hearing/it/CourtListRestrictionIT.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java index d25881ed9..34217a8d0 100644 --- a/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java +++ b/hearing-integration-test/src/test/java/uk/gov/moj/cpp/hearing/it/CourtListRestrictionIT.java @@ -44,16 +44,17 @@ public class CourtListRestrictionIT extends AbstractPublishLatestCourtCentreHear * Clean every table that can carry state across tests in this class. All five tests bind * their hearings to the SAME static {@code caseId} (see * {@link AbstractPublishLatestCourtCentreHearingIT}), so residual - * {@code is_court_list_restricted=true} on {@code ha_prosecution_case} or - * {@code ha_defendant} from one test poisons the next. The - * {@code court_list_publish_status} row is also dropped so the FIRST publish in this class - * cannot inherit {@code EXPORT_SUCCESSFUL} from a prior test class's publish — without - * this, {@code verifyCourtListPublishStatusReturnedWhenQueryingFromAPI} returns on the - * stale status before the current publish has produced a file. + * {@code is_court_list_restricted=true} on {@code ha_case} (the {@code ProsecutionCase} + * entity's table — see its {@code @Table} annotation) or {@code ha_defendant} from one + * test poisons the next. The {@code court_list_publish_status} row is also dropped so the + * FIRST publish in this class cannot inherit {@code EXPORT_SUCCESSFUL} from a prior test + * class's publish — without this, + * {@code verifyCourtListPublishStatusReturnedWhenQueryingFromAPI} returns on the stale + * status before the current publish has produced a file. */ private void cleanRestrictionTables() { cleanDatabase("ha_hearing", - "ha_prosecution_case", + "ha_case", "ha_defendant", "ha_hearing_day", "ha_hearing_event", From 8053c2f398fffa3acbf71dda7ba18bf11cf04d08 Mon Sep 17 00:00:00 2001 From: devops-team Date: Fri, 5 Jun 2026 17:00:45 +0000 Subject: [PATCH 10/11] New 17.104.171-lpt2325-SNAPSHOT --- hearing-command/hearing-command-api/pom.xml | 2 +- hearing-command/hearing-command-handler/pom.xml | 2 +- hearing-command/pom.xml | 2 +- hearing-common/pom.xml | 2 +- hearing-domain/hearing-domain-aggregate/pom.xml | 2 +- hearing-domain/hearing-domain-common/pom.xml | 2 +- hearing-domain/hearing-domain-event/pom.xml | 2 +- hearing-domain/hearing-domain-xhibit/pom.xml | 2 +- hearing-domain/pom.xml | 2 +- hearing-event-sources/pom.xml | 2 +- hearing-event/hearing-event-listener/pom.xml | 2 +- hearing-event/hearing-event-processor/pom.xml | 2 +- hearing-event/pom.xml | 2 +- hearing-healthchecks/pom.xml | 2 +- hearing-integration-test/pom.xml | 2 +- hearing-json/pom.xml | 2 +- hearing-query/hearing-query-api/pom.xml | 2 +- hearing-query/hearing-query-view/pom.xml | 2 +- hearing-query/pom.xml | 2 +- hearing-service/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-liquibase/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-persistence/pom.xml | 2 +- hearing-viewstore/pom.xml | 2 +- pojo-plugin/pom.xml | 2 +- pom.xml | 2 +- test-utilities/pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hearing-command/hearing-command-api/pom.xml b/hearing-command/hearing-command-api/pom.xml index 5c436b1fd..c0bc35dbb 100644 --- a/hearing-command/hearing-command-api/pom.xml +++ b/hearing-command/hearing-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index fa039ea76..7401daea8 100644 --- a/hearing-command/hearing-command-handler/pom.xml +++ b/hearing-command/hearing-command-handler/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-command-handler war diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index 8ac41f2a9..40a6dd5df 100644 --- a/hearing-command/pom.xml +++ b/hearing-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index 644b19adf..77abdcc31 100644 --- a/hearing-common/pom.xml +++ b/hearing-common/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index a21368690..82620e65d 100644 --- a/hearing-domain/hearing-domain-aggregate/pom.xml +++ b/hearing-domain/hearing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index 621caeb9d..bd268822d 100644 --- a/hearing-domain/hearing-domain-common/pom.xml +++ b/hearing-domain/hearing-domain-common/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index d6ef018ea..579551466 100644 --- a/hearing-domain/hearing-domain-event/pom.xml +++ b/hearing-domain/hearing-domain-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index 4e89a3876..4430b84f2 100644 --- a/hearing-domain/hearing-domain-xhibit/pom.xml +++ b/hearing-domain/hearing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index a855a4e06..9edb015da 100644 --- a/hearing-domain/pom.xml +++ b/hearing-domain/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index f083ac486..c7891c56d 100644 --- a/hearing-event-sources/pom.xml +++ b/hearing-event-sources/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hearing-event/hearing-event-listener/pom.xml b/hearing-event/hearing-event-listener/pom.xml index 005fa7e5c..58bfc4e45 100644 --- a/hearing-event/hearing-event-listener/pom.xml +++ b/hearing-event/hearing-event-listener/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-event - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index 686cbd001..25bfbbbed 100644 --- a/hearing-event/hearing-event-processor/pom.xml +++ b/hearing-event/hearing-event-processor/pom.xml @@ -3,7 +3,7 @@ hearing-event uk.gov.moj.cpp.hearing - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT 4.0.0 war diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index 46dfd89fa..8ca0d5828 100644 --- a/hearing-event/pom.xml +++ b/hearing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index 234c03211..7ad7cacb2 100644 --- a/hearing-healthchecks/pom.xml +++ b/hearing-healthchecks/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index 200f5bfda..a57008886 100644 --- a/hearing-integration-test/pom.xml +++ b/hearing-integration-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-integration-test diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index 7c4345478..79a4003e1 100644 --- a/hearing-json/pom.xml +++ b/hearing-json/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index 429fd99f0..b0ea6da3a 100644 --- a/hearing-query/hearing-query-api/pom.xml +++ b/hearing-query/hearing-query-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index f5819ee66..d419457bd 100644 --- a/hearing-query/hearing-query-view/pom.xml +++ b/hearing-query/hearing-query-view/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index a8c1e61c5..02e6a0929 100644 --- a/hearing-query/pom.xml +++ b/hearing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index 2bca81d46..443dc786f 100644 --- a/hearing-service/pom.xml +++ b/hearing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index a845db03e..28230b9f4 100644 --- a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml +++ b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index 2ee14628a..d09b7cf18 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/pom.xml +++ b/hearing-viewstore/hearing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index 38bd02537..4b386cf28 100644 --- a/hearing-viewstore/pom.xml +++ b/hearing-viewstore/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index 7fbd2d598..330c69014 100644 --- a/pojo-plugin/pom.xml +++ b/pojo-plugin/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index 37d487811..f875c7b46 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT pom Hearing Context - Parent Module diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index 78aec3d96..d92569076 100644 --- a/test-utilities/pom.xml +++ b/test-utilities/pom.xml @@ -7,7 +7,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-lpt2325-SNAPSHOT + 17.104.171-lpt2325-SNAPSHOT From b61b8911884be149a4030ff2e1d969c44fad031c Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Mon, 8 Jun 2026 09:36:57 +0100 Subject: [PATCH 11/11] int test fixes --- hearing-command/hearing-command-api/pom.xml | 2 +- hearing-command/hearing-command-handler/pom.xml | 2 +- hearing-command/pom.xml | 2 +- hearing-common/pom.xml | 2 +- hearing-domain/hearing-domain-aggregate/pom.xml | 2 +- hearing-domain/hearing-domain-common/pom.xml | 2 +- hearing-domain/hearing-domain-event/pom.xml | 2 +- hearing-domain/hearing-domain-xhibit/pom.xml | 2 +- hearing-domain/pom.xml | 2 +- hearing-event-sources/pom.xml | 2 +- hearing-event/hearing-event-listener/pom.xml | 2 +- hearing-event/hearing-event-processor/pom.xml | 2 +- hearing-event/pom.xml | 2 +- hearing-healthchecks/pom.xml | 2 +- hearing-integration-test/pom.xml | 2 +- hearing-json/pom.xml | 2 +- hearing-query/hearing-query-api/pom.xml | 2 +- hearing-query/hearing-query-view/pom.xml | 2 +- hearing-query/pom.xml | 2 +- hearing-service/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-liquibase/pom.xml | 2 +- hearing-viewstore/hearing-viewstore-persistence/pom.xml | 2 +- hearing-viewstore/pom.xml | 2 +- pojo-plugin/pom.xml | 2 +- pom.xml | 2 +- test-utilities/pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/hearing-command/hearing-command-api/pom.xml b/hearing-command/hearing-command-api/pom.xml index c0bc35dbb..79eea6087 100644 --- a/hearing-command/hearing-command-api/pom.xml +++ b/hearing-command/hearing-command-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index 7401daea8..818d80b5f 100644 --- a/hearing-command/hearing-command-handler/pom.xml +++ b/hearing-command/hearing-command-handler/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-command - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-command-handler war diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index 40a6dd5df..1d2a040f9 100644 --- a/hearing-command/pom.xml +++ b/hearing-command/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index 77abdcc31..16a209f0c 100644 --- a/hearing-common/pom.xml +++ b/hearing-common/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index 82620e65d..4e3c08136 100644 --- a/hearing-domain/hearing-domain-aggregate/pom.xml +++ b/hearing-domain/hearing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index bd268822d..e60e847c2 100644 --- a/hearing-domain/hearing-domain-common/pom.xml +++ b/hearing-domain/hearing-domain-common/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index 579551466..3a88674de 100644 --- a/hearing-domain/hearing-domain-event/pom.xml +++ b/hearing-domain/hearing-domain-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index 4430b84f2..2b9e78c34 100644 --- a/hearing-domain/hearing-domain-xhibit/pom.xml +++ b/hearing-domain/hearing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-domain - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index 9edb015da..3930703ac 100644 --- a/hearing-domain/pom.xml +++ b/hearing-domain/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index c7891c56d..365e2e233 100644 --- a/hearing-event-sources/pom.xml +++ b/hearing-event-sources/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT ../pom.xml 4.0.0 diff --git a/hearing-event/hearing-event-listener/pom.xml b/hearing-event/hearing-event-listener/pom.xml index 58bfc4e45..b1d3032f2 100644 --- a/hearing-event/hearing-event-listener/pom.xml +++ b/hearing-event/hearing-event-listener/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-event - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index 25bfbbbed..6efb867c2 100644 --- a/hearing-event/hearing-event-processor/pom.xml +++ b/hearing-event/hearing-event-processor/pom.xml @@ -3,7 +3,7 @@ hearing-event uk.gov.moj.cpp.hearing - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT 4.0.0 war diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index 8ca0d5828..170c2d456 100644 --- a/hearing-event/pom.xml +++ b/hearing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index 7ad7cacb2..52a05a937 100644 --- a/hearing-healthchecks/pom.xml +++ b/hearing-healthchecks/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index a57008886..125e6781e 100644 --- a/hearing-integration-test/pom.xml +++ b/hearing-integration-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-integration-test diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index 79a4003e1..c5b5da6ee 100644 --- a/hearing-json/pom.xml +++ b/hearing-json/pom.xml @@ -3,7 +3,7 @@ hearing-parent uk.gov.moj.cpp.hearing - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index b0ea6da3a..39b5f3206 100644 --- a/hearing-query/hearing-query-api/pom.xml +++ b/hearing-query/hearing-query-api/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index d419457bd..bf018a115 100644 --- a/hearing-query/hearing-query-view/pom.xml +++ b/hearing-query/hearing-query-view/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-query - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index 02e6a0929..e9bf51e63 100644 --- a/hearing-query/pom.xml +++ b/hearing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index 443dc786f..12bfa14a1 100644 --- a/hearing-service/pom.xml +++ b/hearing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index 28230b9f4..452650e6d 100644 --- a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml +++ b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index d09b7cf18..559c4f6d0 100644 --- a/hearing-viewstore/hearing-viewstore-persistence/pom.xml +++ b/hearing-viewstore/hearing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-viewstore - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index 4b386cf28..ba236614b 100644 --- a/hearing-viewstore/pom.xml +++ b/hearing-viewstore/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index 330c69014..9ff7c038b 100644 --- a/pojo-plugin/pom.xml +++ b/pojo-plugin/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index f875c7b46..643f19ea0 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT pom Hearing Context - Parent Module diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index d92569076..8c2e8a7f4 100644 --- a/test-utilities/pom.xml +++ b/test-utilities/pom.xml @@ -7,7 +7,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-lpt2325-SNAPSHOT + 17.104.169-SNAPSHOT