From 7a02a0ccadd74c7daade73220382ded9f60434aa Mon Sep 17 00:00:00 2001 From: lpapadopoulos Date: Wed, 1 May 2024 17:41:55 +0300 Subject: [PATCH] refactor: GeographicAddress part of the place --- .../tmf/gsm674/model/ExternalIdentifier.java | 5 ++- .../model/GeographicSubAddressUnit.java | 6 ++-- .../model/GeographicSubAddressValue.java | 9 ++++-- .../osl/tmf/gsm674/model/PlaceRefOrValue.java | 31 ++++++++++++------- 4 files changed, 35 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java index a086f14..2ab966a 100644 --- a/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java +++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java @@ -3,6 +3,8 @@ package org.etsi.osl.tmf.gsm674.model; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.Table; +import jakarta.persistence.Entity; import jakarta.validation.constraints.NotNull; import org.etsi.osl.tmf.common.model.BaseRootEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -10,7 +12,8 @@ import io.swagger.v3.oas.annotations.media.Schema; /** * ExternalIdentifier */ - +@Entity(name = "ExternalIdentifier") +@Table(name = "ExternalIdentifier") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT") public class ExternalIdentifier extends BaseRootEntity { @JsonProperty("owner") diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java index fe9529b..c7645eb 100644 --- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java +++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java @@ -3,12 +3,14 @@ package org.etsi.osl.tmf.gsm674.model; import java.util.Objects; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; - +import jakarta.persistence.Entity; /** * GeographicSubAddressUnit */ - +@Entity(name = "GeographicSubAddressUnit") +@Table(name = "GeographicSubAddressUnit") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT") public class GeographicSubAddressUnit { @JsonProperty("@schemaLocation") diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java index 270708d..acb69d2 100644 --- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java +++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java @@ -5,14 +5,18 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.util.ArrayList; import java.util.List; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.CascadeType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; - +import jakarta.persistence.Entity; /** * GeographicSubAddressValue */ - +@Entity(name = "GeographicSubAddressValue") +@Table(name = "GeographicSubAddressValue") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT") public class GeographicSubAddressValue { @JsonProperty("@type") @@ -36,6 +40,7 @@ public class GeographicSubAddressValue { @Valid @JsonProperty("subUnit") + @OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH }) private List subUnit = new ArrayList<>(); @JsonProperty("subAddressType") private String subAddressType; diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java index b52f3c1..f0daca2 100644 --- a/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java +++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java @@ -8,6 +8,10 @@ import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import org.etsi.osl.tmf.common.model.BaseRootEntity; @@ -26,13 +30,22 @@ import org.etsi.osl.tmf.common.model.BaseRootEntity; @JsonSubTypes.Type(value = PlaceRefOrValue.class, name = "PlaceRefOrValue") }) +@Table(name = "PlaceRefOrValue") +@Entity(name = "PlaceRefOrValue") @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-24T14:24:54.867613034Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT") public class PlaceRefOrValue extends BaseRootEntity { + @JsonProperty("geographicAddress") + @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH }) + private GeographicAddressValue geographicAddressValue; public PlaceRefOrValue() { super(); } + public PlaceRefOrValue(GeographicAddressValue geographicAddressValue) { + this.geographicAddressValue = geographicAddressValue; + } + /** * Constructor with only required parameters */ @@ -102,21 +115,16 @@ public class PlaceRefOrValue extends BaseRootEntity { @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - PlaceRefOrValue placeRefOrValue = (PlaceRefOrValue) o; - return Objects.equals(this.type, placeRefOrValue.type) && - Objects.equals(this.baseType, placeRefOrValue.baseType) && - Objects.equals(this.schemaLocation, placeRefOrValue.schemaLocation); + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + PlaceRefOrValue that = (PlaceRefOrValue) o; + return Objects.equals(geographicAddressValue, that.geographicAddressValue); } @Override public int hashCode() { - return Objects.hash(type, baseType, schemaLocation); + return Objects.hash(geographicAddressValue); } @Override @@ -126,6 +134,7 @@ public class PlaceRefOrValue extends BaseRootEntity { sb.append(" @type: ").append(toIndentedString(type)).append("\n"); sb.append(" @baseType: ").append(toIndentedString(baseType)).append("\n"); sb.append(" @schemaLocation: ").append(toIndentedString(schemaLocation)).append("\n"); + sb.append(" geographicAddress: ").append(toIndentedString(geographicAddressValue)).append("\n"); sb.append("}"); return sb.toString(); } -- GitLab