Change JsonInclude.NON_EMPTY to NON_NULL

Due to some specification related to JsonInclude.NON_EMPTY, the generated openapi.json ignores a collection annoted with NON_EMPTY. For a consistent behavior, we'll use NON_NULL for collections. Signed-off-by: Moti Asayag <masayag@redhat.com>
masayag · May 8, 2023 · 9279d5a · 9279d5a
1 parent b456934
commit 9279d5a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 13 deletions.
diff --git a/...e/src/main/java/com/redhat/parodos/workflow/definition/dto/WorkDefinitionResponseDTO.java b/...e/src/main/java/com/redhat/parodos/workflow/definition/dto/WorkDefinitionResponseDTO.java
@@ -48,6 +48,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @AllArgsConstructor
 @NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class WorkDefinitionResponseDTO {
 
 	private UUID id;
@@ -56,19 +57,14 @@ public class WorkDefinitionResponseDTO {
 
 	private String workType;
 
-	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private WorkFlowProcessingType processingType;
 
-	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private String author;
 
-	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private List<WorkDefinitionResponseDTO> works;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
 	private Map<String, Map<String, Object>> parameters;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
 	private List<WorkFlowTaskOutput> outputs;
 
 	@JsonIgnore

diff --git a/...c/main/java/com/redhat/parodos/workflow/definition/dto/WorkFlowDefinitionResponseDTO.java b/...c/main/java/com/redhat/parodos/workflow/definition/dto/WorkFlowDefinitionResponseDTO.java
@@ -59,13 +59,13 @@ public class WorkFlowDefinitionResponseDTO {
 
 	private Date modifyDate;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private Map<String, Map<String, Object>> parameters;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private WorkFlowPropertiesDefinitionDTO properties;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private List<WorkDefinitionResponseDTO> works;
 
 	public static class WorkFlowDefinitionResponseDTOBuilder {

diff --git a/...e/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowContextResponseDTO.java b/...e/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowContextResponseDTO.java
@@ -35,7 +35,7 @@ public class WorkFlowContextResponseDTO {
 
 	private UUID workFlowExecutionId;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private WorkFlowOptionsResponseDTO workFlowOptions;
 
 }
diff --git a/...e/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowOptionsResponseDTO.java b/...e/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowOptionsResponseDTO.java
@@ -13,7 +13,7 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class WorkFlowOptionsResponseDTO {
 
 	private WorkFlowOption currentVersion;

diff --git a/...-service/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowResponseDTO.java b/...-service/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowResponseDTO.java
@@ -36,7 +36,7 @@
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class WorkFlowResponseDTO {
 
 	private UUID workFlowExecutionId;

diff --git a/...ce/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowStatusResponseDTO.java b/...ce/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkFlowStatusResponseDTO.java
@@ -43,7 +43,7 @@ public class WorkFlowStatusResponseDTO {
 
 	private String status;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private List<WorkStatusResponseDTO> works;
 
 }
diff --git a/...ervice/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkStatusResponseDTO.java b/...ervice/src/main/java/com/redhat/parodos/workflow/execution/dto/WorkStatusResponseDTO.java
@@ -46,7 +46,7 @@ public class WorkStatusResponseDTO {
 
 	private ParodosWorkStatus status;
 
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	@JsonInclude(JsonInclude.Include.NON_NULL)
 	private List<WorkStatusResponseDTO> works;
 
 	@JsonIgnore