From dc529bb095c4d9cdb430474762d10734ae136e51 Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Tue, 10 Jun 2025 16:26:57 +0300 Subject: [PATCH 1/2] removed new ArrayList from MVOs --- .../osl/tmf/pm628/model/CharacteristicMVO.java | 2 +- .../osl/tmf/pm628/model/ManagementJobMVO.java | 6 +++--- .../osl/tmf/pm628/model/MeasurementJobMVO.java | 6 +++--- .../MonthlyScheduleDayOfWeekDefinitionMVO.java | 2 +- ...formanceIndicatorGroupSpecificationMVO.java | 2 +- .../PerformanceIndicatorSpecificationMVO.java | 2 +- .../etsi/osl/tmf/pm628/model/ResourceMVO.java | 18 +++++++++--------- .../pm628/model/ResourceRelationshipMVO.java | 2 +- .../tmf/pm628/model/ScheduleDefinitionMVO.java | 8 ++++---- .../osl/tmf/pm628/model/TrackingRecordMVO.java | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java index ca8aee8..c0d060b 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java @@ -38,7 +38,7 @@ public class CharacteristicMVO { @JsonProperty("characteristicRelationship") @Valid - private List characteristicRelationship = new ArrayList<>(); + private List characteristicRelationship; public CharacteristicMVO() { super(); diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java index ed61247..b4e4371 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java @@ -49,15 +49,15 @@ public class ManagementJobMVO { @JsonProperty("fileTransferData") @Valid - private List fileTransferData = new ArrayList<>(); + private List fileTransferData = null; @JsonProperty("dataAccessEndpoint") @Valid - private List dataAccessEndpoint = new ArrayList<>(); + private List dataAccessEndpoint = null; @JsonProperty("scheduleDefinition") @Valid - private List scheduleDefinition = new ArrayList<>(); + private List scheduleDefinition = null; // Property bellow was added by UoP and is not officialy part of TMF628 Model // @JsonProperty("executionState") diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java index b971db1..0c9c1d1 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java @@ -41,15 +41,15 @@ public class MeasurementJobMVO extends ManagementJobMVO { @JsonProperty("performanceIndicatorGroupSpecification") @Valid - private List performanceIndicatorGroupSpecification = new ArrayList<>(); + private List performanceIndicatorGroupSpecification; @JsonProperty("performanceIndicatorSpecification") @Valid - private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification = new ArrayList<>(); + private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification; @JsonProperty("trackingRecord") @Valid - private List trackingRecord = new ArrayList<>(); + private List trackingRecord; public MeasurementJobMVO() { super(); diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java index 09a52a0..c108d59 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java @@ -29,7 +29,7 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO { @JsonProperty("dayOfMonthRecurrence") @Valid - private List dayOfMonthRecurrence = new ArrayList<>(); + private List dayOfMonthRecurrence; @JsonProperty("recurringDaySequence") private String recurringDaySequence; diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java index 211304d..8d3a2e2 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java @@ -39,7 +39,7 @@ public class PerformanceIndicatorGroupSpecificationMVO { @JsonProperty("performanceIndicatorSpecification") @Valid - private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification = new ArrayList<>(); + private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification; public PerformanceIndicatorGroupSpecificationMVO() { super(); diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java index e4364c7..5c5f604 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java @@ -67,7 +67,7 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato @JsonProperty("performanceIndicatorSpecRelationship") @Valid - private List performanceIndicatorSpecRelationship = new ArrayList<>(); + private List performanceIndicatorSpecRelationship; public PerformanceIndicatorSpecificationMVO() { super(); diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java index 6baa14d..90885e3 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java @@ -81,31 +81,31 @@ public class ResourceMVO implements ResourceRefOrValueMVO { @JsonProperty("note") @Valid - private List note = new ArrayList<>(); + private List note; @JsonProperty("resourceOrderItem") @Valid - private List resourceOrderItem = new ArrayList<>(); + private List resourceOrderItem; @JsonProperty("place") @Valid - private List place = new ArrayList<>(); + private List place; @JsonProperty("relatedParty") @Valid - private List relatedParty = new ArrayList<>(); + private List relatedParty ; @JsonProperty("resourceRelationship") @Valid - private List resourceRelationship = new ArrayList<>(); + private List resourceRelationship; @JsonProperty("resourceCharacteristic") @Valid - private List resourceCharacteristic = new ArrayList<>(); + private List resourceCharacteristic; @JsonProperty("attachment") @Valid - private List attachment = new ArrayList<>(); + private List attachment; @JsonProperty("resourceSpecification") private ResourceSpecificationRefMVO resourceSpecification; @@ -118,14 +118,14 @@ public class ResourceMVO implements ResourceRefOrValueMVO { @JsonProperty("activationFeature") @Valid - private List activationFeature = new ArrayList<>(); + private List activationFeature; @JsonProperty("intent") private IntentRefMVO intent; @JsonProperty("externalIdentifier") @Valid - private List externalIdentifier = new ArrayList<>(); + private List externalIdentifier; public ResourceMVO() { super(); diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java index 27b02be..40d0e35 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java @@ -32,7 +32,7 @@ public class ResourceRelationshipMVO { @JsonProperty("resourceRelationshipCharacteristic") @Valid - private List resourceRelationshipCharacteristic = new ArrayList<>(); + private List resourceRelationshipCharacteristic; @JsonProperty("resource") private ResourceRefOrValueMVO resource; diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java index 236df25..e9f904d 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java @@ -44,22 +44,22 @@ public class ScheduleDefinitionMVO { private String recurringFrequency; @Valid - private List excludedDate = new ArrayList<>(); + private List excludedDate; @JsonProperty("scheduleDefinitionHourRange") private String scheduleDefinitionHourRange; @Valid - private List weeklyScheduledDefinition = new ArrayList<>(); + private List weeklyScheduledDefinition; @Valid - private List monthlyScheduleDayOfMonthDefinition = new ArrayList<>(); + private List monthlyScheduleDayOfMonthDefinition; @JsonProperty("MonthlyScheduleDayOfWeekDefinition") private MonthlyScheduleDayOfWeekDefinitionMVO monthlyScheduleDayOfWeekDefinition; @Valid - private List dateScheduleDefintion = new ArrayList<>(); + private List dateScheduleDefintion; public ScheduleDefinitionMVO() { super(); diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java index b0ab0cf..ef74d80 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java @@ -37,7 +37,7 @@ public class TrackingRecordMVO { @JsonProperty("characteristic") @Valid - private List characteristic = new ArrayList<>(); + private List characteristic; @JsonProperty("systemId") private String systemId; -- GitLab From 7a4e46afa97d8c075697ff769d9089438cb9f9b7 Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Tue, 10 Jun 2025 16:31:34 +0300 Subject: [PATCH 2/2] Itterable objects return null instead of empty arraylist --- .../model/MeasurementCollectionJobMapper.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java index a1244ba..1c211fd 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java @@ -2,6 +2,8 @@ package org.etsi.osl.tmf.pm628.model; import org.mapstruct.*; +import java.util.List; + @Mapper( nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, @@ -23,4 +25,17 @@ public interface MeasurementCollectionJobMapper { @Mapping(target = "uuid", ignore = true) @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE) MeasurementCollectionJob updateMeasurementCollectionJob(MeasurementCollectionJobMVO measurementCollectionJobMVO, @MappingTarget MeasurementCollectionJob measurementCollectionJob); + + @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) + List dataAccessEndpointMVOListToDataAccessEndpointList(List list); + @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) + List performanceIndicatorGroupSpecificationMVOListToPerformanceIndicatorGroupSpecificationList(List list); + @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) + List performanceIndicatorSpecificationMVOListToPerformanceIndicatorSpecificationList(List list); + @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) + List trackingRecordMVOListToTrackingRecordList(List list); + @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) + List fileTransferDataMVOListToFileTransferDataList(List list); + @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) + List scheduleDefinitionMVOListToScheduleDefinitionList(List list); } -- GitLab