From e346166ad69d28f3c3de42a2f339345c92af838f Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Thu, 10 Apr 2025 15:29:41 +0300 Subject: [PATCH 1/2] Eager fetch for FileTransferData --- src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java index 702c367..d0aceaf 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java @@ -11,6 +11,8 @@ import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Size; import org.etsi.osl.tmf.common.model.BaseRootEntity; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; import org.springframework.format.annotation.DateTimeFormat; import javax.annotation.Generated; @@ -54,6 +56,7 @@ public class ManagementJob extends BaseRootEntity { name = "pm628_man_job_ftd", joinColumns = @JoinColumn(name = "man_job_id") ) + @Fetch(FetchMode.JOIN) private List fileTransferData = new ArrayList<>(); @JsonProperty("dataAccessEndpoint") -- GitLab From fea42594afb5b747c04a83df7a402b8c92b15458 Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Mon, 12 May 2025 16:15:49 +0300 Subject: [PATCH 2/2] added @type explicitly --- .../etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java index 3b93280..9e47cd8 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java @@ -1,6 +1,7 @@ package org.etsi.osl.tmf.pm628.model; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.persistence.*; import jakarta.persistence.Entity; @@ -18,8 +19,12 @@ import java.util.Objects; @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-05-15T07:30:16.936523289Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT") @Entity(name = "PM628_MCJob") +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type") public class MeasurementCollectionJob extends MeasurementJob implements PatchMeasurementCollectionJob200Response { +// @JsonProperty("@type") +// private String type = "MeasurementCollectionJob"; + @JsonProperty("outputFormat") private String outputFormat; @@ -301,6 +306,7 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea StringBuilder sb = new StringBuilder(); sb.append("class MeasurementCollectionJob {\n"); sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" @type: ").append(toIndentedString(type)).append("\n"); sb.append(" outputFormat: ").append(toIndentedString(outputFormat)).append("\n"); sb.append(" reportingPeriod: ").append(toIndentedString(reportingPeriod)).append("\n"); sb.append(" jobCollectionFilter: ").append(toIndentedString(jobCollectionFilter)).append("\n"); -- GitLab