Commit 7a458fc0 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '24-transient-objects-mvo-fvo-should-not-initialise-arraylists-in-constructor' into 'develop'

Resolve "Transient Objects (MVO, FVO) should not initialise ArrayLists in constructor"

See merge request !26
parents a8c8306b 240993a3

src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ public class CharacteristicMVO { 




  @JsonProperty("characteristicRelationship")

  @JsonProperty("characteristicRelationship")

  @Valid

  @Valid

  private List<CharacteristicRelationshipMVO> characteristicRelationship = new ArrayList<>();

  private List<CharacteristicRelationshipMVO> characteristicRelationship;





  public CharacteristicMVO() {

  public CharacteristicMVO() {

    super();

    super();

src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -49,15 +49,15 @@ public class ManagementJobMVO { 




  @JsonProperty("fileTransferData")

  @JsonProperty("fileTransferData")

  @Valid

  @Valid

  private List<FileTransferDataMVO> fileTransferData = new ArrayList<>();

  private List<FileTransferDataMVO> fileTransferData = null;





  @JsonProperty("dataAccessEndpoint")

  @JsonProperty("dataAccessEndpoint")

  @Valid

  @Valid

  private List<DataAccessEndpointMVO> dataAccessEndpoint = new ArrayList<>();

  private List<DataAccessEndpointMVO> dataAccessEndpoint = null;





  @JsonProperty("scheduleDefinition")

  @JsonProperty("scheduleDefinition")

  @Valid

  @Valid

  private List<ScheduleDefinitionMVO> scheduleDefinition = new ArrayList<>();

  private List<ScheduleDefinitionMVO> scheduleDefinition = null;





  // Property bellow was added by UoP and is not officialy part of TMF628 Model

  // Property bellow was added by UoP and is not officialy part of TMF628 Model

  // @JsonProperty("executionState")

  // @JsonProperty("executionState")

src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMapper.java

+15 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,8 @@ package org.etsi.osl.tmf.pm628.model; 




import org.mapstruct.*;

import org.mapstruct.*;





import java.util.List;



@Mapper(

@Mapper(

        nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,

        nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,

        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS,

        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS,
@@ -23,4 +25,17 @@ public interface MeasurementCollectionJobMapper { 
    @Mapping(target = "uuid", ignore = true)

    @Mapping(target = "uuid", ignore = true)

    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

    MeasurementCollectionJob updateMeasurementCollectionJob(MeasurementCollectionJobMVO measurementCollectionJobMVO, @MappingTarget MeasurementCollectionJob measurementCollectionJob);

    MeasurementCollectionJob updateMeasurementCollectionJob(MeasurementCollectionJobMVO measurementCollectionJobMVO, @MappingTarget MeasurementCollectionJob measurementCollectionJob);



    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)

    List<DataAccessEndpoint> dataAccessEndpointMVOListToDataAccessEndpointList(List<DataAccessEndpointMVO> list);

    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)

    List<PerformanceIndicatorGroupSpecification> performanceIndicatorGroupSpecificationMVOListToPerformanceIndicatorGroupSpecificationList(List<PerformanceIndicatorGroupSpecificationMVO> list);

    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)

    List<PerformanceIndicatorSpecificationRefOrValue> performanceIndicatorSpecificationMVOListToPerformanceIndicatorSpecificationList(List<PerformanceIndicatorSpecificationRefOrValueMVO> list);

    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)

    List<TrackingRecord> trackingRecordMVOListToTrackingRecordList(List<TrackingRecordMVO> list);

    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)

    List<FileTransferData> fileTransferDataMVOListToFileTransferDataList(List<FileTransferDataMVO> list);

    @IterableMapping(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL)

    List<ScheduleDefinition> scheduleDefinitionMVOListToScheduleDefinitionList(List<ScheduleDefinitionMVO> list);

}
 
}

src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -41,15 +41,15 @@ public class MeasurementJobMVO extends ManagementJobMVO { 




  @JsonProperty("performanceIndicatorGroupSpecification")

  @JsonProperty("performanceIndicatorGroupSpecification")

  @Valid

  @Valid

  private List<PerformanceIndicatorGroupSpecificationMVO> performanceIndicatorGroupSpecification = new ArrayList<>();

  private List<PerformanceIndicatorGroupSpecificationMVO> performanceIndicatorGroupSpecification;





  @JsonProperty("performanceIndicatorSpecification")

  @JsonProperty("performanceIndicatorSpecification")

  @Valid

  @Valid

  private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification = new ArrayList<>();

  private List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> performanceIndicatorSpecification;





  @JsonProperty("trackingRecord")

  @JsonProperty("trackingRecord")

  @Valid

  @Valid

  private List<TrackingRecordMVO> trackingRecord = new ArrayList<>();

  private List<TrackingRecordMVO> trackingRecord;





  public MeasurementJobMVO() {

  public MeasurementJobMVO() {

    super();

    super();

src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO { 




  @JsonProperty("dayOfMonthRecurrence")

  @JsonProperty("dayOfMonthRecurrence")

  @Valid

  @Valid

  private List<DayOfMonthRecurrenceMVO> dayOfMonthRecurrence = new ArrayList<>();

  private List<DayOfMonthRecurrenceMVO> dayOfMonthRecurrence;





  @JsonProperty("recurringDaySequence")

  @JsonProperty("recurringDaySequence")

  private String recurringDaySequence;

  private String recurringDaySequence;