diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java index 9e9f70bf397838db0ce48947089affe33b22c27d..00c43bd8da4368106ed0595e5fa2e426e1a8139d 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java @@ -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"), diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java index 067d023837fda56447cfb1e5937e50c46738ad40..7a5296d4518ed4d8da9e50293f88150728c3c0d0 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java @@ -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"), diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java index c25213d77ec124a8005aca8cc1af980a2f0cc0f7..780123221f02cf0b8eec96b63c1da42dff852352 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java @@ -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 -> {