From a41f4df84ee5ae43ccd697fe0b4e7d16a349bd9c Mon Sep 17 00:00:00 2001 From: yashpalnegi Date: Fri, 19 Jun 2026 16:56:35 +0100 Subject: [PATCH 1/9] Initial commit of migrated source code --- listing-command/listing-command-api/pom.xml | 2 +- ...ingEnrichmentOrchestratorCoverageTest.java | 439 ------------------ .../HearingEnrichmentOrchestratorTest.java | 8 +- .../listing-command-handler/pom.xml | 2 +- ...aringDaysCommandToDomainConverterTest.java | 162 ------- listing-command/pom.xml | 2 +- listing-common/pom.xml | 2 +- .../listing-domain-aggregate/pom.xml | 2 +- listing-domain/listing-domain-common/pom.xml | 2 +- listing-domain/listing-domain-event/pom.xml | 2 +- listing-domain/listing-domain-xhibit/pom.xml | 2 +- listing-domain/pom.xml | 2 +- listing-event-sources/pom.xml | 2 +- listing-event/listing-event-listener/pom.xml | 2 +- listing-event/listing-event-processor/pom.xml | 2 +- listing-event/pom.xml | 2 +- listing-healthchecks/pom.xml | 2 +- listing-integration-test-persistence/pom.xml | 2 +- listing-integration-test/pom.xml | 60 +-- .../steps/WeekCommencingHearingSteps.java | 17 +- .../gov/moj/cpp/listing/utils/FileUtil.java | 2 +- listing-json/pom.xml | 2 +- listing-performance-test/pom.xml | 2 +- listing-query/listing-query-api/pom.xml | 2 +- .../listing/query/api/HearingQueryApi.java | 7 +- listing-query/listing-query-view/pom.xml | 2 +- .../view/service/ProgressionServiceTest.java | 2 +- listing-query/pom.xml | 2 +- listing-service/pom.xml | 2 +- .../listing-viewstore-liquibase/pom.xml | 2 +- .../listing-viewstore-persistence/pom.xml | 2 +- listing-viewstore/pom.xml | 2 +- pom.xml | 6 +- 33 files changed, 49 insertions(+), 702 deletions(-) delete mode 100644 listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java delete mode 100644 listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java diff --git a/listing-command/listing-command-api/pom.xml b/listing-command/listing-command-api/pom.xml index 06ca58369..6a8991019 100644 --- a/listing-command/listing-command-api/pom.xml +++ b/listing-command/listing-command-api/pom.xml @@ -4,7 +4,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java b/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java deleted file mode 100644 index d729ec06e..000000000 --- a/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java +++ /dev/null @@ -1,439 +0,0 @@ -package uk.gov.moj.cpp.listing.command.api.service; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static uk.gov.justice.listing.commands.HearingDay.hearingDay; -import static uk.gov.justice.listing.commands.HearingListingNeeds.hearingListingNeeds; -import static uk.gov.justice.listing.commands.UpdateHearingForListing.updateHearingForListing; - -import uk.gov.justice.core.courts.JurisdictionType; -import uk.gov.justice.core.courts.WeekCommencingDate; -import uk.gov.justice.listing.commands.CourtCentreDetails; -import uk.gov.justice.listing.commands.HearingDay; -import uk.gov.justice.listing.commands.HearingListingNeeds; -import uk.gov.justice.listing.commands.UpdateHearingForListing; -import uk.gov.justice.services.messaging.JsonEnvelope; - -import java.lang.reflect.Field; -import java.time.LocalDate; -import java.util.List; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -/** - * Tests the static helper methods and all jurisdiction branches of - * HearingEnrichmentOrchestrator using anonymous service stubs injected via - * reflection — no Mockito inline mocking required. - */ -public class HearingEnrichmentOrchestratorCoverageTest { - - private final HearingDaysEnrichmentService hearingDaysStub = new HearingDaysEnrichmentService() { - @Override - public HearingListingNeeds enrichHearings(HearingListingNeeds hearing, JsonEnvelope envelope) { - return hearing; - } - @Override - public UpdateHearingForListing enrichHearing(UpdateHearingForListing hearing, JsonEnvelope envelope) { - return hearing; - } - @Override - public UpdateHearingForListing enrichHearing(UpdateHearingForListing hearing, JsonEnvelope envelope, CourtCentreDetails courtCentreDetails) { - return hearing; - } - }; - - private final HearingDurationEnrichmentService durationStub = new HearingDurationEnrichmentService() { - @Override - public HearingListingNeeds enrichWithDurations(HearingListingNeeds hearing, JsonEnvelope envelope) { - return hearing; - } - @Override - public UpdateHearingForListing enrichWithDurationForUpdate(UpdateHearingForListing hearing, JsonEnvelope envelope) { - return hearing; - } - }; - - private final CourtScheduleEnrichmentService scheduleStub = new CourtScheduleEnrichmentService() { - @Override - public HearingListingNeeds enrichWithCourtSchedules(HearingListingNeeds hearing, JsonEnvelope envelope) { - return hearing; - } - @Override - public UpdateHearingForListing enrichWithCourtSchedules(UpdateHearingForListing hearing, JsonEnvelope envelope) { - return hearing; - } - }; - - private HearingEnrichmentOrchestrator orchestrator; - - @BeforeEach - void setUp() throws Exception { - orchestrator = new HearingEnrichmentOrchestrator(); - injectField("hearingDaysEnrichmentService", hearingDaysStub); - injectField("hearingDurationEnrichmentService", durationStub); - injectField("courtScheduleEnrichmentService", scheduleStub); - } - - private void injectField(String fieldName, Object value) throws Exception { - Field field = HearingEnrichmentOrchestrator.class.getDeclaredField(fieldName); - field.setAccessible(true); - field.set(orchestrator, value); - } - - // ── enrichListCourtHearing — all jurisdiction branches ──────────────────── - - @Test - void shouldEnrichListCourtHearingForMagistrates() { - HearingListingNeeds hearing = hearingListingNeeds() - .withJurisdictionType(JurisdictionType.MAGISTRATES) - .build(); - - List result = orchestrator.enrichListCourtHearing(List.of(hearing), null); - - assertThat(result, hasSize(1)); - assertThat(result.get(0).getJurisdictionType(), is(JurisdictionType.MAGISTRATES)); - } - - @Test - void shouldEnrichListCourtHearingForCrown() { - HearingListingNeeds hearing = hearingListingNeeds() - .withJurisdictionType(JurisdictionType.CROWN) - .build(); - - List result = orchestrator.enrichListCourtHearing(List.of(hearing), null); - - assertThat(result, hasSize(1)); - assertThat(result.get(0).getJurisdictionType(), is(JurisdictionType.CROWN)); - } - - @Test - void shouldThrowForUnsupportedJurisdictionInEnrichListCourtHearing() { - HearingListingNeeds hearing = hearingListingNeeds().build(); // jurisdictionType = null - - assertThrows(IllegalArgumentException.class, - () -> orchestrator.enrichListCourtHearing(List.of(hearing), null)); - } - - // ── enrichUpdateHearingForListing(hearing, envelope) ───────────────────── - - @Test - void shouldEnrichUpdateHearingForListingForMagistrates() { - UpdateHearingForListing hearing = updateHearingForListing() - .withJurisdictionType(JurisdictionType.MAGISTRATES) - .build(); - - UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null); - - assertThat(result, notNullValue()); - } - - @Test - void shouldEnrichUpdateHearingForListingForCrown() { - UpdateHearingForListing hearing = updateHearingForListing() - .withJurisdictionType(JurisdictionType.CROWN) - .build(); - - UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null); - - assertThat(result, notNullValue()); - } - - @Test - void shouldThrowForUnsupportedJurisdictionInUpdateHearing() { - UpdateHearingForListing hearing = updateHearingForListing().build(); // jurisdictionType = null - - assertThrows(IllegalArgumentException.class, - () -> orchestrator.enrichUpdateHearingForListing(hearing, null)); - } - - // ── enrichUpdateHearingForListing(hearing, envelope, courtCentreDetails) ── - - @Test - void shouldEnrichUpdateHearingWithCourtCentreForMagistrates() { - UpdateHearingForListing hearing = updateHearingForListing() - .withJurisdictionType(JurisdictionType.MAGISTRATES) - .build(); - - UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null, null); - - assertThat(result, notNullValue()); - } - - @Test - void shouldEnrichUpdateHearingWithCourtCentreForCrown() { - UpdateHearingForListing hearing = updateHearingForListing() - .withJurisdictionType(JurisdictionType.CROWN) - .build(); - - UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null, null); - - assertThat(result, notNullValue()); - } - - @Test - void shouldThrowForUnsupportedJurisdictionInUpdateHearingWithCourtCentre() { - UpdateHearingForListing hearing = updateHearingForListing().build(); // jurisdictionType = null - - assertThrows(IllegalArgumentException.class, - () -> orchestrator.enrichUpdateHearingForListing(hearing, null, null)); - } - - // ── Static: sequenceValidHearingDays ───────────────────────────────────── - - @Test - void shouldSequenceHearingDaysStartingFromOne() { - HearingDay day1 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).withSequence(99).withDurationMinutes(30).build(); - HearingDay day2 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 19)).withSequence(99).withDurationMinutes(10).build(); - - List result = HearingEnrichmentOrchestrator.sequenceValidHearingDays(List.of(day1, day2)); - - assertThat(result, hasSize(2)); - assertThat(result.get(0).getSequence(), is(1)); - assertThat(result.get(1).getSequence(), is(2)); - } - - // ── Static: orderAndFilterOutNonSittingDays ─────────────────────────────── - - @Test - void shouldFilterNonSittingDaysAndSortByDate() { - LocalDate nonSitting = LocalDate.of(2020, 8, 19); - HearingDay day1 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).withSequence(1).withDurationMinutes(30).build(); - HearingDay day2 = hearingDay().withHearingDate(nonSitting).withSequence(2).withDurationMinutes(10).build(); - HearingDay day3 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 17)).withSequence(3).withDurationMinutes(20).build(); - - List result = HearingEnrichmentOrchestrator.orderAndFilterOutNonSittingDays( - List.of(day1, day2, day3), List.of(nonSitting)); - - assertThat(result, hasSize(2)); - assertThat(result.get(0).getHearingDate(), is(LocalDate.of(2020, 8, 17))); - assertThat(result.get(1).getHearingDate(), is(LocalDate.of(2020, 8, 18))); - assertThat(result.get(0).getSequence(), is(0)); - } - - @Test - void shouldReturnAllDaysOrderedWhenNonSittingListIsEmpty() { - HearingDay day1 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).withSequence(2).withDurationMinutes(30).build(); - HearingDay day2 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 17)).withSequence(1).withDurationMinutes(20).build(); - - List result = HearingEnrichmentOrchestrator.orderAndFilterOutNonSittingDays( - List.of(day1, day2), List.of()); - - assertThat(result, hasSize(2)); - assertThat(result.get(0).getHearingDate(), is(LocalDate.of(2020, 8, 17))); - assertThat(result.get(0).getSequence(), is(0)); - } - - // ── Static: getTotalDuration ────────────────────────────────────────────── - - @Test - void shouldSumAllHearingDayDurations() { - HearingDay day1 = hearingDay().withDurationMinutes(30).withHearingDate(LocalDate.of(2020, 8, 18)).build(); - HearingDay day2 = hearingDay().withDurationMinutes(20).withHearingDate(LocalDate.of(2020, 8, 19)).build(); - - assertThat(HearingEnrichmentOrchestrator.getTotalDuration(List.of(day1, day2)), is(50)); - } - - @Test - void shouldUseDefaultMinWhenHearingDayDurationIsNull() { - // DEFAULT_MIN = 20; null duration contributes 20 - HearingDay dayWithNull = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).build(); - HearingDay dayWithValue = hearingDay().withDurationMinutes(30).withHearingDate(LocalDate.of(2020, 8, 19)).build(); - - assertThat(HearingEnrichmentOrchestrator.getTotalDuration(List.of(dayWithNull, dayWithValue)), is(50)); - } - - // ── Static: recalculateDurationSequenceAndEndDatesForHearingDays(UpdateHearingForListing) ── - - @Test - void shouldSetWeekCommencingEndDateUsingExplicitDuration() { - LocalDate startDate = LocalDate.of(2020, 8, 17); - UpdateHearingForListing hearing = updateHearingForListing() - .withWeekCommencingStartDate(startDate) - .withWeekCommencingDurationInWeeks(2) - .build(); - - UpdateHearingForListing result = HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing); - - assertThat(result.getWeekCommencingDurationInWeeks(), is(2)); - assertThat(result.getWeekCommencingEndDate(), is(startDate.plusWeeks(2).minusDays(1))); - } - - @Test - void shouldUseDefaultWeekDurationWhenWeekCommencingDurationIsNull() { - LocalDate startDate = LocalDate.of(2020, 8, 17); - UpdateHearingForListing hearing = updateHearingForListing() - .withWeekCommencingStartDate(startDate) - .build(); // weekCommencingDurationInWeeks = null → uses DEFAULT = 1 - - UpdateHearingForListing result = HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing); - - assertThat(result.getWeekCommencingDurationInWeeks(), is(1)); - assertThat(result.getWeekCommencingEndDate(), is(startDate.plusWeeks(1).minusDays(1))); - } - - @Test - void shouldReturnUpdateHearingAsIsWhenHearingDaysIsEmpty() { - UpdateHearingForListing hearing = updateHearingForListing() - .withHearingDays(List.of()) - .build(); - - assertThat(HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing), is(hearing)); - } - - @Test - void shouldSetEndDateToLastHearingDayAfterFilteringNonSittingDays() { - LocalDate date1 = LocalDate.of(2020, 8, 18); - LocalDate date2 = LocalDate.of(2020, 8, 19); - LocalDate date3 = LocalDate.of(2020, 8, 20); - HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); - HearingDay day2 = hearingDay().withHearingDate(date2).withDurationMinutes(20).withSequence(2).build(); - HearingDay day3 = hearingDay().withHearingDate(date3).withDurationMinutes(10).withSequence(3).build(); - - UpdateHearingForListing hearing = updateHearingForListing() - .withHearingDays(List.of(day1, day2, day3)) - .withNonSittingDays(List.of(date2)) - .build(); - - UpdateHearingForListing result = HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing); - - assertThat(result.getHearingDays(), hasSize(2)); - assertThat(result.getEndDate(), is(date3)); - } - - @Test - void shouldReturnOriginalUpdateHearingWhenAllHearingDaysAreNonSitting() { - LocalDate nonSittingDay = LocalDate.of(2020, 8, 18); - HearingDay day1 = hearingDay().withHearingDate(nonSittingDay).withDurationMinutes(30).withSequence(1).build(); - - UpdateHearingForListing hearing = updateHearingForListing() - .withHearingDays(List.of(day1)) - .withNonSittingDays(List.of(nonSittingDay)) - .build(); - - assertThat(HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing), is(hearing)); - } - - // ── Static: recalculateDurationSequenceAndEndDatesForHearingDays(List) ─── - - @Test - void shouldHandleWeekCommencingHearingListingNeedsWithExplicitDuration() { - WeekCommencingDate weekCommencingDate = WeekCommencingDate.weekCommencingDate() - .withStartDate("2020-08-17").withDuration(3).build(); - - HearingListingNeeds hearing = hearingListingNeeds().withWeekCommencingDate(weekCommencingDate).build(); - - List result = - HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); - - assertThat(result, hasSize(1)); - assertThat(result.get(0).getWeekCommencingDate().getDuration(), is(3)); - } - - @Test - void shouldUseDefaultDurationForWeekCommencingWhenNull() { - WeekCommencingDate weekCommencingDate = WeekCommencingDate.weekCommencingDate() - .withStartDate("2020-08-17").build(); // duration = null → DEFAULT = 1 - - HearingListingNeeds hearing = hearingListingNeeds().withWeekCommencingDate(weekCommencingDate).build(); - - List result = - HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); - - assertThat(result, hasSize(1)); - assertThat(result.get(0).getWeekCommencingDate().getDuration(), is(1)); - } - - @Test - void shouldReturnHearingListingNeedsAsIsWhenNoHearingDays() { - HearingListingNeeds hearing = hearingListingNeeds().withHearingDays(List.of()).build(); - - List result = - HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); - - assertThat(result, hasSize(1)); - assertThat(result.get(0), is(hearing)); - } - - @Test - void shouldCalculateEndDateAndEstimatedMinutesAfterFilteringNonSittingDays() { - LocalDate date1 = LocalDate.of(2020, 8, 18); - LocalDate date2 = LocalDate.of(2020, 8, 20); - HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); - HearingDay day2 = hearingDay().withHearingDate(date2).withDurationMinutes(20).withSequence(2).build(); - - HearingListingNeeds hearing = hearingListingNeeds() - .withHearingDays(List.of(day1, day2)) - .withNonSittingDays(List.of(date1.toString())) - .build(); - - List result = - HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); - - assertThat(result, hasSize(1)); - assertThat(result.get(0).getHearingDays(), hasSize(1)); - assertThat(result.get(0).getEndDate(), is(date2.toString())); - assertThat(result.get(0).getEstimatedMinutes(), is(20)); - } - - @Test - void shouldReturnOriginalHearingListingNeedsWhenAllDaysMatchNonSittingDays() { - LocalDate date1 = LocalDate.of(2020, 8, 18); - HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); - - HearingListingNeeds hearing = hearingListingNeeds() - .withHearingDays(List.of(day1)) - .withNonSittingDays(List.of(date1.toString())) - .build(); - - List result = - HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); - - assertThat(result, hasSize(1)); - assertThat(result.get(0), is(hearing)); - } - - @Test - void shouldCalculateEndDateWhenHearingDaysExistAndNonSittingDaysIsEmpty() { - LocalDate date1 = LocalDate.of(2020, 8, 18); - LocalDate date2 = LocalDate.of(2020, 8, 19); - HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); - HearingDay day2 = hearingDay().withHearingDate(date2).withDurationMinutes(20).withSequence(2).build(); - - // No nonSittingDays → isEmpty branch produces new ArrayList<>() - HearingListingNeeds hearing = hearingListingNeeds() - .withHearingDays(List.of(day1, day2)) - .build(); - - List result = - HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); - - assertThat(result, hasSize(1)); - assertThat(result.get(0).getEndDate(), is(date2.toString())); - assertThat(result.get(0).getEstimatedMinutes(), is(50)); - } - - // ── Static: logEnrichedHearings ─────────────────────────────────────────── - - @Test - void shouldLogEnrichedHearingsWithNullAndNonNullFields() { - HearingListingNeeds hearingWithNullDays = hearingListingNeeds().build(); - HearingListingNeeds hearingWithDays = hearingListingNeeds() - .withHearingDays(List.of( - hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)) - .withDurationMinutes(30).withSequence(1).build())) - .withNonSittingDays(List.of("2020-08-19")) - .build(); - - List input = List.of(hearingWithNullDays, hearingWithDays); - - HearingEnrichmentOrchestrator.logEnrichedHearings(input); - - assertThat(input.get(0).getHearingDays(), is(hearingWithNullDays.getHearingDays())); - assertThat(input.get(1).getHearingDays(), hasSize(1)); - assertThat(input.get(1).getNonSittingDays(), is(List.of("2020-08-19"))); - } -} diff --git a/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java b/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java index 3d4c3260e..f805b6b11 100644 --- a/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java +++ b/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java @@ -12,7 +12,6 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -93,7 +92,7 @@ public void shouldEnrichListCourtHearings() { @Test public void shouldEnrichListMagsHearing() { // Given - List hearings = Collections.singletonList(magistratesHearing); + List hearings = Arrays.asList(magistratesHearing); HearingListingNeeds withDurations = mock(HearingListingNeeds.class); HearingListingNeeds withHearingDays = mock(HearingListingNeeds.class); @@ -120,9 +119,10 @@ public void shouldEnrichListMagsHearing() { @Test public void shouldEnrichListCrownHearing() { // Given - List hearings = Collections.singletonList(crownHearing); + List hearings = Arrays.asList(crownHearing); HearingListingNeeds withHearingDays = mock(HearingListingNeeds.class); + HearingListingNeeds withDurations = mock(HearingListingNeeds.class); when(hearingDaysEnrichmentService.enrichHearings(crownHearing, envelope)) .thenReturn(withHearingDays); @@ -139,4 +139,4 @@ public void shouldEnrichListCrownHearing() { assertEquals(1, result.size()); assertEquals(enrichedCrownHearing, result.get(0)); } -} +} \ No newline at end of file diff --git a/listing-command/listing-command-handler/pom.xml b/listing-command/listing-command-handler/pom.xml index 3821c6020..876fdc05c 100644 --- a/listing-command/listing-command-handler/pom.xml +++ b/listing-command/listing-command-handler/pom.xml @@ -3,7 +3,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java b/listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java deleted file mode 100644 index 3e5eab7f6..000000000 --- a/listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java +++ /dev/null @@ -1,162 +0,0 @@ -package uk.gov.moj.cpp.listing.command.utils; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.hamcrest.core.Is.is; -import static uk.gov.justice.listing.commands.HearingDay.hearingDay; - -import uk.gov.justice.listing.commands.HearingDay; - -import java.time.LocalDate; -import java.time.ZonedDateTime; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.UUID; - -import org.junit.jupiter.api.Test; - -public class HearingDaysCommandToDomainConverterTest { - - private final HearingDaysCommandToDomainConverter converter = new HearingDaysCommandToDomainConverter(); - - private static final UUID COURT_CENTRE_ID = UUID.fromString("11111111-1111-1111-1111-111111111111"); - private static final UUID COURT_ROOM_ID = UUID.fromString("22222222-2222-2222-2222-222222222222"); - private static final UUID COURT_SCHEDULE_ID = UUID.fromString("33333333-3333-3333-3333-333333333333"); - private static final LocalDate HEARING_DATE = LocalDate.of(2020, 8, 18); - private static final ZonedDateTime START_TIME = ZonedDateTime.parse("2020-08-18T01:22:12.381Z"); - private static final ZonedDateTime END_TIME = ZonedDateTime.parse("2020-08-18T02:22:12.381Z"); - - @Test - public void shouldReturnEmptyListWhenSourceIsNull() { - final List result = converter.convert(null); - - assertThat(result, hasSize(0)); - } - - @Test - public void shouldReturnEmptyListWhenSourceIsEmpty() { - final List result = converter.convert(Collections.emptyList()); - - assertThat(result, hasSize(0)); - } - - @Test - public void shouldConvertAllFieldsFromCommandToDomain() { - final HearingDay command = hearingDay() - .withCourtCentreId(COURT_CENTRE_ID) - .withCourtRoomId(COURT_ROOM_ID) - .withCourtScheduleId(COURT_SCHEDULE_ID) - .withDurationMinutes(30) - .withSequence(1) - .withIsCancelled(false) - .withHearingDate(HEARING_DATE) - .withStartTime(START_TIME) - .withEndTime(END_TIME) - .build(); - - final List result = converter.convert(List.of(command)); - - assertThat(result, hasSize(1)); - final uk.gov.moj.cpp.listing.domain.HearingDay domain = result.get(0); - assertThat(domain.getCourtCentreId(), is(Optional.of(COURT_CENTRE_ID))); - assertThat(domain.getCourtRoomId(), is(Optional.of(COURT_ROOM_ID))); - assertThat(domain.getCourtScheduleId(), is(Optional.of(COURT_SCHEDULE_ID))); - assertThat(domain.getDurationMinutes(), is(30)); - assertThat(domain.getSequence(), is(1)); - assertThat(domain.getIsCancelled(), is(Optional.of(false))); - assertThat(domain.getHearingDate(), is(HEARING_DATE)); - assertThat(domain.getStartTime(), is(START_TIME)); - assertThat(domain.getEndTime(), is(END_TIME)); - } - - @Test - public void shouldFallBackToStartTimeWhenEndTimeIsNull() { - final HearingDay command = hearingDay() - .withCourtCentreId(COURT_CENTRE_ID) - .withDurationMinutes(30) - .withSequence(0) - .withHearingDate(HEARING_DATE) - .withStartTime(START_TIME) - .withEndTime(null) - .build(); - - final List result = converter.convert(List.of(command)); - - assertThat(result.get(0).getEndTime(), is(START_TIME)); - } - - @Test - public void shouldSetOptionalEmptyForNullableFieldsWhenNull() { - final HearingDay command = hearingDay() - .withCourtCentreId(COURT_CENTRE_ID) - .withCourtRoomId(null) - .withCourtScheduleId(null) - .withIsCancelled(null) - .withDurationMinutes(15) - .withSequence(0) - .withHearingDate(HEARING_DATE) - .withStartTime(START_TIME) - .withEndTime(END_TIME) - .build(); - - final List result = converter.convert(List.of(command)); - - final uk.gov.moj.cpp.listing.domain.HearingDay domain = result.get(0); - assertThat(domain.getCourtRoomId(), is(Optional.empty())); - assertThat(domain.getCourtScheduleId(), is(Optional.empty())); - assertThat(domain.getIsCancelled(), is(Optional.empty())); - } - - @Test - public void shouldConvertMultipleHearingDaysPreservingOrder() { - final HearingDay first = hearingDay() - .withCourtCentreId(COURT_CENTRE_ID) - .withDurationMinutes(30) - .withSequence(0) - .withIsCancelled(null) - .withHearingDate(LocalDate.of(2020, 8, 18)) - .withStartTime(ZonedDateTime.parse("2020-08-18T01:22:12.381Z")) - .withEndTime(ZonedDateTime.parse("2020-08-18T02:22:12.381Z")) - .build(); - - final HearingDay second = hearingDay() - .withCourtCentreId(COURT_CENTRE_ID) - .withDurationMinutes(10) - .withSequence(1) - .withIsCancelled(false) - .withHearingDate(LocalDate.of(2020, 8, 19)) - .withStartTime(ZonedDateTime.parse("2020-08-19T01:22:12.381Z")) - .withEndTime(ZonedDateTime.parse("2020-08-19T02:22:12.381Z")) - .build(); - - final HearingDay third = hearingDay() - .withCourtCentreId(COURT_CENTRE_ID) - .withDurationMinutes(20) - .withSequence(2) - .withIsCancelled(true) - .withHearingDate(LocalDate.of(2020, 8, 20)) - .withStartTime(ZonedDateTime.parse("2020-08-20T02:22:12.381Z")) - .withEndTime(ZonedDateTime.parse("2020-08-20T03:22:12.381Z")) - .build(); - - final List result = converter.convert(List.of(first, second, third)); - - assertThat(result, hasSize(3)); - - assertThat(result.get(0).getHearingDate(), is(LocalDate.of(2020, 8, 18))); - assertThat(result.get(0).getSequence(), is(0)); - assertThat(result.get(0).getDurationMinutes(), is(30)); - assertThat(result.get(0).getIsCancelled(), is(Optional.empty())); - - assertThat(result.get(1).getHearingDate(), is(LocalDate.of(2020, 8, 19))); - assertThat(result.get(1).getSequence(), is(1)); - assertThat(result.get(1).getDurationMinutes(), is(10)); - assertThat(result.get(1).getIsCancelled(), is(Optional.of(false))); - - assertThat(result.get(2).getHearingDate(), is(LocalDate.of(2020, 8, 20))); - assertThat(result.get(2).getSequence(), is(2)); - assertThat(result.get(2).getDurationMinutes(), is(20)); - assertThat(result.get(2).getIsCancelled(), is(Optional.of(true))); - } -} diff --git a/listing-command/pom.xml b/listing-command/pom.xml index 9f84884f4..c194cd059 100644 --- a/listing-command/pom.xml +++ b/listing-command/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-common/pom.xml b/listing-common/pom.xml index d623e01c7..53a1eba29 100644 --- a/listing-common/pom.xml +++ b/listing-common/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-aggregate/pom.xml b/listing-domain/listing-domain-aggregate/pom.xml index 7f419e869..03543ab87 100644 --- a/listing-domain/listing-domain-aggregate/pom.xml +++ b/listing-domain/listing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-common/pom.xml b/listing-domain/listing-domain-common/pom.xml index 536c9c008..427206b40 100644 --- a/listing-domain/listing-domain-common/pom.xml +++ b/listing-domain/listing-domain-common/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-event/pom.xml b/listing-domain/listing-domain-event/pom.xml index e6c87d6a8..18f3f49e5 100644 --- a/listing-domain/listing-domain-event/pom.xml +++ b/listing-domain/listing-domain-event/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-xhibit/pom.xml b/listing-domain/listing-domain-xhibit/pom.xml index 7de81a5f1..5890d2d88 100644 --- a/listing-domain/listing-domain-xhibit/pom.xml +++ b/listing-domain/listing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/pom.xml b/listing-domain/pom.xml index 28acfcc68..c859aa592 100644 --- a/listing-domain/pom.xml +++ b/listing-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-domain diff --git a/listing-event-sources/pom.xml b/listing-event-sources/pom.xml index f9223bfa9..027a5a931 100644 --- a/listing-event-sources/pom.xml +++ b/listing-event-sources/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-listener/pom.xml b/listing-event/listing-event-listener/pom.xml index 93196fe74..36fb813ac 100644 --- a/listing-event/listing-event-listener/pom.xml +++ b/listing-event/listing-event-listener/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-processor/pom.xml b/listing-event/listing-event-processor/pom.xml index 06ec7a74f..a5600c4da 100644 --- a/listing-event/listing-event-processor/pom.xml +++ b/listing-event/listing-event-processor/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/pom.xml b/listing-event/pom.xml index a7ef181ca..25f94e2fa 100644 --- a/listing-event/pom.xml +++ b/listing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-healthchecks/pom.xml b/listing-healthchecks/pom.xml index abe9c62f5..dc859f9c0 100644 --- a/listing-healthchecks/pom.xml +++ b/listing-healthchecks/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test-persistence/pom.xml b/listing-integration-test-persistence/pom.xml index 6c69f9490..bbd0aa8fd 100644 --- a/listing-integration-test-persistence/pom.xml +++ b/listing-integration-test-persistence/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/pom.xml b/listing-integration-test/pom.xml index ef4b2dcc7..cd6b55fa4 100644 --- a/listing-integration-test/pom.xml +++ b/listing-integration-test/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 @@ -11,14 +11,6 @@ 3.3.1.Final - - @@ -202,48 +194,6 @@ true - - - de.thetaphi - forbiddenapis - 3.7 - - false - - java.time.LocalDate#now() @ Use ItClock.today() — the single anchored test clock - java.time.LocalDateTime#now() @ Use ItClock.nowLocalDateTime() - java.time.LocalTime#now() @ Derive from ItClock - java.time.ZonedDateTime#now() @ Use ItClock.nowUtc() / ItClock.nowLondon() - java.time.OffsetDateTime#now() @ Derive from ItClock - java.time.Instant#now() @ Use ItClock.nowInstant() for data dates (elapsed-time infra is excluded) - java.time.Year#now() @ Derive from ItClock - java.util.Date#<init>() @ Use ItClock — new Date() reads the host clock/zone - - - **/it/util/ItClock.class - **/TestDurationListener.class - **/ServerLogTestMarkerExtension.class - - - - - ban-direct-wall-clock-reads - process-test-classes - - testCheck - - - - @@ -279,14 +229,6 @@ - - - ${it.clock} - **/*IT.java diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java index dda443fc1..84b8ad467 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java @@ -7,7 +7,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.Matchers.is; import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.getHearingFilter; import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.pollForHearing; import static uk.gov.moj.cpp.listing.steps.UpdateHearingSteps.DEFAULT_DURATION_HOURS_MINS; @@ -46,10 +46,17 @@ public void whenHearingIsUpdatedForListingForWeekCommencingDate() { request = prepareJsonForUpdatedHearingData(updatedHearingData); - final Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING, - request, getLoggedInHeader()); - - assertThat(response.getStatus(), equalTo(SC_ACCEPTED)); + try (Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING, request, getLoggedInHeader())) { + + String responseBody = ""; + try { + responseBody = response.readEntity(String.class); + } catch (IllegalStateException e) { + //no-op in case of no response + } + assertThat(format("Post returned not expected status code with body: %s", responseBody), + response.getStatus(), is(SC_ACCEPTED)); + } } public void verifyHearingUpdatedWithWeekCommencingDateAndUnallocatedWhenQueryingFromAPI() { diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java index b26641c28..2bd993f6a 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.listing.utils; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.apache.commons.io.FileUtils.readFileToString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/listing-json/pom.xml b/listing-json/pom.xml index 92c82cffa..1596cecad 100644 --- a/listing-json/pom.xml +++ b/listing-json/pom.xml @@ -4,7 +4,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-json diff --git a/listing-performance-test/pom.xml b/listing-performance-test/pom.xml index f8f44f53a..0331e9d73 100644 --- a/listing-performance-test/pom.xml +++ b/listing-performance-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-performance-test diff --git a/listing-query/listing-query-api/pom.xml b/listing-query/listing-query-api/pom.xml index 95a7b8732..97be9f7da 100644 --- a/listing-query/listing-query-api/pom.xml +++ b/listing-query/listing-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-query-api diff --git a/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java b/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java index 82edd884f..c48d076ca 100644 --- a/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java +++ b/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java @@ -40,7 +40,6 @@ import javax.inject.Inject; import uk.gov.justice.services.messaging.JsonObjects; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -340,7 +339,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope if (appDetails.isPresent()) { final CourtApplication courtApplicationObj = jsonObjectToObjectConverter.convert(appDetails.get().getJsonObject("courtApplication"), CourtApplication.class); - final JsonObjectBuilder appBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder appBuilder = JsonObjects.createObjectBuilder(); application.forEach(appBuilder::add); appBuilder.add("applicationTypeCode", courtApplicationObj.getType().getCode()); applicationsBuilder.add(appBuilder.build()); @@ -356,7 +355,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope } private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonObject hearing, final JsonArrayBuilder applicationsBuilder) { - final JsonObjectBuilder hearingBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder hearingBuilder = JsonObjects.createObjectBuilder(); hearing.forEach((key, value) -> { if (!COURT_APPLICATIONS.equals(key)) { hearingBuilder.add(key, value); @@ -367,7 +366,7 @@ private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonO } private static @NonNull JsonObjectBuilder buildResponsePayloadWithUpdatedHearing(final JsonObject payload, final JsonArrayBuilder hearingsBuilder) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payload.forEach((key, value) -> { if (!HEARINGS.equals(key)) { payloadBuilder.add(key, value); diff --git a/listing-query/listing-query-view/pom.xml b/listing-query/listing-query-view/pom.xml index 4384f8dcb..7317dedef 100644 --- a/listing-query/listing-query-view/pom.xml +++ b/listing-query/listing-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-query-view diff --git a/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java b/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java index 8726239de..d36ca2b4b 100644 --- a/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java +++ b/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.listing.query.view.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/listing-query/pom.xml b/listing-query/pom.xml index 2beced0b0..ca5a6972e 100644 --- a/listing-query/pom.xml +++ b/listing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-service/pom.xml b/listing-service/pom.xml index 3518ab1a6..168ff097b 100644 --- a/listing-service/pom.xml +++ b/listing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-liquibase/pom.xml b/listing-viewstore/listing-viewstore-liquibase/pom.xml index c05310da0..4f0bc00f5 100644 --- a/listing-viewstore/listing-viewstore-liquibase/pom.xml +++ b/listing-viewstore/listing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ listing-viewstore uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-persistence/pom.xml b/listing-viewstore/listing-viewstore-persistence/pom.xml index d2b3f47c4..db7d1bcca 100644 --- a/listing-viewstore/listing-viewstore-persistence/pom.xml +++ b/listing-viewstore/listing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-viewstore - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/pom.xml b/listing-viewstore/pom.xml index 6403d515d..35858c0cf 100644 --- a/listing-viewstore/pom.xml +++ b/listing-viewstore/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f027710ba..4099c5de3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.8 + 17.104.1 4.0.0 uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT pom Listing Context Microservice Parent @@ -29,7 +29,7 @@ sonar-report.json git file://${project.build.directory}/site - 17.103.13 + 17.104.3 17.103.133 1.0.4 5.7 From bfe2e6c14f92b6039f16c2ef5a686565ddd0b887 Mon Sep 17 00:00:00 2001 From: yashpalnegi Date: Fri, 19 Jun 2026 16:56:35 +0100 Subject: [PATCH 2/9] Initial commit of migrated source code --- listing-command/listing-command-api/pom.xml | 2 +- .../listing-command-handler/pom.xml | 2 +- listing-command/pom.xml | 2 +- listing-common/pom.xml | 2 +- .../listing-domain-aggregate/pom.xml | 2 +- listing-domain/listing-domain-common/pom.xml | 2 +- listing-domain/listing-domain-event/pom.xml | 2 +- listing-domain/listing-domain-xhibit/pom.xml | 2 +- listing-domain/pom.xml | 2 +- listing-event-sources/pom.xml | 2 +- listing-event/listing-event-listener/pom.xml | 2 +- listing-event/listing-event-processor/pom.xml | 2 +- listing-event/pom.xml | 2 +- listing-healthchecks/pom.xml | 2 +- listing-integration-test-persistence/pom.xml | 2 +- listing-integration-test/pom.xml | 60 +------------------ .../steps/WeekCommencingHearingSteps.java | 17 ++++-- .../gov/moj/cpp/listing/utils/FileUtil.java | 2 +- listing-json/pom.xml | 2 +- listing-performance-test/pom.xml | 2 +- listing-query/listing-query-api/pom.xml | 2 +- .../listing/query/api/HearingQueryApi.java | 7 +-- listing-query/listing-query-view/pom.xml | 2 +- .../view/service/ProgressionServiceTest.java | 2 +- listing-query/pom.xml | 2 +- listing-service/pom.xml | 2 +- .../listing-viewstore-liquibase/pom.xml | 2 +- .../listing-viewstore-persistence/pom.xml | 2 +- listing-viewstore/pom.xml | 2 +- pom.xml | 6 +- 30 files changed, 45 insertions(+), 97 deletions(-) diff --git a/listing-command/listing-command-api/pom.xml b/listing-command/listing-command-api/pom.xml index 06ca58369..6a8991019 100644 --- a/listing-command/listing-command-api/pom.xml +++ b/listing-command/listing-command-api/pom.xml @@ -4,7 +4,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-handler/pom.xml b/listing-command/listing-command-handler/pom.xml index 3821c6020..876fdc05c 100644 --- a/listing-command/listing-command-handler/pom.xml +++ b/listing-command/listing-command-handler/pom.xml @@ -3,7 +3,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/pom.xml b/listing-command/pom.xml index 9f84884f4..c194cd059 100644 --- a/listing-command/pom.xml +++ b/listing-command/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-common/pom.xml b/listing-common/pom.xml index d623e01c7..53a1eba29 100644 --- a/listing-common/pom.xml +++ b/listing-common/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-aggregate/pom.xml b/listing-domain/listing-domain-aggregate/pom.xml index 7f419e869..03543ab87 100644 --- a/listing-domain/listing-domain-aggregate/pom.xml +++ b/listing-domain/listing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-common/pom.xml b/listing-domain/listing-domain-common/pom.xml index 536c9c008..427206b40 100644 --- a/listing-domain/listing-domain-common/pom.xml +++ b/listing-domain/listing-domain-common/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-event/pom.xml b/listing-domain/listing-domain-event/pom.xml index e6c87d6a8..18f3f49e5 100644 --- a/listing-domain/listing-domain-event/pom.xml +++ b/listing-domain/listing-domain-event/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-xhibit/pom.xml b/listing-domain/listing-domain-xhibit/pom.xml index 7de81a5f1..5890d2d88 100644 --- a/listing-domain/listing-domain-xhibit/pom.xml +++ b/listing-domain/listing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/pom.xml b/listing-domain/pom.xml index 28acfcc68..c859aa592 100644 --- a/listing-domain/pom.xml +++ b/listing-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-domain diff --git a/listing-event-sources/pom.xml b/listing-event-sources/pom.xml index f9223bfa9..027a5a931 100644 --- a/listing-event-sources/pom.xml +++ b/listing-event-sources/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-listener/pom.xml b/listing-event/listing-event-listener/pom.xml index 93196fe74..36fb813ac 100644 --- a/listing-event/listing-event-listener/pom.xml +++ b/listing-event/listing-event-listener/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-processor/pom.xml b/listing-event/listing-event-processor/pom.xml index 06ec7a74f..a5600c4da 100644 --- a/listing-event/listing-event-processor/pom.xml +++ b/listing-event/listing-event-processor/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/pom.xml b/listing-event/pom.xml index a7ef181ca..25f94e2fa 100644 --- a/listing-event/pom.xml +++ b/listing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-healthchecks/pom.xml b/listing-healthchecks/pom.xml index abe9c62f5..dc859f9c0 100644 --- a/listing-healthchecks/pom.xml +++ b/listing-healthchecks/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test-persistence/pom.xml b/listing-integration-test-persistence/pom.xml index 6c69f9490..bbd0aa8fd 100644 --- a/listing-integration-test-persistence/pom.xml +++ b/listing-integration-test-persistence/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/pom.xml b/listing-integration-test/pom.xml index ef4b2dcc7..cd6b55fa4 100644 --- a/listing-integration-test/pom.xml +++ b/listing-integration-test/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 @@ -11,14 +11,6 @@ 3.3.1.Final - - @@ -202,48 +194,6 @@ true - - - de.thetaphi - forbiddenapis - 3.7 - - false - - java.time.LocalDate#now() @ Use ItClock.today() — the single anchored test clock - java.time.LocalDateTime#now() @ Use ItClock.nowLocalDateTime() - java.time.LocalTime#now() @ Derive from ItClock - java.time.ZonedDateTime#now() @ Use ItClock.nowUtc() / ItClock.nowLondon() - java.time.OffsetDateTime#now() @ Derive from ItClock - java.time.Instant#now() @ Use ItClock.nowInstant() for data dates (elapsed-time infra is excluded) - java.time.Year#now() @ Derive from ItClock - java.util.Date#<init>() @ Use ItClock — new Date() reads the host clock/zone - - - **/it/util/ItClock.class - **/TestDurationListener.class - **/ServerLogTestMarkerExtension.class - - - - - ban-direct-wall-clock-reads - process-test-classes - - testCheck - - - - @@ -279,14 +229,6 @@ - - - ${it.clock} - **/*IT.java diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java index dda443fc1..84b8ad467 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/steps/WeekCommencingHearingSteps.java @@ -7,7 +7,7 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.Matchers.is; import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.getHearingFilter; import static uk.gov.moj.cpp.listing.helper.SearchHearingHelper.pollForHearing; import static uk.gov.moj.cpp.listing.steps.UpdateHearingSteps.DEFAULT_DURATION_HOURS_MINS; @@ -46,10 +46,17 @@ public void whenHearingIsUpdatedForListingForWeekCommencingDate() { request = prepareJsonForUpdatedHearingData(updatedHearingData); - final Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING, - request, getLoggedInHeader()); - - assertThat(response.getStatus(), equalTo(SC_ACCEPTED)); + try (Response response = restClient.postCommand(updateHearingUrl, MEDIA_TYPE_UPDATE_HEARING_FOR_LISTING, request, getLoggedInHeader())) { + + String responseBody = ""; + try { + responseBody = response.readEntity(String.class); + } catch (IllegalStateException e) { + //no-op in case of no response + } + assertThat(format("Post returned not expected status code with body: %s", responseBody), + response.getStatus(), is(SC_ACCEPTED)); + } } public void verifyHearingUpdatedWithWeekCommencingDateAndUnallocatedWhenQueryingFromAPI() { diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java index b26641c28..2bd993f6a 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/utils/FileUtil.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.listing.utils; import static java.nio.charset.Charset.defaultCharset; -import static javax.json.Json.createReader; +import static uk.gov.justice.services.messaging.JsonObjects.createReader; import static org.apache.commons.io.FileUtils.readFileToString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/listing-json/pom.xml b/listing-json/pom.xml index 92c82cffa..1596cecad 100644 --- a/listing-json/pom.xml +++ b/listing-json/pom.xml @@ -4,7 +4,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-json diff --git a/listing-performance-test/pom.xml b/listing-performance-test/pom.xml index f8f44f53a..0331e9d73 100644 --- a/listing-performance-test/pom.xml +++ b/listing-performance-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-performance-test diff --git a/listing-query/listing-query-api/pom.xml b/listing-query/listing-query-api/pom.xml index 95a7b8732..97be9f7da 100644 --- a/listing-query/listing-query-api/pom.xml +++ b/listing-query/listing-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-query-api diff --git a/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java b/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java index 82edd884f..c48d076ca 100644 --- a/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java +++ b/listing-query/listing-query-api/src/main/java/uk/gov/moj/cpp/listing/query/api/HearingQueryApi.java @@ -40,7 +40,6 @@ import javax.inject.Inject; import uk.gov.justice.services.messaging.JsonObjects; -import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonArrayBuilder; import javax.json.JsonObject; @@ -340,7 +339,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope if (appDetails.isPresent()) { final CourtApplication courtApplicationObj = jsonObjectToObjectConverter.convert(appDetails.get().getJsonObject("courtApplication"), CourtApplication.class); - final JsonObjectBuilder appBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder appBuilder = JsonObjects.createObjectBuilder(); application.forEach(appBuilder::add); appBuilder.add("applicationTypeCode", courtApplicationObj.getType().getCode()); applicationsBuilder.add(appBuilder.build()); @@ -356,7 +355,7 @@ private JsonArrayBuilder buildApplicationsWithEnrichedPayload(final JsonEnvelope } private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonObject hearing, final JsonArrayBuilder applicationsBuilder) { - final JsonObjectBuilder hearingBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder hearingBuilder = JsonObjects.createObjectBuilder(); hearing.forEach((key, value) -> { if (!COURT_APPLICATIONS.equals(key)) { hearingBuilder.add(key, value); @@ -367,7 +366,7 @@ private static JsonObject buildHearingPayloadWithUpdatedApplications(final JsonO } private static @NonNull JsonObjectBuilder buildResponsePayloadWithUpdatedHearing(final JsonObject payload, final JsonArrayBuilder hearingsBuilder) { - final JsonObjectBuilder payloadBuilder = Json.createObjectBuilder(); + final JsonObjectBuilder payloadBuilder = JsonObjects.createObjectBuilder(); payload.forEach((key, value) -> { if (!HEARINGS.equals(key)) { payloadBuilder.add(key, value); diff --git a/listing-query/listing-query-view/pom.xml b/listing-query/listing-query-view/pom.xml index 4384f8dcb..7317dedef 100644 --- a/listing-query/listing-query-view/pom.xml +++ b/listing-query/listing-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT listing-query-view diff --git a/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java b/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java index 8726239de..d36ca2b4b 100644 --- a/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java +++ b/listing-query/listing-query-view/src/test/java/uk/gov/moj/cpp/listing/query/view/service/ProgressionServiceTest.java @@ -1,7 +1,7 @@ package uk.gov.moj.cpp.listing.query.view.service; import static java.util.UUID.randomUUID; -import static javax.json.Json.createObjectBuilder; +import static uk.gov.justice.services.messaging.JsonObjects.createObjectBuilder; import static org.codehaus.groovy.runtime.InvokerHelper.asList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/listing-query/pom.xml b/listing-query/pom.xml index 2beced0b0..ca5a6972e 100644 --- a/listing-query/pom.xml +++ b/listing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-service/pom.xml b/listing-service/pom.xml index 3518ab1a6..168ff097b 100644 --- a/listing-service/pom.xml +++ b/listing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-liquibase/pom.xml b/listing-viewstore/listing-viewstore-liquibase/pom.xml index c05310da0..4f0bc00f5 100644 --- a/listing-viewstore/listing-viewstore-liquibase/pom.xml +++ b/listing-viewstore/listing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ listing-viewstore uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-persistence/pom.xml b/listing-viewstore/listing-viewstore-persistence/pom.xml index d2b3f47c4..db7d1bcca 100644 --- a/listing-viewstore/listing-viewstore-persistence/pom.xml +++ b/listing-viewstore/listing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-viewstore - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/pom.xml b/listing-viewstore/pom.xml index 6403d515d..35858c0cf 100644 --- a/listing-viewstore/pom.xml +++ b/listing-viewstore/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index f027710ba..4099c5de3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ uk.gov.moj.cpp.common service-parent-pom - 17.103.8 + 17.104.1 4.0.0 uk.gov.moj.cpp.listing listing-parent - 17.103.175-SNAPSHOT + 17.103.170-fwe-SNAPSHOT pom Listing Context Microservice Parent @@ -29,7 +29,7 @@ sonar-report.json git file://${project.build.directory}/site - 17.103.13 + 17.104.3 17.103.133 1.0.4 5.7 From dbdc4962e6fac95298ed2e16f5d05c8ff03e986f Mon Sep 17 00:00:00 2001 From: yashpalnegi Date: Tue, 23 Jun 2026 12:03:55 +0100 Subject: [PATCH 3/9] fix integration tests --- ...ingEnrichmentOrchestratorCoverageTest.java | 439 ++++++++++++++++++ .../HearingEnrichmentOrchestratorTest.java | 8 +- ...aringDaysCommandToDomainConverterTest.java | 162 +++++++ .../uk/gov/moj/cpp/listing/it/AbstractIT.java | 2 +- .../RangeSearchQueryForCourtCalendarIT.java | 1 - 5 files changed, 606 insertions(+), 6 deletions(-) create mode 100644 listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java create mode 100644 listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java diff --git a/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java b/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java new file mode 100644 index 000000000..d729ec06e --- /dev/null +++ b/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorCoverageTest.java @@ -0,0 +1,439 @@ +package uk.gov.moj.cpp.listing.command.api.service; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static uk.gov.justice.listing.commands.HearingDay.hearingDay; +import static uk.gov.justice.listing.commands.HearingListingNeeds.hearingListingNeeds; +import static uk.gov.justice.listing.commands.UpdateHearingForListing.updateHearingForListing; + +import uk.gov.justice.core.courts.JurisdictionType; +import uk.gov.justice.core.courts.WeekCommencingDate; +import uk.gov.justice.listing.commands.CourtCentreDetails; +import uk.gov.justice.listing.commands.HearingDay; +import uk.gov.justice.listing.commands.HearingListingNeeds; +import uk.gov.justice.listing.commands.UpdateHearingForListing; +import uk.gov.justice.services.messaging.JsonEnvelope; + +import java.lang.reflect.Field; +import java.time.LocalDate; +import java.util.List; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +/** + * Tests the static helper methods and all jurisdiction branches of + * HearingEnrichmentOrchestrator using anonymous service stubs injected via + * reflection — no Mockito inline mocking required. + */ +public class HearingEnrichmentOrchestratorCoverageTest { + + private final HearingDaysEnrichmentService hearingDaysStub = new HearingDaysEnrichmentService() { + @Override + public HearingListingNeeds enrichHearings(HearingListingNeeds hearing, JsonEnvelope envelope) { + return hearing; + } + @Override + public UpdateHearingForListing enrichHearing(UpdateHearingForListing hearing, JsonEnvelope envelope) { + return hearing; + } + @Override + public UpdateHearingForListing enrichHearing(UpdateHearingForListing hearing, JsonEnvelope envelope, CourtCentreDetails courtCentreDetails) { + return hearing; + } + }; + + private final HearingDurationEnrichmentService durationStub = new HearingDurationEnrichmentService() { + @Override + public HearingListingNeeds enrichWithDurations(HearingListingNeeds hearing, JsonEnvelope envelope) { + return hearing; + } + @Override + public UpdateHearingForListing enrichWithDurationForUpdate(UpdateHearingForListing hearing, JsonEnvelope envelope) { + return hearing; + } + }; + + private final CourtScheduleEnrichmentService scheduleStub = new CourtScheduleEnrichmentService() { + @Override + public HearingListingNeeds enrichWithCourtSchedules(HearingListingNeeds hearing, JsonEnvelope envelope) { + return hearing; + } + @Override + public UpdateHearingForListing enrichWithCourtSchedules(UpdateHearingForListing hearing, JsonEnvelope envelope) { + return hearing; + } + }; + + private HearingEnrichmentOrchestrator orchestrator; + + @BeforeEach + void setUp() throws Exception { + orchestrator = new HearingEnrichmentOrchestrator(); + injectField("hearingDaysEnrichmentService", hearingDaysStub); + injectField("hearingDurationEnrichmentService", durationStub); + injectField("courtScheduleEnrichmentService", scheduleStub); + } + + private void injectField(String fieldName, Object value) throws Exception { + Field field = HearingEnrichmentOrchestrator.class.getDeclaredField(fieldName); + field.setAccessible(true); + field.set(orchestrator, value); + } + + // ── enrichListCourtHearing — all jurisdiction branches ──────────────────── + + @Test + void shouldEnrichListCourtHearingForMagistrates() { + HearingListingNeeds hearing = hearingListingNeeds() + .withJurisdictionType(JurisdictionType.MAGISTRATES) + .build(); + + List result = orchestrator.enrichListCourtHearing(List.of(hearing), null); + + assertThat(result, hasSize(1)); + assertThat(result.get(0).getJurisdictionType(), is(JurisdictionType.MAGISTRATES)); + } + + @Test + void shouldEnrichListCourtHearingForCrown() { + HearingListingNeeds hearing = hearingListingNeeds() + .withJurisdictionType(JurisdictionType.CROWN) + .build(); + + List result = orchestrator.enrichListCourtHearing(List.of(hearing), null); + + assertThat(result, hasSize(1)); + assertThat(result.get(0).getJurisdictionType(), is(JurisdictionType.CROWN)); + } + + @Test + void shouldThrowForUnsupportedJurisdictionInEnrichListCourtHearing() { + HearingListingNeeds hearing = hearingListingNeeds().build(); // jurisdictionType = null + + assertThrows(IllegalArgumentException.class, + () -> orchestrator.enrichListCourtHearing(List.of(hearing), null)); + } + + // ── enrichUpdateHearingForListing(hearing, envelope) ───────────────────── + + @Test + void shouldEnrichUpdateHearingForListingForMagistrates() { + UpdateHearingForListing hearing = updateHearingForListing() + .withJurisdictionType(JurisdictionType.MAGISTRATES) + .build(); + + UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null); + + assertThat(result, notNullValue()); + } + + @Test + void shouldEnrichUpdateHearingForListingForCrown() { + UpdateHearingForListing hearing = updateHearingForListing() + .withJurisdictionType(JurisdictionType.CROWN) + .build(); + + UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null); + + assertThat(result, notNullValue()); + } + + @Test + void shouldThrowForUnsupportedJurisdictionInUpdateHearing() { + UpdateHearingForListing hearing = updateHearingForListing().build(); // jurisdictionType = null + + assertThrows(IllegalArgumentException.class, + () -> orchestrator.enrichUpdateHearingForListing(hearing, null)); + } + + // ── enrichUpdateHearingForListing(hearing, envelope, courtCentreDetails) ── + + @Test + void shouldEnrichUpdateHearingWithCourtCentreForMagistrates() { + UpdateHearingForListing hearing = updateHearingForListing() + .withJurisdictionType(JurisdictionType.MAGISTRATES) + .build(); + + UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null, null); + + assertThat(result, notNullValue()); + } + + @Test + void shouldEnrichUpdateHearingWithCourtCentreForCrown() { + UpdateHearingForListing hearing = updateHearingForListing() + .withJurisdictionType(JurisdictionType.CROWN) + .build(); + + UpdateHearingForListing result = orchestrator.enrichUpdateHearingForListing(hearing, null, null); + + assertThat(result, notNullValue()); + } + + @Test + void shouldThrowForUnsupportedJurisdictionInUpdateHearingWithCourtCentre() { + UpdateHearingForListing hearing = updateHearingForListing().build(); // jurisdictionType = null + + assertThrows(IllegalArgumentException.class, + () -> orchestrator.enrichUpdateHearingForListing(hearing, null, null)); + } + + // ── Static: sequenceValidHearingDays ───────────────────────────────────── + + @Test + void shouldSequenceHearingDaysStartingFromOne() { + HearingDay day1 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).withSequence(99).withDurationMinutes(30).build(); + HearingDay day2 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 19)).withSequence(99).withDurationMinutes(10).build(); + + List result = HearingEnrichmentOrchestrator.sequenceValidHearingDays(List.of(day1, day2)); + + assertThat(result, hasSize(2)); + assertThat(result.get(0).getSequence(), is(1)); + assertThat(result.get(1).getSequence(), is(2)); + } + + // ── Static: orderAndFilterOutNonSittingDays ─────────────────────────────── + + @Test + void shouldFilterNonSittingDaysAndSortByDate() { + LocalDate nonSitting = LocalDate.of(2020, 8, 19); + HearingDay day1 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).withSequence(1).withDurationMinutes(30).build(); + HearingDay day2 = hearingDay().withHearingDate(nonSitting).withSequence(2).withDurationMinutes(10).build(); + HearingDay day3 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 17)).withSequence(3).withDurationMinutes(20).build(); + + List result = HearingEnrichmentOrchestrator.orderAndFilterOutNonSittingDays( + List.of(day1, day2, day3), List.of(nonSitting)); + + assertThat(result, hasSize(2)); + assertThat(result.get(0).getHearingDate(), is(LocalDate.of(2020, 8, 17))); + assertThat(result.get(1).getHearingDate(), is(LocalDate.of(2020, 8, 18))); + assertThat(result.get(0).getSequence(), is(0)); + } + + @Test + void shouldReturnAllDaysOrderedWhenNonSittingListIsEmpty() { + HearingDay day1 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).withSequence(2).withDurationMinutes(30).build(); + HearingDay day2 = hearingDay().withHearingDate(LocalDate.of(2020, 8, 17)).withSequence(1).withDurationMinutes(20).build(); + + List result = HearingEnrichmentOrchestrator.orderAndFilterOutNonSittingDays( + List.of(day1, day2), List.of()); + + assertThat(result, hasSize(2)); + assertThat(result.get(0).getHearingDate(), is(LocalDate.of(2020, 8, 17))); + assertThat(result.get(0).getSequence(), is(0)); + } + + // ── Static: getTotalDuration ────────────────────────────────────────────── + + @Test + void shouldSumAllHearingDayDurations() { + HearingDay day1 = hearingDay().withDurationMinutes(30).withHearingDate(LocalDate.of(2020, 8, 18)).build(); + HearingDay day2 = hearingDay().withDurationMinutes(20).withHearingDate(LocalDate.of(2020, 8, 19)).build(); + + assertThat(HearingEnrichmentOrchestrator.getTotalDuration(List.of(day1, day2)), is(50)); + } + + @Test + void shouldUseDefaultMinWhenHearingDayDurationIsNull() { + // DEFAULT_MIN = 20; null duration contributes 20 + HearingDay dayWithNull = hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)).build(); + HearingDay dayWithValue = hearingDay().withDurationMinutes(30).withHearingDate(LocalDate.of(2020, 8, 19)).build(); + + assertThat(HearingEnrichmentOrchestrator.getTotalDuration(List.of(dayWithNull, dayWithValue)), is(50)); + } + + // ── Static: recalculateDurationSequenceAndEndDatesForHearingDays(UpdateHearingForListing) ── + + @Test + void shouldSetWeekCommencingEndDateUsingExplicitDuration() { + LocalDate startDate = LocalDate.of(2020, 8, 17); + UpdateHearingForListing hearing = updateHearingForListing() + .withWeekCommencingStartDate(startDate) + .withWeekCommencingDurationInWeeks(2) + .build(); + + UpdateHearingForListing result = HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing); + + assertThat(result.getWeekCommencingDurationInWeeks(), is(2)); + assertThat(result.getWeekCommencingEndDate(), is(startDate.plusWeeks(2).minusDays(1))); + } + + @Test + void shouldUseDefaultWeekDurationWhenWeekCommencingDurationIsNull() { + LocalDate startDate = LocalDate.of(2020, 8, 17); + UpdateHearingForListing hearing = updateHearingForListing() + .withWeekCommencingStartDate(startDate) + .build(); // weekCommencingDurationInWeeks = null → uses DEFAULT = 1 + + UpdateHearingForListing result = HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing); + + assertThat(result.getWeekCommencingDurationInWeeks(), is(1)); + assertThat(result.getWeekCommencingEndDate(), is(startDate.plusWeeks(1).minusDays(1))); + } + + @Test + void shouldReturnUpdateHearingAsIsWhenHearingDaysIsEmpty() { + UpdateHearingForListing hearing = updateHearingForListing() + .withHearingDays(List.of()) + .build(); + + assertThat(HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing), is(hearing)); + } + + @Test + void shouldSetEndDateToLastHearingDayAfterFilteringNonSittingDays() { + LocalDate date1 = LocalDate.of(2020, 8, 18); + LocalDate date2 = LocalDate.of(2020, 8, 19); + LocalDate date3 = LocalDate.of(2020, 8, 20); + HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); + HearingDay day2 = hearingDay().withHearingDate(date2).withDurationMinutes(20).withSequence(2).build(); + HearingDay day3 = hearingDay().withHearingDate(date3).withDurationMinutes(10).withSequence(3).build(); + + UpdateHearingForListing hearing = updateHearingForListing() + .withHearingDays(List.of(day1, day2, day3)) + .withNonSittingDays(List.of(date2)) + .build(); + + UpdateHearingForListing result = HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing); + + assertThat(result.getHearingDays(), hasSize(2)); + assertThat(result.getEndDate(), is(date3)); + } + + @Test + void shouldReturnOriginalUpdateHearingWhenAllHearingDaysAreNonSitting() { + LocalDate nonSittingDay = LocalDate.of(2020, 8, 18); + HearingDay day1 = hearingDay().withHearingDate(nonSittingDay).withDurationMinutes(30).withSequence(1).build(); + + UpdateHearingForListing hearing = updateHearingForListing() + .withHearingDays(List.of(day1)) + .withNonSittingDays(List.of(nonSittingDay)) + .build(); + + assertThat(HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(hearing), is(hearing)); + } + + // ── Static: recalculateDurationSequenceAndEndDatesForHearingDays(List) ─── + + @Test + void shouldHandleWeekCommencingHearingListingNeedsWithExplicitDuration() { + WeekCommencingDate weekCommencingDate = WeekCommencingDate.weekCommencingDate() + .withStartDate("2020-08-17").withDuration(3).build(); + + HearingListingNeeds hearing = hearingListingNeeds().withWeekCommencingDate(weekCommencingDate).build(); + + List result = + HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); + + assertThat(result, hasSize(1)); + assertThat(result.get(0).getWeekCommencingDate().getDuration(), is(3)); + } + + @Test + void shouldUseDefaultDurationForWeekCommencingWhenNull() { + WeekCommencingDate weekCommencingDate = WeekCommencingDate.weekCommencingDate() + .withStartDate("2020-08-17").build(); // duration = null → DEFAULT = 1 + + HearingListingNeeds hearing = hearingListingNeeds().withWeekCommencingDate(weekCommencingDate).build(); + + List result = + HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); + + assertThat(result, hasSize(1)); + assertThat(result.get(0).getWeekCommencingDate().getDuration(), is(1)); + } + + @Test + void shouldReturnHearingListingNeedsAsIsWhenNoHearingDays() { + HearingListingNeeds hearing = hearingListingNeeds().withHearingDays(List.of()).build(); + + List result = + HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); + + assertThat(result, hasSize(1)); + assertThat(result.get(0), is(hearing)); + } + + @Test + void shouldCalculateEndDateAndEstimatedMinutesAfterFilteringNonSittingDays() { + LocalDate date1 = LocalDate.of(2020, 8, 18); + LocalDate date2 = LocalDate.of(2020, 8, 20); + HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); + HearingDay day2 = hearingDay().withHearingDate(date2).withDurationMinutes(20).withSequence(2).build(); + + HearingListingNeeds hearing = hearingListingNeeds() + .withHearingDays(List.of(day1, day2)) + .withNonSittingDays(List.of(date1.toString())) + .build(); + + List result = + HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); + + assertThat(result, hasSize(1)); + assertThat(result.get(0).getHearingDays(), hasSize(1)); + assertThat(result.get(0).getEndDate(), is(date2.toString())); + assertThat(result.get(0).getEstimatedMinutes(), is(20)); + } + + @Test + void shouldReturnOriginalHearingListingNeedsWhenAllDaysMatchNonSittingDays() { + LocalDate date1 = LocalDate.of(2020, 8, 18); + HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); + + HearingListingNeeds hearing = hearingListingNeeds() + .withHearingDays(List.of(day1)) + .withNonSittingDays(List.of(date1.toString())) + .build(); + + List result = + HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); + + assertThat(result, hasSize(1)); + assertThat(result.get(0), is(hearing)); + } + + @Test + void shouldCalculateEndDateWhenHearingDaysExistAndNonSittingDaysIsEmpty() { + LocalDate date1 = LocalDate.of(2020, 8, 18); + LocalDate date2 = LocalDate.of(2020, 8, 19); + HearingDay day1 = hearingDay().withHearingDate(date1).withDurationMinutes(30).withSequence(1).build(); + HearingDay day2 = hearingDay().withHearingDate(date2).withDurationMinutes(20).withSequence(2).build(); + + // No nonSittingDays → isEmpty branch produces new ArrayList<>() + HearingListingNeeds hearing = hearingListingNeeds() + .withHearingDays(List.of(day1, day2)) + .build(); + + List result = + HearingEnrichmentOrchestrator.recalculateDurationSequenceAndEndDatesForHearingDays(List.of(hearing)); + + assertThat(result, hasSize(1)); + assertThat(result.get(0).getEndDate(), is(date2.toString())); + assertThat(result.get(0).getEstimatedMinutes(), is(50)); + } + + // ── Static: logEnrichedHearings ─────────────────────────────────────────── + + @Test + void shouldLogEnrichedHearingsWithNullAndNonNullFields() { + HearingListingNeeds hearingWithNullDays = hearingListingNeeds().build(); + HearingListingNeeds hearingWithDays = hearingListingNeeds() + .withHearingDays(List.of( + hearingDay().withHearingDate(LocalDate.of(2020, 8, 18)) + .withDurationMinutes(30).withSequence(1).build())) + .withNonSittingDays(List.of("2020-08-19")) + .build(); + + List input = List.of(hearingWithNullDays, hearingWithDays); + + HearingEnrichmentOrchestrator.logEnrichedHearings(input); + + assertThat(input.get(0).getHearingDays(), is(hearingWithNullDays.getHearingDays())); + assertThat(input.get(1).getHearingDays(), hasSize(1)); + assertThat(input.get(1).getNonSittingDays(), is(List.of("2020-08-19"))); + } +} diff --git a/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java b/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java index f805b6b11..3d4c3260e 100644 --- a/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java +++ b/listing-command/listing-command-api/src/test/java/uk/gov/moj/cpp/listing/command/api/service/HearingEnrichmentOrchestratorTest.java @@ -12,6 +12,7 @@ import uk.gov.justice.services.messaging.JsonEnvelope; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.junit.jupiter.api.BeforeEach; @@ -92,7 +93,7 @@ public void shouldEnrichListCourtHearings() { @Test public void shouldEnrichListMagsHearing() { // Given - List hearings = Arrays.asList(magistratesHearing); + List hearings = Collections.singletonList(magistratesHearing); HearingListingNeeds withDurations = mock(HearingListingNeeds.class); HearingListingNeeds withHearingDays = mock(HearingListingNeeds.class); @@ -119,10 +120,9 @@ public void shouldEnrichListMagsHearing() { @Test public void shouldEnrichListCrownHearing() { // Given - List hearings = Arrays.asList(crownHearing); + List hearings = Collections.singletonList(crownHearing); HearingListingNeeds withHearingDays = mock(HearingListingNeeds.class); - HearingListingNeeds withDurations = mock(HearingListingNeeds.class); when(hearingDaysEnrichmentService.enrichHearings(crownHearing, envelope)) .thenReturn(withHearingDays); @@ -139,4 +139,4 @@ public void shouldEnrichListCrownHearing() { assertEquals(1, result.size()); assertEquals(enrichedCrownHearing, result.get(0)); } -} \ No newline at end of file +} diff --git a/listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java b/listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java new file mode 100644 index 000000000..3e5eab7f6 --- /dev/null +++ b/listing-command/listing-command-handler/src/test/java/uk/gov/moj/cpp/listing/command/utils/HearingDaysCommandToDomainConverterTest.java @@ -0,0 +1,162 @@ +package uk.gov.moj.cpp.listing.command.utils; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.hamcrest.core.Is.is; +import static uk.gov.justice.listing.commands.HearingDay.hearingDay; + +import uk.gov.justice.listing.commands.HearingDay; + +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import org.junit.jupiter.api.Test; + +public class HearingDaysCommandToDomainConverterTest { + + private final HearingDaysCommandToDomainConverter converter = new HearingDaysCommandToDomainConverter(); + + private static final UUID COURT_CENTRE_ID = UUID.fromString("11111111-1111-1111-1111-111111111111"); + private static final UUID COURT_ROOM_ID = UUID.fromString("22222222-2222-2222-2222-222222222222"); + private static final UUID COURT_SCHEDULE_ID = UUID.fromString("33333333-3333-3333-3333-333333333333"); + private static final LocalDate HEARING_DATE = LocalDate.of(2020, 8, 18); + private static final ZonedDateTime START_TIME = ZonedDateTime.parse("2020-08-18T01:22:12.381Z"); + private static final ZonedDateTime END_TIME = ZonedDateTime.parse("2020-08-18T02:22:12.381Z"); + + @Test + public void shouldReturnEmptyListWhenSourceIsNull() { + final List result = converter.convert(null); + + assertThat(result, hasSize(0)); + } + + @Test + public void shouldReturnEmptyListWhenSourceIsEmpty() { + final List result = converter.convert(Collections.emptyList()); + + assertThat(result, hasSize(0)); + } + + @Test + public void shouldConvertAllFieldsFromCommandToDomain() { + final HearingDay command = hearingDay() + .withCourtCentreId(COURT_CENTRE_ID) + .withCourtRoomId(COURT_ROOM_ID) + .withCourtScheduleId(COURT_SCHEDULE_ID) + .withDurationMinutes(30) + .withSequence(1) + .withIsCancelled(false) + .withHearingDate(HEARING_DATE) + .withStartTime(START_TIME) + .withEndTime(END_TIME) + .build(); + + final List result = converter.convert(List.of(command)); + + assertThat(result, hasSize(1)); + final uk.gov.moj.cpp.listing.domain.HearingDay domain = result.get(0); + assertThat(domain.getCourtCentreId(), is(Optional.of(COURT_CENTRE_ID))); + assertThat(domain.getCourtRoomId(), is(Optional.of(COURT_ROOM_ID))); + assertThat(domain.getCourtScheduleId(), is(Optional.of(COURT_SCHEDULE_ID))); + assertThat(domain.getDurationMinutes(), is(30)); + assertThat(domain.getSequence(), is(1)); + assertThat(domain.getIsCancelled(), is(Optional.of(false))); + assertThat(domain.getHearingDate(), is(HEARING_DATE)); + assertThat(domain.getStartTime(), is(START_TIME)); + assertThat(domain.getEndTime(), is(END_TIME)); + } + + @Test + public void shouldFallBackToStartTimeWhenEndTimeIsNull() { + final HearingDay command = hearingDay() + .withCourtCentreId(COURT_CENTRE_ID) + .withDurationMinutes(30) + .withSequence(0) + .withHearingDate(HEARING_DATE) + .withStartTime(START_TIME) + .withEndTime(null) + .build(); + + final List result = converter.convert(List.of(command)); + + assertThat(result.get(0).getEndTime(), is(START_TIME)); + } + + @Test + public void shouldSetOptionalEmptyForNullableFieldsWhenNull() { + final HearingDay command = hearingDay() + .withCourtCentreId(COURT_CENTRE_ID) + .withCourtRoomId(null) + .withCourtScheduleId(null) + .withIsCancelled(null) + .withDurationMinutes(15) + .withSequence(0) + .withHearingDate(HEARING_DATE) + .withStartTime(START_TIME) + .withEndTime(END_TIME) + .build(); + + final List result = converter.convert(List.of(command)); + + final uk.gov.moj.cpp.listing.domain.HearingDay domain = result.get(0); + assertThat(domain.getCourtRoomId(), is(Optional.empty())); + assertThat(domain.getCourtScheduleId(), is(Optional.empty())); + assertThat(domain.getIsCancelled(), is(Optional.empty())); + } + + @Test + public void shouldConvertMultipleHearingDaysPreservingOrder() { + final HearingDay first = hearingDay() + .withCourtCentreId(COURT_CENTRE_ID) + .withDurationMinutes(30) + .withSequence(0) + .withIsCancelled(null) + .withHearingDate(LocalDate.of(2020, 8, 18)) + .withStartTime(ZonedDateTime.parse("2020-08-18T01:22:12.381Z")) + .withEndTime(ZonedDateTime.parse("2020-08-18T02:22:12.381Z")) + .build(); + + final HearingDay second = hearingDay() + .withCourtCentreId(COURT_CENTRE_ID) + .withDurationMinutes(10) + .withSequence(1) + .withIsCancelled(false) + .withHearingDate(LocalDate.of(2020, 8, 19)) + .withStartTime(ZonedDateTime.parse("2020-08-19T01:22:12.381Z")) + .withEndTime(ZonedDateTime.parse("2020-08-19T02:22:12.381Z")) + .build(); + + final HearingDay third = hearingDay() + .withCourtCentreId(COURT_CENTRE_ID) + .withDurationMinutes(20) + .withSequence(2) + .withIsCancelled(true) + .withHearingDate(LocalDate.of(2020, 8, 20)) + .withStartTime(ZonedDateTime.parse("2020-08-20T02:22:12.381Z")) + .withEndTime(ZonedDateTime.parse("2020-08-20T03:22:12.381Z")) + .build(); + + final List result = converter.convert(List.of(first, second, third)); + + assertThat(result, hasSize(3)); + + assertThat(result.get(0).getHearingDate(), is(LocalDate.of(2020, 8, 18))); + assertThat(result.get(0).getSequence(), is(0)); + assertThat(result.get(0).getDurationMinutes(), is(30)); + assertThat(result.get(0).getIsCancelled(), is(Optional.empty())); + + assertThat(result.get(1).getHearingDate(), is(LocalDate.of(2020, 8, 19))); + assertThat(result.get(1).getSequence(), is(1)); + assertThat(result.get(1).getDurationMinutes(), is(10)); + assertThat(result.get(1).getIsCancelled(), is(Optional.of(false))); + + assertThat(result.get(2).getHearingDate(), is(LocalDate.of(2020, 8, 20))); + assertThat(result.get(2).getSequence(), is(2)); + assertThat(result.get(2).getDurationMinutes(), is(20)); + assertThat(result.get(2).getIsCancelled(), is(Optional.of(true))); + } +} diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java index 51c8e4799..86b42610b 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/AbstractIT.java @@ -73,7 +73,7 @@ void setUp() { setupProgressionNotesStubs(); setupUsersGroupPermissionsForApplicationTypeStub(); databaseCleaner.cleanEventStoreTables(CONTEXT_NAME); - databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, "stream_status", + databaseCleaner.cleanViewStoreTables(CONTEXT_NAME, "stream_status","processed_event", "stream_buffer", "hearing", "hearing_days", "listing_notes", "cache_refdata_courtroom", "court_list_publish_status", "published_court_list"); } diff --git a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java index cbe83d4f6..94465aa6b 100644 --- a/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java +++ b/listing-integration-test/src/test/java/uk/gov/moj/cpp/listing/it/RangeSearchQueryForCourtCalendarIT.java @@ -43,7 +43,6 @@ @SuppressWarnings({"squid:S1607"}) public class RangeSearchQueryForCourtCalendarIT extends AbstractIT { - private static final String CONTEXT_NAME = "listing"; private static final Map COURT_ROOMS = new LinkedHashMap<>() {{ put(fromString("1d0199f8-8812-48a2-b13c-837e1c03ff19"), "Courtroom 01"); put(fromString("18982e9c-2475-36a4-a852-09ab720acfc9"), "Courtroom 03"); From 511ea1f623c64ac080247957543bf385075c2550 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Tue, 23 Jun 2026 18:55:09 +0100 Subject: [PATCH 4/9] json-smart issue --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index 4099c5de3..19437dd5b 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,22 @@ + + + net.minidev + json-smart + 2.4.8 + uk.gov.justice.services domain-test-dsl From 7a9b5c409fe4bf6258f46f69fd0a605545566361 Mon Sep 17 00:00:00 2001 From: devops-team Date: Tue, 23 Jun 2026 19:40:31 +0000 Subject: [PATCH 5/9] New 17.103.171-fwe-SNAPSHOT --- listing-command/listing-command-api/pom.xml | 2 +- listing-command/listing-command-handler/pom.xml | 2 +- listing-command/pom.xml | 2 +- listing-common/pom.xml | 2 +- listing-domain/listing-domain-aggregate/pom.xml | 2 +- listing-domain/listing-domain-common/pom.xml | 2 +- listing-domain/listing-domain-event/pom.xml | 2 +- listing-domain/listing-domain-xhibit/pom.xml | 2 +- listing-domain/pom.xml | 2 +- listing-event-sources/pom.xml | 2 +- listing-event/listing-event-listener/pom.xml | 2 +- listing-event/listing-event-processor/pom.xml | 2 +- listing-event/pom.xml | 2 +- listing-healthchecks/pom.xml | 2 +- listing-integration-test-persistence/pom.xml | 2 +- listing-integration-test/pom.xml | 2 +- listing-json/pom.xml | 2 +- listing-performance-test/pom.xml | 2 +- listing-query/listing-query-api/pom.xml | 2 +- listing-query/listing-query-view/pom.xml | 2 +- listing-query/pom.xml | 2 +- listing-service/pom.xml | 2 +- listing-viewstore/listing-viewstore-liquibase/pom.xml | 2 +- listing-viewstore/listing-viewstore-persistence/pom.xml | 2 +- listing-viewstore/pom.xml | 2 +- pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/listing-command/listing-command-api/pom.xml b/listing-command/listing-command-api/pom.xml index 6a8991019..84572b645 100644 --- a/listing-command/listing-command-api/pom.xml +++ b/listing-command/listing-command-api/pom.xml @@ -4,7 +4,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-handler/pom.xml b/listing-command/listing-command-handler/pom.xml index 876fdc05c..16c3b46b1 100644 --- a/listing-command/listing-command-handler/pom.xml +++ b/listing-command/listing-command-handler/pom.xml @@ -3,7 +3,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/pom.xml b/listing-command/pom.xml index c194cd059..1bb0a7e3f 100644 --- a/listing-command/pom.xml +++ b/listing-command/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-common/pom.xml b/listing-common/pom.xml index 53a1eba29..85cd0a123 100644 --- a/listing-common/pom.xml +++ b/listing-common/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-aggregate/pom.xml b/listing-domain/listing-domain-aggregate/pom.xml index 03543ab87..36fc99d3d 100644 --- a/listing-domain/listing-domain-aggregate/pom.xml +++ b/listing-domain/listing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-common/pom.xml b/listing-domain/listing-domain-common/pom.xml index 427206b40..b1f293eec 100644 --- a/listing-domain/listing-domain-common/pom.xml +++ b/listing-domain/listing-domain-common/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-event/pom.xml b/listing-domain/listing-domain-event/pom.xml index 18f3f49e5..d44236e8d 100644 --- a/listing-domain/listing-domain-event/pom.xml +++ b/listing-domain/listing-domain-event/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-xhibit/pom.xml b/listing-domain/listing-domain-xhibit/pom.xml index 5890d2d88..7898fb710 100644 --- a/listing-domain/listing-domain-xhibit/pom.xml +++ b/listing-domain/listing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/pom.xml b/listing-domain/pom.xml index c859aa592..075601154 100644 --- a/listing-domain/pom.xml +++ b/listing-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT listing-domain diff --git a/listing-event-sources/pom.xml b/listing-event-sources/pom.xml index 027a5a931..2ad06a98a 100644 --- a/listing-event-sources/pom.xml +++ b/listing-event-sources/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-listener/pom.xml b/listing-event/listing-event-listener/pom.xml index 36fb813ac..6eda614c1 100644 --- a/listing-event/listing-event-listener/pom.xml +++ b/listing-event/listing-event-listener/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-processor/pom.xml b/listing-event/listing-event-processor/pom.xml index a5600c4da..7a500dffc 100644 --- a/listing-event/listing-event-processor/pom.xml +++ b/listing-event/listing-event-processor/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/pom.xml b/listing-event/pom.xml index 25f94e2fa..f4147b5d9 100644 --- a/listing-event/pom.xml +++ b/listing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-healthchecks/pom.xml b/listing-healthchecks/pom.xml index dc859f9c0..dc33e7207 100644 --- a/listing-healthchecks/pom.xml +++ b/listing-healthchecks/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test-persistence/pom.xml b/listing-integration-test-persistence/pom.xml index bbd0aa8fd..e563d3088 100644 --- a/listing-integration-test-persistence/pom.xml +++ b/listing-integration-test-persistence/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/pom.xml b/listing-integration-test/pom.xml index cd6b55fa4..0e307acdd 100644 --- a/listing-integration-test/pom.xml +++ b/listing-integration-test/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-json/pom.xml b/listing-json/pom.xml index 1596cecad..2ae75a499 100644 --- a/listing-json/pom.xml +++ b/listing-json/pom.xml @@ -4,7 +4,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT listing-json diff --git a/listing-performance-test/pom.xml b/listing-performance-test/pom.xml index 0331e9d73..a2f932e84 100644 --- a/listing-performance-test/pom.xml +++ b/listing-performance-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT listing-performance-test diff --git a/listing-query/listing-query-api/pom.xml b/listing-query/listing-query-api/pom.xml index 97be9f7da..430fee940 100644 --- a/listing-query/listing-query-api/pom.xml +++ b/listing-query/listing-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT listing-query-api diff --git a/listing-query/listing-query-view/pom.xml b/listing-query/listing-query-view/pom.xml index 7317dedef..4c8c9ddeb 100644 --- a/listing-query/listing-query-view/pom.xml +++ b/listing-query/listing-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT listing-query-view diff --git a/listing-query/pom.xml b/listing-query/pom.xml index ca5a6972e..42146a2e3 100644 --- a/listing-query/pom.xml +++ b/listing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-service/pom.xml b/listing-service/pom.xml index 168ff097b..8ffdaae9e 100644 --- a/listing-service/pom.xml +++ b/listing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-liquibase/pom.xml b/listing-viewstore/listing-viewstore-liquibase/pom.xml index 4f0bc00f5..989bb5574 100644 --- a/listing-viewstore/listing-viewstore-liquibase/pom.xml +++ b/listing-viewstore/listing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ listing-viewstore uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-persistence/pom.xml b/listing-viewstore/listing-viewstore-persistence/pom.xml index db7d1bcca..75296aeee 100644 --- a/listing-viewstore/listing-viewstore-persistence/pom.xml +++ b/listing-viewstore/listing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-viewstore - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/pom.xml b/listing-viewstore/pom.xml index 35858c0cf..1283705e1 100644 --- a/listing-viewstore/pom.xml +++ b/listing-viewstore/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 19437dd5b..608191649 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.170-fwe-SNAPSHOT + 17.103.171-fwe-SNAPSHOT pom Listing Context Microservice Parent From 2381d3ed7ae1f435c7b6ed664daa128a83a5ae12 Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Tue, 23 Jun 2026 23:30:17 +0100 Subject: [PATCH 6/9] json-smart issue fix 02 --- pom.xml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 608191649..4e8524420 100644 --- a/pom.xml +++ b/pom.xml @@ -100,20 +100,23 @@ net.minidev json-smart - 2.4.8 + 2.5.2 uk.gov.justice.services From 0a6983f03dfdda61cffcc4a282a198280a35d76b Mon Sep 17 00:00:00 2001 From: devops-team Date: Tue, 23 Jun 2026 23:48:43 +0000 Subject: [PATCH 7/9] New 17.103.172-fwe-SNAPSHOT --- listing-command/listing-command-api/pom.xml | 2 +- listing-command/listing-command-handler/pom.xml | 2 +- listing-command/pom.xml | 2 +- listing-common/pom.xml | 2 +- listing-domain/listing-domain-aggregate/pom.xml | 2 +- listing-domain/listing-domain-common/pom.xml | 2 +- listing-domain/listing-domain-event/pom.xml | 2 +- listing-domain/listing-domain-xhibit/pom.xml | 2 +- listing-domain/pom.xml | 2 +- listing-event-sources/pom.xml | 2 +- listing-event/listing-event-listener/pom.xml | 2 +- listing-event/listing-event-processor/pom.xml | 2 +- listing-event/pom.xml | 2 +- listing-healthchecks/pom.xml | 2 +- listing-integration-test-persistence/pom.xml | 2 +- listing-integration-test/pom.xml | 2 +- listing-json/pom.xml | 2 +- listing-performance-test/pom.xml | 2 +- listing-query/listing-query-api/pom.xml | 2 +- listing-query/listing-query-view/pom.xml | 2 +- listing-query/pom.xml | 2 +- listing-service/pom.xml | 2 +- listing-viewstore/listing-viewstore-liquibase/pom.xml | 2 +- listing-viewstore/listing-viewstore-persistence/pom.xml | 2 +- listing-viewstore/pom.xml | 2 +- pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/listing-command/listing-command-api/pom.xml b/listing-command/listing-command-api/pom.xml index 84572b645..a4be129cd 100644 --- a/listing-command/listing-command-api/pom.xml +++ b/listing-command/listing-command-api/pom.xml @@ -4,7 +4,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-handler/pom.xml b/listing-command/listing-command-handler/pom.xml index 16c3b46b1..d4c9ec5ec 100644 --- a/listing-command/listing-command-handler/pom.xml +++ b/listing-command/listing-command-handler/pom.xml @@ -3,7 +3,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-command/pom.xml b/listing-command/pom.xml index 1bb0a7e3f..8c771fd86 100644 --- a/listing-command/pom.xml +++ b/listing-command/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-common/pom.xml b/listing-common/pom.xml index 85cd0a123..5f0f357ec 100644 --- a/listing-common/pom.xml +++ b/listing-common/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-aggregate/pom.xml b/listing-domain/listing-domain-aggregate/pom.xml index 36fc99d3d..b976b7f5f 100644 --- a/listing-domain/listing-domain-aggregate/pom.xml +++ b/listing-domain/listing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-common/pom.xml b/listing-domain/listing-domain-common/pom.xml index b1f293eec..daf85c695 100644 --- a/listing-domain/listing-domain-common/pom.xml +++ b/listing-domain/listing-domain-common/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-event/pom.xml b/listing-domain/listing-domain-event/pom.xml index d44236e8d..58f46743f 100644 --- a/listing-domain/listing-domain-event/pom.xml +++ b/listing-domain/listing-domain-event/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-xhibit/pom.xml b/listing-domain/listing-domain-xhibit/pom.xml index 7898fb710..72e6f44ca 100644 --- a/listing-domain/listing-domain-xhibit/pom.xml +++ b/listing-domain/listing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-domain/pom.xml b/listing-domain/pom.xml index 075601154..ae4ea2226 100644 --- a/listing-domain/pom.xml +++ b/listing-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT listing-domain diff --git a/listing-event-sources/pom.xml b/listing-event-sources/pom.xml index 2ad06a98a..d8f65bab8 100644 --- a/listing-event-sources/pom.xml +++ b/listing-event-sources/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-listener/pom.xml b/listing-event/listing-event-listener/pom.xml index 6eda614c1..6e41db14b 100644 --- a/listing-event/listing-event-listener/pom.xml +++ b/listing-event/listing-event-listener/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-processor/pom.xml b/listing-event/listing-event-processor/pom.xml index 7a500dffc..8f56cd545 100644 --- a/listing-event/listing-event-processor/pom.xml +++ b/listing-event/listing-event-processor/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-event/pom.xml b/listing-event/pom.xml index f4147b5d9..3af1852cb 100644 --- a/listing-event/pom.xml +++ b/listing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-healthchecks/pom.xml b/listing-healthchecks/pom.xml index dc33e7207..fb3328086 100644 --- a/listing-healthchecks/pom.xml +++ b/listing-healthchecks/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test-persistence/pom.xml b/listing-integration-test-persistence/pom.xml index e563d3088..e2dbd9b55 100644 --- a/listing-integration-test-persistence/pom.xml +++ b/listing-integration-test-persistence/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/pom.xml b/listing-integration-test/pom.xml index 0e307acdd..a58c695fd 100644 --- a/listing-integration-test/pom.xml +++ b/listing-integration-test/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-json/pom.xml b/listing-json/pom.xml index 2ae75a499..323b1eb37 100644 --- a/listing-json/pom.xml +++ b/listing-json/pom.xml @@ -4,7 +4,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT listing-json diff --git a/listing-performance-test/pom.xml b/listing-performance-test/pom.xml index a2f932e84..017d240f2 100644 --- a/listing-performance-test/pom.xml +++ b/listing-performance-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT listing-performance-test diff --git a/listing-query/listing-query-api/pom.xml b/listing-query/listing-query-api/pom.xml index 430fee940..fc7e62fa1 100644 --- a/listing-query/listing-query-api/pom.xml +++ b/listing-query/listing-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT listing-query-api diff --git a/listing-query/listing-query-view/pom.xml b/listing-query/listing-query-view/pom.xml index 4c8c9ddeb..b6ec9dffc 100644 --- a/listing-query/listing-query-view/pom.xml +++ b/listing-query/listing-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT listing-query-view diff --git a/listing-query/pom.xml b/listing-query/pom.xml index 42146a2e3..7141b1498 100644 --- a/listing-query/pom.xml +++ b/listing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-service/pom.xml b/listing-service/pom.xml index 8ffdaae9e..1dfec5963 100644 --- a/listing-service/pom.xml +++ b/listing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-liquibase/pom.xml b/listing-viewstore/listing-viewstore-liquibase/pom.xml index 989bb5574..c2e4337f9 100644 --- a/listing-viewstore/listing-viewstore-liquibase/pom.xml +++ b/listing-viewstore/listing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ listing-viewstore uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-persistence/pom.xml b/listing-viewstore/listing-viewstore-persistence/pom.xml index 75296aeee..064fb3258 100644 --- a/listing-viewstore/listing-viewstore-persistence/pom.xml +++ b/listing-viewstore/listing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-viewstore - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/pom.xml b/listing-viewstore/pom.xml index 1283705e1..27cd28443 100644 --- a/listing-viewstore/pom.xml +++ b/listing-viewstore/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 4e8524420..acdeb9145 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.171-fwe-SNAPSHOT + 17.103.172-fwe-SNAPSHOT pom Listing Context Microservice Parent From a88ca15e3ff46d78631fa9b2f597d4c553e4e64b Mon Sep 17 00:00:00 2001 From: Arcadius Ahouansou Date: Tue, 30 Jun 2026 12:18:32 +0100 Subject: [PATCH 8/9] pom version update --- listing-command/listing-command-api/pom.xml | 2 +- listing-command/listing-command-handler/pom.xml | 2 +- listing-command/pom.xml | 2 +- listing-common/pom.xml | 2 +- listing-domain/listing-domain-aggregate/pom.xml | 2 +- listing-domain/listing-domain-common/pom.xml | 2 +- listing-domain/listing-domain-event/pom.xml | 2 +- listing-domain/listing-domain-xhibit/pom.xml | 2 +- listing-domain/pom.xml | 2 +- listing-event-sources/pom.xml | 2 +- listing-event/listing-event-listener/pom.xml | 2 +- listing-event/listing-event-processor/pom.xml | 2 +- listing-event/pom.xml | 2 +- listing-healthchecks/pom.xml | 2 +- listing-integration-test-persistence/pom.xml | 2 +- listing-integration-test/pom.xml | 2 +- listing-json/pom.xml | 2 +- listing-performance-test/pom.xml | 2 +- listing-query/listing-query-api/pom.xml | 2 +- listing-query/listing-query-view/pom.xml | 2 +- listing-query/pom.xml | 2 +- listing-service/pom.xml | 2 +- listing-viewstore/listing-viewstore-liquibase/pom.xml | 2 +- listing-viewstore/listing-viewstore-persistence/pom.xml | 2 +- listing-viewstore/pom.xml | 2 +- pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/listing-command/listing-command-api/pom.xml b/listing-command/listing-command-api/pom.xml index a4be129cd..38a9a1b99 100644 --- a/listing-command/listing-command-api/pom.xml +++ b/listing-command/listing-command-api/pom.xml @@ -4,7 +4,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-handler/pom.xml b/listing-command/listing-command-handler/pom.xml index d4c9ec5ec..e3823536c 100644 --- a/listing-command/listing-command-handler/pom.xml +++ b/listing-command/listing-command-handler/pom.xml @@ -3,7 +3,7 @@ listing-command uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-command/pom.xml b/listing-command/pom.xml index 8c771fd86..a1a153863 100644 --- a/listing-command/pom.xml +++ b/listing-command/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-common/pom.xml b/listing-common/pom.xml index 5f0f357ec..ad4659328 100644 --- a/listing-common/pom.xml +++ b/listing-common/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-aggregate/pom.xml b/listing-domain/listing-domain-aggregate/pom.xml index b976b7f5f..c88b155c1 100644 --- a/listing-domain/listing-domain-aggregate/pom.xml +++ b/listing-domain/listing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-common/pom.xml b/listing-domain/listing-domain-common/pom.xml index daf85c695..180bc38b3 100644 --- a/listing-domain/listing-domain-common/pom.xml +++ b/listing-domain/listing-domain-common/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-event/pom.xml b/listing-domain/listing-domain-event/pom.xml index 58f46743f..3f2c7cb3b 100644 --- a/listing-domain/listing-domain-event/pom.xml +++ b/listing-domain/listing-domain-event/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-xhibit/pom.xml b/listing-domain/listing-domain-xhibit/pom.xml index 72e6f44ca..603f898d0 100644 --- a/listing-domain/listing-domain-xhibit/pom.xml +++ b/listing-domain/listing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-domain/pom.xml b/listing-domain/pom.xml index ae4ea2226..00ffce102 100644 --- a/listing-domain/pom.xml +++ b/listing-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT listing-domain diff --git a/listing-event-sources/pom.xml b/listing-event-sources/pom.xml index d8f65bab8..cdcb37a8f 100644 --- a/listing-event-sources/pom.xml +++ b/listing-event-sources/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-listener/pom.xml b/listing-event/listing-event-listener/pom.xml index 6e41db14b..d10494bf2 100644 --- a/listing-event/listing-event-listener/pom.xml +++ b/listing-event/listing-event-listener/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-processor/pom.xml b/listing-event/listing-event-processor/pom.xml index 8f56cd545..3035d5e87 100644 --- a/listing-event/listing-event-processor/pom.xml +++ b/listing-event/listing-event-processor/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-event/pom.xml b/listing-event/pom.xml index 3af1852cb..a9b275c61 100644 --- a/listing-event/pom.xml +++ b/listing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-healthchecks/pom.xml b/listing-healthchecks/pom.xml index fb3328086..6d31d92de 100644 --- a/listing-healthchecks/pom.xml +++ b/listing-healthchecks/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-integration-test-persistence/pom.xml b/listing-integration-test-persistence/pom.xml index e2dbd9b55..3e294a166 100644 --- a/listing-integration-test-persistence/pom.xml +++ b/listing-integration-test-persistence/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/pom.xml b/listing-integration-test/pom.xml index a58c695fd..9046883f8 100644 --- a/listing-integration-test/pom.xml +++ b/listing-integration-test/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-json/pom.xml b/listing-json/pom.xml index 323b1eb37..c951d709a 100644 --- a/listing-json/pom.xml +++ b/listing-json/pom.xml @@ -4,7 +4,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT listing-json diff --git a/listing-performance-test/pom.xml b/listing-performance-test/pom.xml index 017d240f2..855f2acf8 100644 --- a/listing-performance-test/pom.xml +++ b/listing-performance-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT listing-performance-test diff --git a/listing-query/listing-query-api/pom.xml b/listing-query/listing-query-api/pom.xml index fc7e62fa1..40c747449 100644 --- a/listing-query/listing-query-api/pom.xml +++ b/listing-query/listing-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT listing-query-api diff --git a/listing-query/listing-query-view/pom.xml b/listing-query/listing-query-view/pom.xml index b6ec9dffc..063783cf0 100644 --- a/listing-query/listing-query-view/pom.xml +++ b/listing-query/listing-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT listing-query-view diff --git a/listing-query/pom.xml b/listing-query/pom.xml index 7141b1498..33d3d8331 100644 --- a/listing-query/pom.xml +++ b/listing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-service/pom.xml b/listing-service/pom.xml index 1dfec5963..64b232edb 100644 --- a/listing-service/pom.xml +++ b/listing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-liquibase/pom.xml b/listing-viewstore/listing-viewstore-liquibase/pom.xml index c2e4337f9..9f7c321fb 100644 --- a/listing-viewstore/listing-viewstore-liquibase/pom.xml +++ b/listing-viewstore/listing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ listing-viewstore uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-persistence/pom.xml b/listing-viewstore/listing-viewstore-persistence/pom.xml index 064fb3258..0338e916f 100644 --- a/listing-viewstore/listing-viewstore-persistence/pom.xml +++ b/listing-viewstore/listing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-viewstore - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/pom.xml b/listing-viewstore/pom.xml index 27cd28443..44d1b4e5c 100644 --- a/listing-viewstore/pom.xml +++ b/listing-viewstore/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index acdeb9145..84c37bb6a 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.103.172-fwe-SNAPSHOT + 17.104.2-SNAPSHOT pom Listing Context Microservice Parent From d9e7a3cf27ed0bcb69e98fcbb7cbc2bc21b8ee1a Mon Sep 17 00:00:00 2001 From: devops-team Date: Tue, 30 Jun 2026 12:01:36 +0000 Subject: [PATCH 9/9] New 17.104.3-SNAPSHOT --- listing-command/listing-command-api/pom.xml | 2 +- listing-command/listing-command-handler/pom.xml | 2 +- listing-command/pom.xml | 2 +- listing-common/pom.xml | 2 +- listing-domain/listing-domain-aggregate/pom.xml | 2 +- listing-domain/listing-domain-common/pom.xml | 2 +- listing-domain/listing-domain-event/pom.xml | 2 +- listing-domain/listing-domain-xhibit/pom.xml | 2 +- listing-domain/pom.xml | 2 +- listing-event-sources/pom.xml | 2 +- listing-event/listing-event-listener/pom.xml | 2 +- listing-event/listing-event-processor/pom.xml | 2 +- listing-event/pom.xml | 2 +- listing-healthchecks/pom.xml | 2 +- listing-integration-test-persistence/pom.xml | 2 +- listing-integration-test/pom.xml | 2 +- listing-json/pom.xml | 2 +- listing-performance-test/pom.xml | 2 +- listing-query/listing-query-api/pom.xml | 2 +- listing-query/listing-query-view/pom.xml | 2 +- listing-query/pom.xml | 2 +- listing-service/pom.xml | 2 +- listing-viewstore/listing-viewstore-liquibase/pom.xml | 2 +- listing-viewstore/listing-viewstore-persistence/pom.xml | 2 +- listing-viewstore/pom.xml | 2 +- pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/listing-command/listing-command-api/pom.xml b/listing-command/listing-command-api/pom.xml index 38a9a1b99..0ca222092 100644 --- a/listing-command/listing-command-api/pom.xml +++ b/listing-command/listing-command-api/pom.xml @@ -4,7 +4,7 @@ listing-command uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-command/listing-command-handler/pom.xml b/listing-command/listing-command-handler/pom.xml index e3823536c..af93993ca 100644 --- a/listing-command/listing-command-handler/pom.xml +++ b/listing-command/listing-command-handler/pom.xml @@ -3,7 +3,7 @@ listing-command uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-command/pom.xml b/listing-command/pom.xml index a1a153863..337732545 100644 --- a/listing-command/pom.xml +++ b/listing-command/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-common/pom.xml b/listing-common/pom.xml index ad4659328..bef108706 100644 --- a/listing-common/pom.xml +++ b/listing-common/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-aggregate/pom.xml b/listing-domain/listing-domain-aggregate/pom.xml index c88b155c1..fab8c7cbf 100644 --- a/listing-domain/listing-domain-aggregate/pom.xml +++ b/listing-domain/listing-domain-aggregate/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-common/pom.xml b/listing-domain/listing-domain-common/pom.xml index 180bc38b3..17253bf58 100644 --- a/listing-domain/listing-domain-common/pom.xml +++ b/listing-domain/listing-domain-common/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-event/pom.xml b/listing-domain/listing-domain-event/pom.xml index 3f2c7cb3b..32c5111df 100644 --- a/listing-domain/listing-domain-event/pom.xml +++ b/listing-domain/listing-domain-event/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-domain/listing-domain-xhibit/pom.xml b/listing-domain/listing-domain-xhibit/pom.xml index 603f898d0..1f18c5d7b 100644 --- a/listing-domain/listing-domain-xhibit/pom.xml +++ b/listing-domain/listing-domain-xhibit/pom.xml @@ -3,7 +3,7 @@ listing-domain uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-domain/pom.xml b/listing-domain/pom.xml index 00ffce102..58cb2f99a 100644 --- a/listing-domain/pom.xml +++ b/listing-domain/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT listing-domain diff --git a/listing-event-sources/pom.xml b/listing-event-sources/pom.xml index cdcb37a8f..0dbddf82f 100644 --- a/listing-event-sources/pom.xml +++ b/listing-event-sources/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-listener/pom.xml b/listing-event/listing-event-listener/pom.xml index d10494bf2..148f65dc4 100644 --- a/listing-event/listing-event-listener/pom.xml +++ b/listing-event/listing-event-listener/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-event/listing-event-processor/pom.xml b/listing-event/listing-event-processor/pom.xml index 3035d5e87..2e6aa3838 100644 --- a/listing-event/listing-event-processor/pom.xml +++ b/listing-event/listing-event-processor/pom.xml @@ -3,7 +3,7 @@ listing-event uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-event/pom.xml b/listing-event/pom.xml index a9b275c61..f39d5cc34 100644 --- a/listing-event/pom.xml +++ b/listing-event/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-healthchecks/pom.xml b/listing-healthchecks/pom.xml index 6d31d92de..83fd7f7c2 100644 --- a/listing-healthchecks/pom.xml +++ b/listing-healthchecks/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-integration-test-persistence/pom.xml b/listing-integration-test-persistence/pom.xml index 3e294a166..110dfa8df 100644 --- a/listing-integration-test-persistence/pom.xml +++ b/listing-integration-test-persistence/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-integration-test/pom.xml b/listing-integration-test/pom.xml index 9046883f8..cd689f1b3 100644 --- a/listing-integration-test/pom.xml +++ b/listing-integration-test/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-json/pom.xml b/listing-json/pom.xml index c951d709a..fd314c97e 100644 --- a/listing-json/pom.xml +++ b/listing-json/pom.xml @@ -4,7 +4,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT listing-json diff --git a/listing-performance-test/pom.xml b/listing-performance-test/pom.xml index 855f2acf8..2d1eb9a8c 100644 --- a/listing-performance-test/pom.xml +++ b/listing-performance-test/pom.xml @@ -5,7 +5,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT listing-performance-test diff --git a/listing-query/listing-query-api/pom.xml b/listing-query/listing-query-api/pom.xml index 40c747449..381ee89a8 100644 --- a/listing-query/listing-query-api/pom.xml +++ b/listing-query/listing-query-api/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT listing-query-api diff --git a/listing-query/listing-query-view/pom.xml b/listing-query/listing-query-view/pom.xml index 063783cf0..11a900113 100644 --- a/listing-query/listing-query-view/pom.xml +++ b/listing-query/listing-query-view/pom.xml @@ -4,7 +4,7 @@ uk.gov.moj.cpp.listing listing-query - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT listing-query-view diff --git a/listing-query/pom.xml b/listing-query/pom.xml index 33d3d8331..b9ecad8a5 100644 --- a/listing-query/pom.xml +++ b/listing-query/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-service/pom.xml b/listing-service/pom.xml index 64b232edb..037ff0a0d 100644 --- a/listing-service/pom.xml +++ b/listing-service/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-liquibase/pom.xml b/listing-viewstore/listing-viewstore-liquibase/pom.xml index 9f7c321fb..c67898366 100644 --- a/listing-viewstore/listing-viewstore-liquibase/pom.xml +++ b/listing-viewstore/listing-viewstore-liquibase/pom.xml @@ -3,7 +3,7 @@ listing-viewstore uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/listing-viewstore-persistence/pom.xml b/listing-viewstore/listing-viewstore-persistence/pom.xml index 0338e916f..f5376a148 100644 --- a/listing-viewstore/listing-viewstore-persistence/pom.xml +++ b/listing-viewstore/listing-viewstore-persistence/pom.xml @@ -3,7 +3,7 @@ uk.gov.moj.cpp.listing listing-viewstore - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/listing-viewstore/pom.xml b/listing-viewstore/pom.xml index 44d1b4e5c..bbc231b0b 100644 --- a/listing-viewstore/pom.xml +++ b/listing-viewstore/pom.xml @@ -3,7 +3,7 @@ listing-parent uk.gov.moj.cpp.listing - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 84c37bb6a..d3190451f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ uk.gov.moj.cpp.listing listing-parent - 17.104.2-SNAPSHOT + 17.104.3-SNAPSHOT pom Listing Context Microservice Parent