Return the last alertMessage available even if null

This allows to clear a previous alert message Signed-off-by: Gloria Ciavarrini <gciavarrini@redhat.com>
parodos-dev · Jun 15, 2023 · 842b574 · 842b574
1 parent ffc1e9c
commit 842b574
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/workflow-engine/src/main/java/com/redhat/parodos/workflows/workflow/ParallelFlowReport.java b/workflow-engine/src/main/java/com/redhat/parodos/workflows/workflow/ParallelFlowReport.java
@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import com.redhat.parodos.workflows.work.WorkContext;
 import com.redhat.parodos.workflows.work.WorkReport;
@@ -148,8 +147,7 @@ public WorkContext getWorkContext() {
 
 	@Override
 	public String getAlertMessage() {
-		return reports.stream().map(WorkReport::getAlertMessage).filter(Objects::nonNull)
-				.reduce((first, second) -> second).orElse(null);
+		return reports.stream().reduce((first, second) -> second).map(WorkReport::getAlertMessage).orElse(null);
 	}
 
 }
diff --git a/...ow-engine/src/test/java/com/redhat/parodos/workflows/workflow/ParallelFlowReportTest.java b/...ow-engine/src/test/java/com/redhat/parodos/workflows/workflow/ParallelFlowReportTest.java
@@ -84,7 +84,7 @@ public void testGetReports() {
 	@Test
 	public void testGetAlertMessage() {
 		assertThat(completedParallelFlowReport.getAlertMessage()).isEqualTo("alertMessage_2");
-		assertThat(failedParallelFlowReport.getAlertMessage()).isEqualTo("alertMessage_1");
+		assertThat(failedParallelFlowReport.getAlertMessage()).isNull();
 		assertThat(progressParallelFlowReport.getAlertMessage()).isEqualTo("alertMessage_3");
 	}