From ee1edc97a8497c01b24d8c925c0018705dd70e61 Mon Sep 17 00:00:00 2001 From: devops-team Date: Tue, 19 May 2026 10:22:18 +0000 Subject: [PATCH 1/7] New 17.104.170-PEG-2848-R14-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 7bb5a95ce..6b608580a 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index 7714441b5..72136c8c5 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-command-handler war diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index 9bbaeaaaf..22eafaedb 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index 5e08417f1..c8861a3c6 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index 8e6c24628..3f72838b1 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index 4b5b63558..4870405ab 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index 4d13bb640..087928642 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index bb1cd1583..e4595b8b3 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index 495329377..fa7c4f92b 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index 412717a4d..0d8fc57c9 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-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 ee5e267e9..02809945a 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index 7bf3a8208..ebeab9490 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT 4.0.0 war diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index eb6ef9b03..9713e2ebc 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index 86e051d41..f82b3df86 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index 689135c46..513970fd4 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-integration-test diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index 1c6c94a57..3ec7cea0f 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index 14ff426c5..b44d80878 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index bd386e85a..ada935c06 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index 7d37f92e4..7d38f5b54 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index e5bccfb71..d1c57064d 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index a396956e6..11e5d61ef 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index c91033eb1..8d042484f 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index cbab51eef..9ae384d58 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index 588428fc1..c9ebec315 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index dfc4f90bd..622fa6ce7 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.169-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT pom Hearing Context - Parent Module diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index 0b21fd6df..746ea6530 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-PEG-2848-R14-SNAPSHOT + 17.104.170-PEG-2848-R14-SNAPSHOT From 11807677709ea8ef5db1974376c72a1f0d6b2c6a Mon Sep 17 00:00:00 2001 From: devops-team Date: Tue, 19 May 2026 14:46:59 +0000 Subject: [PATCH 2/7] New 17.104.171-PEG-2848-R14-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 6b608580a..6a8a8e35f 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index 72136c8c5..105697595 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-command-handler war diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index 22eafaedb..25e36269c 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index c8861a3c6..08d2869ed 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index 3f72838b1..5fb51956d 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index 4870405ab..bf52b9f6a 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index 087928642..668987b75 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index e4595b8b3..68936a804 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index fa7c4f92b..03708b6a3 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index 0d8fc57c9..4b7510ee4 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-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 02809945a..0fa68c1ab 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index ebeab9490..4deceeb22 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT 4.0.0 war diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index 9713e2ebc..0b1d77bdf 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index f82b3df86..a0aa89f7f 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index 513970fd4..a8685027e 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-integration-test diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index 3ec7cea0f..dd9b03db9 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index b44d80878..37265a1e3 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index ada935c06..098698859 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index 7d38f5b54..decd655c5 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index d1c57064d..29bd83a70 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index 11e5d61ef..0d6589ce4 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index 8d042484f..ed80c6e8d 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index 9ae384d58..c2f453206 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index c9ebec315..1e7e5e732 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index 622fa6ce7..fad5f33ac 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.170-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT pom Hearing Context - Parent Module diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index 746ea6530..50767610a 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-PEG-2848-R14-SNAPSHOT + 17.104.171-PEG-2848-R14-SNAPSHOT From f2c85b4072101ff56f398064b5851d33a8a5e411 Mon Sep 17 00:00:00 2001 From: vmuthu Date: Fri, 23 Jan 2026 15:31:33 +0000 Subject: [PATCH 3/7] PEG-2973 cpp-context-hearing Framework D changes --- ...uteOutstandingFinesCommandHandlerTest.java | 111 +++++++++++++++++ .../HearingDeletedEventListenerTest.java | 2 +- ...uteOutstandingFinesRequestedProcessor.java | 67 ++++++++++ .../hearing/pi/ProsecutionCaseRetriever.java | 54 +++++++- ...utstandingFinesRequestedProcessorTest.java | 116 ++++++++++++++++++ .../ReusableInformationMainConverterTest.java | 2 + 6 files changed, 350 insertions(+), 2 deletions(-) create mode 100644 hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java create mode 100644 hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java create mode 100644 hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java new file mode 100644 index 000000000..4c5752918 --- /dev/null +++ b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java @@ -0,0 +1,111 @@ +package uk.gov.moj.cpp.hearing.command.handler; + +import static java.util.UUID.fromString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.when; +import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; +import static uk.gov.justice.services.test.utils.core.helper.EventStreamMockHelper.verifyAppendAndGetArgumentFrom; +import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; +import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; +import static uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo; +import static uk.gov.moj.cpp.hearing.test.matchers.BeanMatcher.isBean; + +import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; +import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; +import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; +import uk.gov.justice.services.core.enveloper.Enveloper; +import uk.gov.justice.services.eventsourcing.source.core.EventSource; +import uk.gov.justice.services.eventsourcing.source.core.EventStream; +import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.justice.services.messaging.MetadataBuilder; +import uk.gov.justice.services.test.utils.framework.api.JsonObjectConvertersFactory; +import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried; + +import java.time.LocalDate; +import java.util.stream.Collectors; + +import uk.gov.justice.services.messaging.JsonObjects; +import javax.json.JsonObject; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +public class ComputeOutstandingFinesCommandHandlerTest { + + private static final String COURT_ROOM_ID1 = "2181fbc2-f4f9-495b-a648-9bb45e752302"; + private static final String COURT_ROOM_ID2 = "872f4cce-6be1-45c8-a520-604828c96cbd"; + private static final String COURT_ROOM_ID3 = "d16499b0-28ca-48e2-960a-c443123af9c3"; + + @Spy + private final Enveloper enveloper = createEnveloperWithEvents(OutstandingFinesQueried.class); + + @InjectMocks + private ComputeOutstandingFinesCommandHandler computeOutstandingFinesCommandHandler; + + + @Mock + private EventStream eventStream; + + @Mock + private EventSource eventSource; + + @Spy + private JsonObjectToObjectConverter jsonObjectToObjectConverter = new JsonObjectConvertersFactory().jsonObjectToObjectConverter(); + + @Spy + private ObjectToJsonObjectConverter objectToJsonObjectConverter = new JsonObjectConvertersFactory().objectToJsonObjectConverter(); + + + @Test + public void computeOutstandingFines() throws EventStreamException { + + + final JsonObject payload = createCourtRoomsOutstandingFInesQuery(); + + final MetadataBuilder metadataBuilder = metadataWithRandomUUID("hearing.command.compute-outstanding-fines") + .withClientCorrelationId("0d5d72c0-7987-4677-8ce7-69fab7031f9b"); + + final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadataBuilder, payload); + + when(eventSource.getStreamById(any())).thenReturn(eventStream); + + + computeOutstandingFinesCommandHandler.computeOutstandingFines(envelope); + + final JsonEnvelope actualEventProduced = verifyAppendAndGetArgumentFrom(eventStream).collect(Collectors.toList()).get(0); + assertThat(actualEventProduced.metadata().name(), is("hearing.compute-outstanding-fines-requested")); + assertThat(actualEventProduced.metadata().clientCorrelationId().get(), is("0d5d72c0-7987-4677-8ce7-69fab7031f9b")); + assertThat(asPojo(actualEventProduced, OutstandingFinesQueried.class), + isBean(OutstandingFinesQueried.class) + .with(OutstandingFinesQueried::getCourtCentreId, is(fromString("88abd281-8c52-4171-aca1-740f734b43d7"))) + .with(OutstandingFinesQueried::getCourtRoomIds, containsInAnyOrder( + fromString(COURT_ROOM_ID1), + fromString(COURT_ROOM_ID2), + fromString(COURT_ROOM_ID3) + )) + .with(OutstandingFinesQueried::getHearingDate, is(LocalDate.parse("2019-12-18"))) + ); + } + + private JsonObject createCourtRoomsOutstandingFInesQuery() { + return JsonObjects.createObjectBuilder() + .add("courtCentreId", "88abd281-8c52-4171-aca1-740f734b43d7") + .add("courtRoomIds", JsonObjects.createArrayBuilder() + .add(COURT_ROOM_ID1) + .add(COURT_ROOM_ID2) + .add(COURT_ROOM_ID3)) + .add("hearingDate", "2019-12-18") + .build(); + } + +} \ No newline at end of file diff --git a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java index 1657e9712..7ee0a438d 100644 --- a/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java +++ b/hearing-event/hearing-event-listener/src/test/java/uk/gov/moj/cpp/hearing/event/listener/HearingDeletedEventListenerTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.hearing.event.listener; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java new file mode 100644 index 000000000..b76c042cc --- /dev/null +++ b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java @@ -0,0 +1,67 @@ +package uk.gov.moj.cpp.hearing.event; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; +import uk.gov.justice.services.core.annotation.Component; +import uk.gov.justice.services.core.annotation.Handles; +import uk.gov.justice.services.core.annotation.ServiceComponent; +import uk.gov.justice.services.core.requester.Requester; +import uk.gov.justice.services.core.sender.Sender; +import uk.gov.justice.services.messaging.Envelope; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried; + +import javax.inject.Inject; +import javax.json.JsonObject; +import java.util.UUID; +import java.util.stream.Collectors; + +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; +import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; + +@ServiceComponent(EVENT_PROCESSOR) +public class ComputeOutstandingFinesRequestedProcessor { + + private static final Logger LOGGER = LoggerFactory.getLogger(ComputeOutstandingFinesRequestedProcessor.class); + + @Inject + private Sender sender; + + @Inject + @ServiceComponent(Component.EVENT_PROCESSOR) + private Requester requester; + + @Inject + private JsonObjectToObjectConverter jsonObjectToObjectConverter; + + + @Handles("hearing.compute-outstanding-fines-requested") + public void publicComputeOutstandingFinesRequested(final JsonEnvelope event) { + final OutstandingFinesQueried finesQueried = this.jsonObjectToObjectConverter.convert(event.payloadAsJsonObject(), + OutstandingFinesQueried.class); + + + final Envelope envelope = envelop(createObjectBuilder() + .add("courtCentreId", finesQueried.getCourtCentreId().toString()) + .add("courtRoomIds", finesQueried.getCourtRoomIds().stream().map(UUID::toString).collect(Collectors.joining(","))) + .add("hearingDate", finesQueried.getHearingDate().toString()) + .build() + ).withName("hearing.defendant.info").withMetadataFrom(event); + + final Envelope courtBasedDefendantQueryInformation = requester.requestAsAdmin(envelopeFrom(envelope.metadata(), envelope.payload()), JsonObject.class); + final JsonObject payload = courtBasedDefendantQueryInformation.payload(); + if (!payload.isEmpty()) { + this.sender.send(envelopeFrom( + metadataFrom(event.metadata()).withName("stagingenforcement.court.rooms.outstanding-fines"), + payload)); + }else { + LOGGER.info("hearing.defendant.info response Information is empty"); + } + + } + +} diff --git a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/pi/ProsecutionCaseRetriever.java b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/pi/ProsecutionCaseRetriever.java index f7d2ef871..83b47f062 100644 --- a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/pi/ProsecutionCaseRetriever.java +++ b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/pi/ProsecutionCaseRetriever.java @@ -1 +1,53 @@ -package uk.gov.moj.cpp.hearing.pi; import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; import uk.gov.justice.services.core.annotation.ServiceComponent; import uk.gov.justice.services.core.requester.Requester; import uk.gov.justice.services.messaging.JsonEnvelope; import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ProsecutionCaseResponse; import java.util.Optional; import java.util.UUID; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.json.JsonObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @ApplicationScoped public class ProsecutionCaseRetriever { private static final Logger LOGGER = LoggerFactory.getLogger(ProsecutionCaseRetriever.class); private static final String HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID = "hearing.prosecution-case-by-hearingid"; @ServiceComponent(EVENT_PROCESSOR) @Inject private Requester requester; public Optional getProsecutionCaseForHearing(final UUID hearingId, final UUID hearingEventDefinitionId) { LOGGER.info(" getProsecutionCaseForHearing hearing id {} ", hearingId); final JsonObject query = createObjectBuilder() .add("hearingId", String.valueOf(hearingId)) .add("hearingEventDefinitionId", String.valueOf(hearingEventDefinitionId)) .build(); final JsonEnvelope jsonEnvelope = envelopeFrom( metadataBuilder() .withId(UUID.randomUUID()) .withName(HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID) .build(), query); if (!jsonEnvelope.payloadAsJsonObject().isEmpty()) { return Optional.of(requester.requestAsAdmin(jsonEnvelope, ProsecutionCaseResponse.class).payload()); } return Optional.empty(); } } \ No newline at end of file +package uk.gov.moj.cpp.hearing.pi; + +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; +import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; +import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder; + +import uk.gov.justice.services.core.annotation.ServiceComponent; +import uk.gov.justice.services.core.requester.Requester; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.moj.cpp.hearing.query.view.response.hearingresponse.ProsecutionCaseResponse; + +import java.util.Optional; +import java.util.UUID; + +import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; +import javax.json.JsonObject; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@ApplicationScoped +public class ProsecutionCaseRetriever { + + private static final Logger LOGGER = LoggerFactory.getLogger(ProsecutionCaseRetriever.class); + private static final String HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID = "hearing.prosecution-case-by-hearingid"; + + @ServiceComponent(EVENT_PROCESSOR) + @Inject + private Requester requester; + + public Optional getProsecutionCaseForHearing(final UUID hearingId, final UUID hearingEventDefinitionId) { + + LOGGER.info(" getProsecutionCaseForHearing hearing id {} ", hearingId); + final JsonObject query = createObjectBuilder() + .add("hearingId", String.valueOf(hearingId)) + .add("hearingEventDefinitionId", String.valueOf(hearingEventDefinitionId)) + .build(); + + final JsonEnvelope jsonEnvelope = envelopeFrom( + metadataBuilder() + .withId(UUID.randomUUID()) + .withName(HEARING_QUERY_PROSECUTIONCASE_BY_HEARINGID) + .build(), + query); + + if (!jsonEnvelope.payloadAsJsonObject().isEmpty()) { + return Optional.of(requester.requestAsAdmin(jsonEnvelope, ProsecutionCaseResponse.class).payload()); + } + return Optional.empty(); + } +} diff --git a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java new file mode 100644 index 000000000..bac6d40ed --- /dev/null +++ b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java @@ -0,0 +1,116 @@ +package uk.gov.moj.cpp.hearing.event; + +import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.is; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; +import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; +import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; +import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; + +import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; +import uk.gov.justice.services.core.enveloper.Enveloper; +import uk.gov.justice.services.core.requester.Requester; +import uk.gov.justice.services.core.sender.Sender; +import uk.gov.justice.services.messaging.Envelope; +import uk.gov.justice.services.messaging.JsonEnvelope; +import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; +import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried; + +import java.time.LocalDate; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; + +import uk.gov.justice.services.messaging.JsonObjects; +import javax.json.JsonObject; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +public class ComputeOutstandingFinesRequestedProcessorTest { + + @Spy + private final Enveloper enveloper = createEnveloper(); + + @Mock + private Sender sender; + + @Captor + private ArgumentCaptor envelopeArgumentCaptor; + + @Captor + private ArgumentCaptor argumentCaptor; + + @Mock + private Requester requester; + + @Mock + private JsonObjectToObjectConverter jsonObjectToObjectConverter; + + + @InjectMocks + private ComputeOutstandingFinesRequestedProcessor computeOutstandingFinesRequestedProcessor; + + + @Test + public void publicComputeOutstandingFinesRequested() { + final JsonObject outstandingFinesQuery = JsonObjects.createObjectBuilder().build(); + final JsonEnvelope event = envelopeFrom(metadataWithRandomUUID("hearing.compute-outstanding-fines-requested"), + outstandingFinesQuery); + + + final Envelope courtBasedDefendantQueryInformation = mock(Envelope.class); + when(courtBasedDefendantQueryInformation.payload()).thenReturn(JsonObjects.createObjectBuilder().build()); + + final OutstandingFinesQueried outstandingFinesQueried = OutstandingFinesQueried.newBuilder() + .withCourtCentreId(UUID.fromString("cb41f33d-9de0-4f49-9f8e-b7b06de4279a")) + .withCourtRoomIds(Arrays.asList(UUID.fromString("52faed9a-db0f-4430-bdf0-d6672ff7f3fa"), + UUID.fromString("d760acf6-fc92-46dd-bf26-80ebf50fbed4"))) + .withHearingDate(LocalDate.parse("2019-12-21")) + .build(); + when(jsonObjectToObjectConverter.convert(outstandingFinesQuery, OutstandingFinesQueried.class)).thenReturn( + outstandingFinesQueried + ); + + when(requester.requestAsAdmin(envelopeArgumentCaptor.capture(), argumentCaptor.capture())).thenReturn(courtBasedDefendantQueryInformation); + final JsonObject courtBasedDefendantQueryJsonObject = mock(JsonObject.class); + when(courtBasedDefendantQueryInformation.payload()).thenReturn(courtBasedDefendantQueryJsonObject); + + doNothing().when(sender).send(envelopeArgumentCaptor.capture()); + + computeOutstandingFinesRequestedProcessor.publicComputeOutstandingFinesRequested(event); + + final List allValues = envelopeArgumentCaptor.getAllValues(); + final JsonEnvelope outstandingFinesQueryEnvelope = allValues.get(0); + final Envelope courtBasedDefendantQueryEnvelope = allValues.get(1); + + assertThat(outstandingFinesQueryEnvelope.metadata(), withMetadataEnvelopedFrom(event)); + assertThat(outstandingFinesQueryEnvelope.payload(), + JsonEnvelopePayloadMatcher.payloadIsJson( + allOf( + + withJsonPath("$.courtCentreId", is("cb41f33d-9de0-4f49-9f8e-b7b06de4279a")), + withJsonPath("$.courtRoomIds", is("52faed9a-db0f-4430-bdf0-d6672ff7f3fa,d760acf6-fc92-46dd-bf26-80ebf50fbed4")), + withJsonPath("$.hearingDate", is("2019-12-21")) + ))) + ; + + assertThat(courtBasedDefendantQueryEnvelope.metadata(), withMetadataEnvelopedFrom(event) + .withCausationIds() + .withName("stagingenforcement.court.rooms.outstanding-fines")); + assertThat(courtBasedDefendantQueryEnvelope.payload(), is(courtBasedDefendantQueryJsonObject)); + + } +} diff --git a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java index bbd3da593..959f242c8 100644 --- a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java +++ b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java @@ -1,5 +1,7 @@ package uk.gov.moj.cpp.hearing.query.view.converter; +import uk.gov.justice.services.messaging.JsonObjects; + import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; From 2e8543f2a969dd605fc6f38297bed213457c133d Mon Sep 17 00:00:00 2001 From: MohamedFarouk-HMCTS Date: Thu, 5 Feb 2026 16:06:00 +0000 Subject: [PATCH 4/7] PEG-2848: fix build issue --- buildWithSonar.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildWithSonar.sh b/buildWithSonar.sh index 0d7e4fb11..0b2d81e3d 100755 --- a/buildWithSonar.sh +++ b/buildWithSonar.sh @@ -14,5 +14,8 @@ set -e . functions.sh + + +#### buildWithSonar From 3f7171a34ded81c1f4d1b7a39552e50502672c5f Mon Sep 17 00:00:00 2001 From: vmuthuhm Date: Fri, 17 Apr 2026 14:35:17 +0100 Subject: [PATCH 5/7] Rebase from release-engg-2609 & version bump to -RBSD-2609-SNAPSHOT (#96) * CCT-2357 code merge (#30) * updating poms for 17.0.144-SNAPSHOT development * Dev/merge teamcimd50 into main (#31) * Initial commit of migrated source code (#3) * Initial commit of migrated source code * Add global allowlist to gitleaks custom rules Added global allowlist with specified paths and regexes. * New 17.0.88-cimd1560-SNAPSHOT * New 17.0.89-cimd1560-SNAPSHOT * updated pom --------- Co-authored-by: jayenhc Co-authored-by: devops-team * updating poms for 17.0.144 branch with snapshot versions * updating poms for 17.0.145-SNAPSHOT development * updating poms for branch'dev/release-17.0.144' with non-snapshot versions * updating develop poms to master versions to avoid merge conflicts * Updating develop poms back to pre merge state * DD-41695: added payload validation checks on outstanding fines event (#37) * Added DD-41695 team branch * DD-41695: added payload validation checks on outstanding fines event (#35) * New 17.0.146-dd-41695-SNAPSHOT * DD-41695: updated hearing.query.outstanding-fines event (#36) * New 17.0.147-dd-41695-SNAPSHOT * DD41695: merge to master --------- Co-authored-by: devops-team * updating poms for 17.0.145 branch with snapshot versions * updating poms for 17.0.146-SNAPSHOT development * updating poms for branch'dev/release-17.0.145' with non-snapshot versions * updating develop poms to master versions to avoid merge conflicts * Updating develop poms back to pre merge state * Revert "CCT-2357 code merge (#30)" (#41) * Revert "CCT-2357 code merge (#30)" This reverts commit bac14b02 * fix build * update ref data * updating poms for 17.0.146 branch with snapshot versions * updating poms for 17.0.147-SNAPSHOT development * updating poms for branch'dev/release-17.0.146' with non-snapshot versions * updating develop poms to master versions to avoid merge conflicts * Updating develop poms back to pre merge state * CCT-2357 code merge * updating poms for 17.0.147 branch with snapshot versions * updating poms for 17.0.148-SNAPSHOT development * updating poms for branch'dev/release-17.0.147' with non-snapshot versions * updating develop poms to master versions to avoid merge conflicts * Updating develop poms back to pre merge state * CAD-492 civil tranche 1 toggle off * CAD-492 update core domain civil tranche 1 toggle off * merge team/CCT-2371 into main (#83) * merge team/CCT-2371 into main * update pom * updating poms for 17.0.148 branch with snapshot versions * updating poms for 17.0.149-SNAPSHOT development * updating poms for branch'dev/release-17.0.148' with non-snapshot versions * updating develop poms to master versions to avoid merge conflicts * Updating develop poms back to pre merge state * merge team/CCT-2257 into main (#82) Co-authored-by: jayenhc * updating poms for 17.0.149 branch with snapshot versions * updating poms for 17.0.150-SNAPSHOT development * updating poms for branch'dev/release-17.0.149' with non-snapshot versions * updating develop poms to master versions to avoid merge conflicts * Updating develop poms back to pre merge state * updating poms for 17.0.150 branch with snapshot versions * updating poms for 17.0.151-SNAPSHOT development * updating poms for branch'dev/release-17.0.150' with non-snapshot versions * updating develop poms to master versions to avoid merge conflicts * Updating develop poms back to pre merge state * RELEASE-ENGG-2609: Bump pom version to -RE-SNAPSHOT * PEG-2973 cpp-context-hearing version upgraded * PEG-2973 cpp-context-hearing Framework D changes * PEG-2848: fix build issue * dummy commit to create image (#64) * dummy commit to create image * dummy commit to create image --------- Co-authored-by: vmuthu * Rebase from RELEASE-ENGG-2609, Update version to 17.0.146-RBSD-2609-SNAPSHOT --------- Co-authored-by: yilmazsaritemur2 <150049030+yilmazsaritemur2@users.noreply.github.com> Co-authored-by: embedded_devops_sa Co-authored-by: Sivarama Varma Penmetsa <30878701+psrvarma@users.noreply.github.com> Co-authored-by: jayenhc Co-authored-by: rsukka <146491415+rsukka@users.noreply.github.com> Co-authored-by: narayansingh Co-authored-by: rajkumar.meena Co-authored-by: aykutdanisman Co-authored-by: Raj Kumar Meena Co-authored-by: Zeeshan Alam Co-authored-by: vmuthu Co-authored-by: MohamedFarouk-HMCTS --- ...uteOutstandingFinesCommandHandlerTest.java | 111 ----------------- ...uteOutstandingFinesRequestedProcessor.java | 67 ---------- ...utstandingFinesRequestedProcessorTest.java | 116 ------------------ 3 files changed, 294 deletions(-) delete mode 100644 hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java delete mode 100644 hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java delete mode 100644 hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java diff --git a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java b/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java deleted file mode 100644 index 4c5752918..000000000 --- a/hearing-command/hearing-command-handler/src/test/java/uk/gov/moj/cpp/hearing/command/handler/ComputeOutstandingFinesCommandHandlerTest.java +++ /dev/null @@ -1,111 +0,0 @@ -package uk.gov.moj.cpp.hearing.command.handler; - -import static java.util.UUID.fromString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; -import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloperWithEvents; -import static uk.gov.justice.services.test.utils.core.helper.EventStreamMockHelper.verifyAppendAndGetArgumentFrom; -import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; -import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField; -import static uk.gov.moj.cpp.hearing.test.ObjectConverters.asPojo; -import static uk.gov.moj.cpp.hearing.test.matchers.BeanMatcher.isBean; - -import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; -import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter; -import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer; -import uk.gov.justice.services.core.enveloper.Enveloper; -import uk.gov.justice.services.eventsourcing.source.core.EventSource; -import uk.gov.justice.services.eventsourcing.source.core.EventStream; -import uk.gov.justice.services.eventsourcing.source.core.exception.EventStreamException; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.justice.services.messaging.MetadataBuilder; -import uk.gov.justice.services.test.utils.framework.api.JsonObjectConvertersFactory; -import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried; - -import java.time.LocalDate; -import java.util.stream.Collectors; - -import uk.gov.justice.services.messaging.JsonObjects; -import javax.json.JsonObject; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; - -@ExtendWith(MockitoExtension.class) -public class ComputeOutstandingFinesCommandHandlerTest { - - private static final String COURT_ROOM_ID1 = "2181fbc2-f4f9-495b-a648-9bb45e752302"; - private static final String COURT_ROOM_ID2 = "872f4cce-6be1-45c8-a520-604828c96cbd"; - private static final String COURT_ROOM_ID3 = "d16499b0-28ca-48e2-960a-c443123af9c3"; - - @Spy - private final Enveloper enveloper = createEnveloperWithEvents(OutstandingFinesQueried.class); - - @InjectMocks - private ComputeOutstandingFinesCommandHandler computeOutstandingFinesCommandHandler; - - - @Mock - private EventStream eventStream; - - @Mock - private EventSource eventSource; - - @Spy - private JsonObjectToObjectConverter jsonObjectToObjectConverter = new JsonObjectConvertersFactory().jsonObjectToObjectConverter(); - - @Spy - private ObjectToJsonObjectConverter objectToJsonObjectConverter = new JsonObjectConvertersFactory().objectToJsonObjectConverter(); - - - @Test - public void computeOutstandingFines() throws EventStreamException { - - - final JsonObject payload = createCourtRoomsOutstandingFInesQuery(); - - final MetadataBuilder metadataBuilder = metadataWithRandomUUID("hearing.command.compute-outstanding-fines") - .withClientCorrelationId("0d5d72c0-7987-4677-8ce7-69fab7031f9b"); - - final JsonEnvelope envelope = JsonEnvelope.envelopeFrom(metadataBuilder, payload); - - when(eventSource.getStreamById(any())).thenReturn(eventStream); - - - computeOutstandingFinesCommandHandler.computeOutstandingFines(envelope); - - final JsonEnvelope actualEventProduced = verifyAppendAndGetArgumentFrom(eventStream).collect(Collectors.toList()).get(0); - assertThat(actualEventProduced.metadata().name(), is("hearing.compute-outstanding-fines-requested")); - assertThat(actualEventProduced.metadata().clientCorrelationId().get(), is("0d5d72c0-7987-4677-8ce7-69fab7031f9b")); - assertThat(asPojo(actualEventProduced, OutstandingFinesQueried.class), - isBean(OutstandingFinesQueried.class) - .with(OutstandingFinesQueried::getCourtCentreId, is(fromString("88abd281-8c52-4171-aca1-740f734b43d7"))) - .with(OutstandingFinesQueried::getCourtRoomIds, containsInAnyOrder( - fromString(COURT_ROOM_ID1), - fromString(COURT_ROOM_ID2), - fromString(COURT_ROOM_ID3) - )) - .with(OutstandingFinesQueried::getHearingDate, is(LocalDate.parse("2019-12-18"))) - ); - } - - private JsonObject createCourtRoomsOutstandingFInesQuery() { - return JsonObjects.createObjectBuilder() - .add("courtCentreId", "88abd281-8c52-4171-aca1-740f734b43d7") - .add("courtRoomIds", JsonObjects.createArrayBuilder() - .add(COURT_ROOM_ID1) - .add(COURT_ROOM_ID2) - .add(COURT_ROOM_ID3)) - .add("hearingDate", "2019-12-18") - .build(); - } - -} \ No newline at end of file diff --git a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java b/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java deleted file mode 100644 index b76c042cc..000000000 --- a/hearing-event/hearing-event-processor/src/main/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessor.java +++ /dev/null @@ -1,67 +0,0 @@ -package uk.gov.moj.cpp.hearing.event; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; -import uk.gov.justice.services.core.annotation.Component; -import uk.gov.justice.services.core.annotation.Handles; -import uk.gov.justice.services.core.annotation.ServiceComponent; -import uk.gov.justice.services.core.requester.Requester; -import uk.gov.justice.services.core.sender.Sender; -import uk.gov.justice.services.messaging.Envelope; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried; - -import javax.inject.Inject; -import javax.json.JsonObject; -import java.util.UUID; -import java.util.stream.Collectors; - -import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; -import static uk.gov.justice.services.core.annotation.Component.EVENT_PROCESSOR; -import static uk.gov.justice.services.core.enveloper.Enveloper.envelop; -import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; -import static uk.gov.justice.services.messaging.JsonEnvelope.metadataFrom; - -@ServiceComponent(EVENT_PROCESSOR) -public class ComputeOutstandingFinesRequestedProcessor { - - private static final Logger LOGGER = LoggerFactory.getLogger(ComputeOutstandingFinesRequestedProcessor.class); - - @Inject - private Sender sender; - - @Inject - @ServiceComponent(Component.EVENT_PROCESSOR) - private Requester requester; - - @Inject - private JsonObjectToObjectConverter jsonObjectToObjectConverter; - - - @Handles("hearing.compute-outstanding-fines-requested") - public void publicComputeOutstandingFinesRequested(final JsonEnvelope event) { - final OutstandingFinesQueried finesQueried = this.jsonObjectToObjectConverter.convert(event.payloadAsJsonObject(), - OutstandingFinesQueried.class); - - - final Envelope envelope = envelop(createObjectBuilder() - .add("courtCentreId", finesQueried.getCourtCentreId().toString()) - .add("courtRoomIds", finesQueried.getCourtRoomIds().stream().map(UUID::toString).collect(Collectors.joining(","))) - .add("hearingDate", finesQueried.getHearingDate().toString()) - .build() - ).withName("hearing.defendant.info").withMetadataFrom(event); - - final Envelope courtBasedDefendantQueryInformation = requester.requestAsAdmin(envelopeFrom(envelope.metadata(), envelope.payload()), JsonObject.class); - final JsonObject payload = courtBasedDefendantQueryInformation.payload(); - if (!payload.isEmpty()) { - this.sender.send(envelopeFrom( - metadataFrom(event.metadata()).withName("stagingenforcement.court.rooms.outstanding-fines"), - payload)); - }else { - LOGGER.info("hearing.defendant.info response Information is empty"); - } - - } - -} diff --git a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java b/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java deleted file mode 100644 index bac6d40ed..000000000 --- a/hearing-event/hearing-event-processor/src/test/java/uk/gov/moj/cpp/hearing/event/ComputeOutstandingFinesRequestedProcessorTest.java +++ /dev/null @@ -1,116 +0,0 @@ -package uk.gov.moj.cpp.hearing.event; - -import static com.jayway.jsonpath.matchers.JsonPathMatchers.withJsonPath; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.is; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom; -import static uk.gov.justice.services.test.utils.core.enveloper.EnveloperFactory.createEnveloper; -import static uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopeMetadataMatcher.withMetadataEnvelopedFrom; -import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID; - -import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter; -import uk.gov.justice.services.core.enveloper.Enveloper; -import uk.gov.justice.services.core.requester.Requester; -import uk.gov.justice.services.core.sender.Sender; -import uk.gov.justice.services.messaging.Envelope; -import uk.gov.justice.services.messaging.JsonEnvelope; -import uk.gov.justice.services.test.utils.core.matchers.JsonEnvelopePayloadMatcher; -import uk.gov.moj.cpp.hearing.domain.event.OutstandingFinesQueried; - -import java.time.LocalDate; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -import uk.gov.justice.services.messaging.JsonObjects; -import javax.json.JsonObject; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.jupiter.MockitoExtension; - -@ExtendWith(MockitoExtension.class) -public class ComputeOutstandingFinesRequestedProcessorTest { - - @Spy - private final Enveloper enveloper = createEnveloper(); - - @Mock - private Sender sender; - - @Captor - private ArgumentCaptor envelopeArgumentCaptor; - - @Captor - private ArgumentCaptor argumentCaptor; - - @Mock - private Requester requester; - - @Mock - private JsonObjectToObjectConverter jsonObjectToObjectConverter; - - - @InjectMocks - private ComputeOutstandingFinesRequestedProcessor computeOutstandingFinesRequestedProcessor; - - - @Test - public void publicComputeOutstandingFinesRequested() { - final JsonObject outstandingFinesQuery = JsonObjects.createObjectBuilder().build(); - final JsonEnvelope event = envelopeFrom(metadataWithRandomUUID("hearing.compute-outstanding-fines-requested"), - outstandingFinesQuery); - - - final Envelope courtBasedDefendantQueryInformation = mock(Envelope.class); - when(courtBasedDefendantQueryInformation.payload()).thenReturn(JsonObjects.createObjectBuilder().build()); - - final OutstandingFinesQueried outstandingFinesQueried = OutstandingFinesQueried.newBuilder() - .withCourtCentreId(UUID.fromString("cb41f33d-9de0-4f49-9f8e-b7b06de4279a")) - .withCourtRoomIds(Arrays.asList(UUID.fromString("52faed9a-db0f-4430-bdf0-d6672ff7f3fa"), - UUID.fromString("d760acf6-fc92-46dd-bf26-80ebf50fbed4"))) - .withHearingDate(LocalDate.parse("2019-12-21")) - .build(); - when(jsonObjectToObjectConverter.convert(outstandingFinesQuery, OutstandingFinesQueried.class)).thenReturn( - outstandingFinesQueried - ); - - when(requester.requestAsAdmin(envelopeArgumentCaptor.capture(), argumentCaptor.capture())).thenReturn(courtBasedDefendantQueryInformation); - final JsonObject courtBasedDefendantQueryJsonObject = mock(JsonObject.class); - when(courtBasedDefendantQueryInformation.payload()).thenReturn(courtBasedDefendantQueryJsonObject); - - doNothing().when(sender).send(envelopeArgumentCaptor.capture()); - - computeOutstandingFinesRequestedProcessor.publicComputeOutstandingFinesRequested(event); - - final List allValues = envelopeArgumentCaptor.getAllValues(); - final JsonEnvelope outstandingFinesQueryEnvelope = allValues.get(0); - final Envelope courtBasedDefendantQueryEnvelope = allValues.get(1); - - assertThat(outstandingFinesQueryEnvelope.metadata(), withMetadataEnvelopedFrom(event)); - assertThat(outstandingFinesQueryEnvelope.payload(), - JsonEnvelopePayloadMatcher.payloadIsJson( - allOf( - - withJsonPath("$.courtCentreId", is("cb41f33d-9de0-4f49-9f8e-b7b06de4279a")), - withJsonPath("$.courtRoomIds", is("52faed9a-db0f-4430-bdf0-d6672ff7f3fa,d760acf6-fc92-46dd-bf26-80ebf50fbed4")), - withJsonPath("$.hearingDate", is("2019-12-21")) - ))) - ; - - assertThat(courtBasedDefendantQueryEnvelope.metadata(), withMetadataEnvelopedFrom(event) - .withCausationIds() - .withName("stagingenforcement.court.rooms.outstanding-fines")); - assertThat(courtBasedDefendantQueryEnvelope.payload(), is(courtBasedDefendantQueryJsonObject)); - - } -} From 0f43fe1b9dff0a26dd895e90d244fd17e952ed57 Mon Sep 17 00:00:00 2001 From: Zeeshan Alam Date: Thu, 21 May 2026 17:22:00 +0100 Subject: [PATCH 6/7] PEG-2848-R14: clean up post-merge difference in ReusableInformationMainConverterTest --- .../view/converter/ReusableInformationMainConverterTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java index 959f242c8..bbd3da593 100644 --- a/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java +++ b/hearing-query/hearing-query-view/src/test/java/uk/gov/moj/cpp/hearing/query/view/converter/ReusableInformationMainConverterTest.java @@ -1,7 +1,5 @@ package uk.gov.moj.cpp.hearing.query.view.converter; -import uk.gov.justice.services.messaging.JsonObjects; - import static java.util.Collections.singletonList; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; From 4a9b79f64442f3fbf56b0700949a5d8389ba1daa Mon Sep 17 00:00:00 2001 From: devops-team Date: Fri, 22 May 2026 12:43:03 +0000 Subject: [PATCH 7/7] New 17.104.172-PEG-2848-R14-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 6a8a8e35f..111d31643 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-command-api war diff --git a/hearing-command/hearing-command-handler/pom.xml b/hearing-command/hearing-command-handler/pom.xml index 105697595..f3b75f73a 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-command-handler war diff --git a/hearing-command/pom.xml b/hearing-command/pom.xml index 25e36269c..5b1e6172f 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-command pom diff --git a/hearing-common/pom.xml b/hearing-common/pom.xml index 08d2869ed..1a271a711 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-domain/hearing-domain-aggregate/pom.xml b/hearing-domain/hearing-domain-aggregate/pom.xml index 5fb51956d..031c0bf40 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-domain-aggregate diff --git a/hearing-domain/hearing-domain-common/pom.xml b/hearing-domain/hearing-domain-common/pom.xml index bf52b9f6a..d0b7fbdbb 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-domain-common diff --git a/hearing-domain/hearing-domain-event/pom.xml b/hearing-domain/hearing-domain-event/pom.xml index 668987b75..ebcdc39f4 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-domain-event diff --git a/hearing-domain/hearing-domain-xhibit/pom.xml b/hearing-domain/hearing-domain-xhibit/pom.xml index 68936a804..326bd5e14 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-domain/pom.xml b/hearing-domain/pom.xml index 03708b6a3..8877c4a37 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-domain pom diff --git a/hearing-event-sources/pom.xml b/hearing-event-sources/pom.xml index 4b7510ee4..9e2214fe2 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-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 0fa68c1ab..89cba9279 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-event-listener war diff --git a/hearing-event/hearing-event-processor/pom.xml b/hearing-event/hearing-event-processor/pom.xml index 4deceeb22..5a8f3c9b9 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT 4.0.0 war diff --git a/hearing-event/pom.xml b/hearing-event/pom.xml index 0b1d77bdf..447996a0d 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-event pom diff --git a/hearing-healthchecks/pom.xml b/hearing-healthchecks/pom.xml index a0aa89f7f..b27c4fd96 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-integration-test/pom.xml b/hearing-integration-test/pom.xml index a8685027e..4a9254cdd 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-integration-test diff --git a/hearing-json/pom.xml b/hearing-json/pom.xml index dd9b03db9..ded5186c7 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-query/hearing-query-api/pom.xml b/hearing-query/hearing-query-api/pom.xml index 37265a1e3..a405441e9 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-query-api war diff --git a/hearing-query/hearing-query-view/pom.xml b/hearing-query/hearing-query-view/pom.xml index 098698859..69f32724a 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-query-view jar diff --git a/hearing-query/pom.xml b/hearing-query/pom.xml index decd655c5..8b80fdb30 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-query pom diff --git a/hearing-service/pom.xml b/hearing-service/pom.xml index 29bd83a70..9699c868e 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT 4.0.0 diff --git a/hearing-viewstore/hearing-viewstore-liquibase/pom.xml b/hearing-viewstore/hearing-viewstore-liquibase/pom.xml index 0d6589ce4..2f7bb50df 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-viewstore-liquibase diff --git a/hearing-viewstore/hearing-viewstore-persistence/pom.xml b/hearing-viewstore/hearing-viewstore-persistence/pom.xml index ed80c6e8d..3193dab0f 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-viewstore-persistence diff --git a/hearing-viewstore/pom.xml b/hearing-viewstore/pom.xml index c2f453206..1ae1e7d33 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT hearing-viewstore pom diff --git a/pojo-plugin/pom.xml b/pojo-plugin/pom.xml index 1e7e5e732..388ac39e4 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT pojo-plugin diff --git a/pom.xml b/pom.xml index fad5f33ac..42da0b358 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ uk.gov.moj.cpp.hearing hearing-parent - 17.104.171-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT pom Hearing Context - Parent Module diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml index 50767610a..72850e2fb 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-PEG-2848-R14-SNAPSHOT + 17.104.172-PEG-2848-R14-SNAPSHOT