Commit 7a02a0cc authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

refactor: GeographicAddress part of the place

parent e990b4d8

src/main/java/org/etsi/osl/tmf/gsm674/model/ExternalIdentifier.java

+4 −1
Original line number Diff line number Diff line
@@ -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")

src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressUnit.java

+4 −2
Original line number Diff line number Diff line
@@ -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")

src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSubAddressValue.java

+7 −2
Original line number Diff line number Diff line
@@ -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<GeographicSubAddressUnit> subUnit = new ArrayList<>();

  @JsonProperty("subAddressType")

  private String subAddressType;

src/main/java/org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java

+20 −11
Original line number Diff line number Diff line
@@ -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();

    }