Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'RED-10286-bp' into 'release/2.589.x'

Browse Source 
RED-10286: treat manualchanges == null

See merge request redactmanager/persistence-service!805
This commit is contained in:
Kilian Schüttler 2024-10-28 12:35:51 +01:00
commit 667ea579df
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/models/FileExchangeImportModel.java
View File

@ -50,7 +50,8 @@ public class FileExchangeImportModel {
EntityLog entityLog; EntityLog entityLog;
ComponentLog componentLog; ComponentLog componentLog;
List<ComponentLogEntry> overrides; List<ComponentLogEntry> overrides;
ManualChangesExportModel manualChanges; @Builder.Default
ManualChangesExportModel manualChanges = new ManualChangesExportModel();
@Builder.Default @Builder.Default
List<FileAttribute> fileAttributes = new ArrayList<>(); List<FileAttribute> fileAttributes = new ArrayList<>();

19
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/models/manualchanges/ManualChangesExportModel.java
View File

@ -1,5 +1,6 @@
package com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges; package com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.AccessLevel; import lombok.AccessLevel;
@ -16,11 +17,17 @@ import lombok.experimental.FieldDefaults;
@FieldDefaults(level = AccessLevel.PRIVATE) @FieldDefaults(level = AccessLevel.PRIVATE)
public class ManualChangesExportModel { public class ManualChangesExportModel {
List<ManualAddExportModel> manualAddExportModels; @Builder.Default
List<ManualRecategorizationExportModel> manualRecategorizationExportModels; List<ManualAddExportModel> manualAddExportModels = new ArrayList<>();
List<ManualResizeExportModel> manualResizeExportModels; @Builder.Default
List<ManualForceExportModel> manualForceExportModels; List<ManualRecategorizationExportModel> manualRecategorizationExportModels = new ArrayList<>();
List<ManualLegalBasisChangeExportModel> manualLegalBasisChangeExportModels; @Builder.Default
List<ManualRemoveExportModel> manualRemoveExportModels; List<ManualResizeExportModel> manualResizeExportModels = new ArrayList<>();
@Builder.Default
List<ManualForceExportModel> manualForceExportModels = new ArrayList<>();
@Builder.Default
List<ManualLegalBasisChangeExportModel> manualLegalBasisChangeExportModels = new ArrayList<>();
@Builder.Default
List<ManualRemoveExportModel> manualRemoveExportModels = new ArrayList<>();
} }