Commit 7c45d8a4 authored by Nikolaos Kyriakoulis's avatar Nikolaos Kyriakoulis
Browse files

Fixed bugs related to Cascade annotations, added missing JsonProperty... 

Fixed bugs related to Cascade annotations, added missing JsonProperty annotation in ScheduleDefinition
parent 740a2d24

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class MeasurementJob extends ManagementJob { 
  @AnyKeyJavaClass(String.class)

  @AnyDiscriminatorValue(discriminator = "value", entity = PerformanceIndicatorSpecification.class)

  @AnyDiscriminatorValue(discriminator = "ref", entity = PerformanceIndicatorSpecificationRef.class)

  @Cascade(org.hibernate.annotations.CascadeType.MERGE)

  @Cascade({org.hibernate.annotations.CascadeType.MERGE, org.hibernate.annotations.CascadeType.PERSIST})

  @JoinTable(

          name = "pm628_meas_job_perf_ind_specs",

          joinColumns = @JoinColumn(name = "meas_job_uuid"),

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public class PerformanceIndicatorGroupSpecification extends BaseRootNamedEntity 
  @AnyKeyJavaClass(String.class)

  @AnyDiscriminatorValue(discriminator = "value", entity = PerformanceIndicatorSpecification.class)

  @AnyDiscriminatorValue(discriminator = "ref", entity = PerformanceIndicatorSpecificationRef.class)

  @Cascade(CascadeType.MERGE)

  @Cascade({CascadeType.MERGE, CascadeType.PERSIST})

  @JoinTable(

          name = "perf_ind_group_spec_perf_ind_specs",

          joinColumns = @JoinColumn(name = "perf_ind_group_spec_id"),

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

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ public class ScheduleDefinition extends BaseRootEntity { 
    this.excludedDate = excludedDate;

  }



  @JsonProperty("excludedDate")

  public void setExcludedDateString(List<String> excludedDate) {

    this.excludedDate = excludedDate.stream()

        .map(date -> {