Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Aggiunto check su null in child filter setField ed impostati ts con questionMarkAndNullableType
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Anthony Santoro
2024-11-27 18:00:24 +01:00
parent 10ddc46460
commit 20917ed880
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ems-core/pom.xml
View File

@@ -115,6 +115,7 @@
<mapClasses>asClasses</mapClasses>
<mapEnum>asEnum</mapEnum>
<optionalProperties>useLibraryDefinition</optionalProperties>
<optionalPropertiesDeclaration>questionMarkAndNullableType</optionalPropertiesDeclaration>
<sortDeclarations>true</sortDeclarations>
<sortTypeDeclarations>true</sortTypeDeclarations>
</configuration>

12
ems-core/src/main/java/it/integry/ems_model/utility/UtilityFilter.java
View File

@@ -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()));
}
}

1
ems-engine/pom.xml
View File

@@ -93,6 +93,7 @@
<mapClasses>asClasses</mapClasses>
<mapEnum>asEnum</mapEnum>
<optionalProperties>useLibraryDefinition</optionalProperties>
<optionalPropertiesDeclaration>questionMarkAndNullableType</optionalPropertiesDeclaration>
<sortDeclarations>true</sortDeclarations>
<sortTypeDeclarations>true</sortTypeDeclarations>
</configuration>

2
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloRequestDTO.java
View File

@@ -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;

1
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/SaveArticoloResponseDTO.java
View File

@@ -1,7 +1,6 @@
package it.integry.ems.retail.wms.generic.dto.articolo;
public class SaveArticoloResponseDTO {
private String codMart;