From d695ad212f2b853151eeb27183f1a48974a1c799 Mon Sep 17 00:00:00 2001 From: aliyuksel Date: Fri, 20 Feb 2026 09:22:10 +0000 Subject: [PATCH 1/6] DD-41414 --- ...antTrialRecordSheetRequestedProcessor.java | 3 ++ ...rialRecordSheetRequestedProcessorTest.java | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java index cf6ce334c4..6a783c57ff 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java @@ -88,6 +88,9 @@ public void process(final JsonEnvelope jsonEnvelope) { UUID streamId = jsonEnvelope.metadata().streamId().orElse(defendantTrialRecordSheetRequested.getCaseId()); JsonObject recordSheetPayload = progressionService.generateTrialRecordSheetPayload(jsonEnvelope, defendantTrialRecordSheetRequested.getCaseId(), defendantTrialRecordSheetRequested.getDefendantId()); recordSheetPayload = recordSheetPayload.containsKey(PAYLOAD) ? recordSheetPayload.getJsonObject(PAYLOAD) : null; + if(isNull(recordSheetPayload)){ + return; + } Optional.ofNullable(recordSheetPayload) .filter(r -> r.containsKey(DEFENDANT)) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java index 98b4b6c246..15f9620cf9 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java @@ -50,6 +50,7 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -113,6 +114,35 @@ void process() { verify(sender, times(0)).send(envelopeArgumentCaptor.capture()); } + @Test + void processWhenPayloadIsNull() { + final UUID defendantId = randomUUID(); + final UUID caseId = randomUUID(); + final UUID streamId = randomUUID(); + + JsonObject nameJsonObject = createObjectBuilder() + .add("name", "test name") + .build(); + JsonObject recordSheetPayload = createObjectBuilder() + .add("defendant", nameJsonObject) + .build(); + JsonObject newRecordSheetPayload = createObjectBuilder() + .build(); + final JsonEnvelope event = envelopeFrom( + metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested").withStreamId(streamId), + objectToJsonObjectConverter.convert(DefendantTrialRecordSheetRequested.defendantTrialRecordSheetRequested() + .withDefendantId(defendantId) + .withCaseId(caseId) + .build())); + + when(progressionService.generateTrialRecordSheetPayload(event, caseId, defendantId)).thenReturn(newRecordSheetPayload); + + this.eventProcessor.process(event); + verify(sender, never()).send(envelopeArgumentCaptor.capture()); + verify(fileService, never()).storePayload(any(JsonObject.class), anyString(), anyString()); + verify(systemDocGeneratorService, never()).generateDocument(any(DocumentGenerationRequest.class), any(JsonEnvelope.class)); + } + @Test void shouldProcessForApplication() { ArgumentCaptor captor = ArgumentCaptor.forClass(DocumentGenerationRequest.class); From 1eb7518ee4b845d1c071677d86aef862d2d1d2b2 Mon Sep 17 00:00:00 2001 From: aliyuksel Date: Fri, 20 Feb 2026 14:02:31 +0000 Subject: [PATCH 2/6] sonar problem --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 31aa6872cc..3b186b1b71 100644 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,6 @@ - ${project.basedir}/../target/jacoco-it.exec - sonar-report.json git From 4c9efd7d9b961207cebe7893065775d81a9659aa Mon Sep 17 00:00:00 2001 From: aliyuksel Date: Fri, 20 Feb 2026 14:48:35 +0000 Subject: [PATCH 3/6] sonar problem --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index 3b186b1b71..6e3debe203 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,24 @@ true + + org.jacoco + jacoco-maven-plugin + + + + prepare-agent + + + + report + verify + + report + + + + From 9e636f62b15d8fc8f0c8191063ec6b764e629bc6 Mon Sep 17 00:00:00 2001 From: aliyuksel Date: Fri, 20 Feb 2026 15:26:01 +0000 Subject: [PATCH 4/6] Revert "sonar problem" This reverts commit 4c9efd7d9b961207cebe7893065775d81a9659aa. --- pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pom.xml b/pom.xml index 6e3debe203..3b186b1b71 100644 --- a/pom.xml +++ b/pom.xml @@ -106,24 +106,6 @@ true - - org.jacoco - jacoco-maven-plugin - - - - prepare-agent - - - - report - verify - - report - - - - From c9f5aec7d623cc2f60bf329ce5ef71f80b3a6031 Mon Sep 17 00:00:00 2001 From: aliyuksel Date: Fri, 20 Feb 2026 15:26:01 +0000 Subject: [PATCH 5/6] Revert "sonar problem" This reverts commit 1eb7518ee4b845d1c071677d86aef862d2d1d2b2. --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 3b186b1b71..31aa6872cc 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,8 @@ + ${project.basedir}/../target/jacoco-it.exec + sonar-report.json git From e8731f4bb3048d45b1c5bdeaeaf530150ce981ee Mon Sep 17 00:00:00 2001 From: aliyuksel Date: Fri, 20 Feb 2026 15:26:01 +0000 Subject: [PATCH 6/6] Revert "DD-41414" This reverts commit d695ad212f2b853151eeb27183f1a48974a1c799. --- ...antTrialRecordSheetRequestedProcessor.java | 3 -- ...rialRecordSheetRequestedProcessorTest.java | 30 ------------------- 2 files changed, 33 deletions(-) diff --git a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java index 6a783c57ff..cf6ce334c4 100644 --- a/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java +++ b/progression-event/progression-event-processor/src/main/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessor.java @@ -88,9 +88,6 @@ public void process(final JsonEnvelope jsonEnvelope) { UUID streamId = jsonEnvelope.metadata().streamId().orElse(defendantTrialRecordSheetRequested.getCaseId()); JsonObject recordSheetPayload = progressionService.generateTrialRecordSheetPayload(jsonEnvelope, defendantTrialRecordSheetRequested.getCaseId(), defendantTrialRecordSheetRequested.getDefendantId()); recordSheetPayload = recordSheetPayload.containsKey(PAYLOAD) ? recordSheetPayload.getJsonObject(PAYLOAD) : null; - if(isNull(recordSheetPayload)){ - return; - } Optional.ofNullable(recordSheetPayload) .filter(r -> r.containsKey(DEFENDANT)) diff --git a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java index 15f9620cf9..98b4b6c246 100644 --- a/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java +++ b/progression-event/progression-event-processor/src/test/java/uk/gov/moj/cpp/progression/processor/DefendantTrialRecordSheetRequestedProcessorTest.java @@ -50,7 +50,6 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -114,35 +113,6 @@ void process() { verify(sender, times(0)).send(envelopeArgumentCaptor.capture()); } - @Test - void processWhenPayloadIsNull() { - final UUID defendantId = randomUUID(); - final UUID caseId = randomUUID(); - final UUID streamId = randomUUID(); - - JsonObject nameJsonObject = createObjectBuilder() - .add("name", "test name") - .build(); - JsonObject recordSheetPayload = createObjectBuilder() - .add("defendant", nameJsonObject) - .build(); - JsonObject newRecordSheetPayload = createObjectBuilder() - .build(); - final JsonEnvelope event = envelopeFrom( - metadataWithRandomUUID("progression.event.defendant-trial-record-sheet-requested").withStreamId(streamId), - objectToJsonObjectConverter.convert(DefendantTrialRecordSheetRequested.defendantTrialRecordSheetRequested() - .withDefendantId(defendantId) - .withCaseId(caseId) - .build())); - - when(progressionService.generateTrialRecordSheetPayload(event, caseId, defendantId)).thenReturn(newRecordSheetPayload); - - this.eventProcessor.process(event); - verify(sender, never()).send(envelopeArgumentCaptor.capture()); - verify(fileService, never()).storePayload(any(JsonObject.class), anyString(), anyString()); - verify(systemDocGeneratorService, never()).generateDocument(any(DocumentGenerationRequest.class), any(JsonEnvelope.class)); - } - @Test void shouldProcessForApplication() { ArgumentCaptor captor = ArgumentCaptor.forClass(DocumentGenerationRequest.class);