From 20917ed88068d4b785f78b9b9738e742022d7ef2 Mon Sep 17 00:00:00 2001
From: AnthonyS <a.santoro@integry.it>
Date: Wed, 27 Nov 2024 18:00:24 +0100
Subject: [PATCH] Aggiunto check su null in child filter setField ed impostati
 ts con questionMarkAndNullableType

---
 ems-core/pom.xml                                     |  1 +
 .../it/integry/ems_model/utility/UtilityFilter.java  | 12 ++++--------
 ems-engine/pom.xml                                   |  1 +
 .../generic/dto/articolo/SaveArticoloRequestDTO.java |  2 +-
 .../dto/articolo/SaveArticoloResponseDTO.java        |  1 -
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/ems-core/pom.xml b/ems-core/pom.xml
index ed2c97809f..2121c0d829 100644
--- a/ems-core/pom.xml
+++ b/ems-core/pom.xml
@@ -115,6 +115,7 @@
                     <mapClasses>asClasses</mapClasses>
                     <mapEnum>asEnum</mapEnum>
                     <optionalProperties>useLibraryDefinition</optionalProperties>
+                    <optionalPropertiesDeclaration>questionMarkAndNullableType</optionalPropertiesDeclaration>
                     <sortDeclarations>true</sortDeclarations>
                     <sortTypeDeclarations>true</sortTypeDeclarations>
                 </configuration>
diff --git a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityFilter.java b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityFilter.java
index 1eda29d642..2b94c9af50 100644
--- a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityFilter.java
+++ b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityFilter.java
@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
 
 public class UtilityFilter {
 
-    public static <T>void convertFilterDtoFieldsToSqlFields(FilterDTO filterDTO, Class<T> clazz) {
+    public static <T> void convertFilterDtoFieldsToSqlFields(FilterDTO filterDTO, Class<T> clazz) {
         List<Field> fields = new ArrayList<>();
         UtilityReflection.getAllFields(fields, clazz);
 
@@ -22,23 +22,19 @@ public class UtilityFilter {
                 .collect(Collectors.toList());
 
         internalConvertFilterDtoFieldToSqlField(filterDTO, fields);
-
-
     }
 
     private static void internalConvertFilterDtoFieldToSqlField(FilterDTO filter, List<Field> fields) {
         for (FilterDTO childFilter : filter.getFilters()) {
-            if(childFilter.getField() == null) {
+            if (childFilter.getField() == null) {
                 internalConvertFilterDtoFieldToSqlField(childFilter, fields);
                 return;
             }
 
-            final Field javaField = fields.stream()
+            fields.stream()
                     .filter(x -> x.getName().equalsIgnoreCase(childFilter.getField()))
                     .findFirst()
-                    .orElse(null);
-
-            childFilter.setField(javaField.getAnnotation(SqlField.class).value());
+                    .ifPresent(javaField -> childFilter.setField(javaField.getAnnotation(SqlField.class).value()));
         }
     }
 
diff --git a/ems-engine/pom.xml b/ems-engine/pom.xml
index ee7c0a7e1d..5821470c35 100644
--- a/ems-engine/pom.xml
+++ b/ems-engine/pom.xml
@@ -93,6 +93,7 @@
                     <mapClasses>asClasses</mapClasses>
                     <mapEnum>asEnum</mapEnum>
                     <optionalProperties>useLibraryDefinition</optionalProperties>
+                    <optionalPropertiesDeclaration>questionMarkAndNullableType</optionalPropertiesDeclaration>
                     <sortDeclarations>true</sortDeclarations>
                     <sortTypeDeclarations>true</sortTypeDeclarations>
                 </configuration>
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloRequestDTO.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloRequestDTO.java
index de2f978ba3..67276fbee3 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloRequestDTO.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloRequestDTO.java
@@ -2,7 +2,7 @@ package it.integry.ems.retail.wms.generic.dto.articolo;
 
 public class SaveArticoloRequestDTO {
 
-    public ArticoloDTO artToSave;
+    private ArticoloDTO artToSave;
 
     public ArticoloDTO getArtToSave() {
         return artToSave;
diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloResponseDTO.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloResponseDTO.java
index 0ba1ce7c3e..f6b90345ba 100644
--- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloResponseDTO.java
+++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloResponseDTO.java
@@ -1,7 +1,6 @@
 package it.integry.ems.retail.wms.generic.dto.articolo;
 
 public class SaveArticoloResponseDTO {
-
     private String codMart;