Commit 03851066 authored by Konstantinos Poulakakis's avatar Konstantinos Poulakakis
Browse files

Add TMF 673 model setter and getter methods.

parent d38f6c1c

src/main/java/org/etsi/osl/tmf/gam673/model/GeographicAddress.java

+141 −5
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ import jakarta.validation.Valid; 
import org.etsi.osl.tmf.common.model.BaseRootNamedEntity;

import org.springframework.validation.annotation.Validated;



import java.util.List;

import java.util.HashSet;

import java.util.Objects;

import java.util.Set;



@Schema(description = "Structured textual way of describing how to find a Property in an urban area (country properties are often defined\n" +

        "differently).\n" +
@@ -37,7 +38,7 @@ public class GeographicAddress extends BaseRootNamedEntity { 
    @JsonProperty("geographicSubAddress")

    @Valid

    @OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })

    private List<GeographicSubAddress> geographicSubAddress;

    private Set<GeographicSubAddress> geographicSubAddresses;



    @JsonProperty("locality")

    private String locality;
@@ -69,6 +70,141 @@ public class GeographicAddress extends BaseRootNamedEntity { 
    @JsonProperty("streetType")

    private String streetType;



    public GeographicAddress geographicSubAddresses(Set<GeographicSubAddress> geographicSubAddresses) {

        this.geographicSubAddresses = geographicSubAddresses;

        return this;

    }



    public GeographicAddress addGeographicSubAddress(GeographicSubAddress geographicSubAddress) {

        if (this.geographicSubAddresses == null) {

            this.geographicSubAddresses = new HashSet<>();

        }

        this.geographicSubAddresses.add(geographicSubAddress);

        return this;

    }







    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public String getCity() {

        return city;

    }



    public void setCity(String city) {

        this.city = city;

    }



    public String getCountry() {

        return country;

    }



    public void setCountry(String country) {

        this.country = country;

    }



    public GeographicLocationRefOrValue getGeographicLocation() {

        return geographicLocation;

    }



    public void setGeographicLocation(GeographicLocationRefOrValue geographicLocation) {

        this.geographicLocation = geographicLocation;

    }



    public Set<GeographicSubAddress> getGeographicSubAddresses() {

        return geographicSubAddresses;

    }



    public void setGeographicSubAddresses(Set<GeographicSubAddress> geographicSubAddresses) {

        this.geographicSubAddresses = geographicSubAddresses;

    }



    public String getLocality() {

        return locality;

    }



    public void setLocality(String locality) {

        this.locality = locality;

    }



    public String getPostcode() {

        return postcode;

    }



    public void setPostcode(String postcode) {

        this.postcode = postcode;

    }



    public String getStateOrProvince() {

        return stateOrProvince;

    }



    public void setStateOrProvince(String stateOrProvince) {

        this.stateOrProvince = stateOrProvince;

    }



    public String getStreetName() {

        return streetName;

    }



    public void setStreetName(String streetName) {

        this.streetName = streetName;

    }



    public String getStreetNr() {

        return streetNr;

    }



    public void setStreetNr(String streetNr) {

        this.streetNr = streetNr;

    }



    public String getStreetNrLast() {

        return streetNrLast;

    }



    public void setStreetNrLast(String streetNrLast) {

        this.streetNrLast = streetNrLast;

    }



    public String getStreetNrLastSuffix() {

        return streetNrLastSuffix;

    }



    public void setStreetNrLastSuffix(String streetNrLastSuffix) {

        this.streetNrLastSuffix = streetNrLastSuffix;

    }



    public String getStreetNrSuffix() {

        return streetNrSuffix;

    }



    public void setStreetNrSuffix(String streetNrSuffix) {

        this.streetNrSuffix = streetNrSuffix;

    }



    public String getStreetSuffix() {

        return streetSuffix;

    }



    public void setStreetSuffix(String streetSuffix) {

        this.streetSuffix = streetSuffix;

    }



    public String getStreetType() {

        return streetType;

    }



    public void setStreetType(String streetType) {

        this.streetType = streetType;

    }



    @Override

    public boolean equals(java.lang.Object o) {

        if (this == o) {
@@ -83,7 +219,7 @@ public class GeographicAddress extends BaseRootNamedEntity { 
                && Objects.equals(this.city, geographicAddress.city)

                && Objects.equals(this.country, geographicAddress.country)

                && Objects.equals(this.geographicLocation, geographicAddress.geographicLocation)

                && Objects.equals(this.geographicSubAddress, geographicAddress.geographicSubAddress)

                && Objects.equals(this.geographicSubAddresses, geographicAddress.geographicSubAddresses)

                && Objects.equals(this.locality, geographicAddress.locality)

                && Objects.equals(this.postcode, geographicAddress.postcode)

                && Objects.equals(this.stateOrProvince, geographicAddress.stateOrProvince)
@@ -101,7 +237,7 @@ public class GeographicAddress extends BaseRootNamedEntity { 


    @Override

    public int hashCode() {

        return Objects.hash(id,  name, city, country, geographicLocation, geographicSubAddress, locality, postcode, stateOrProvince, streetName, streetNr, streetNrLast, streetNrLastSuffix, streetNrSuffix, streetSuffix, streetType, baseType, schemaLocation, type);

        return Objects.hash(id,  name, city, country, geographicLocation, geographicSubAddresses, locality, postcode, stateOrProvince, streetName, streetNr, streetNrLast, streetNrLastSuffix, streetNrSuffix, streetSuffix, streetType, baseType, schemaLocation, type);

    }



    @Override
@@ -114,7 +250,7 @@ public class GeographicAddress extends BaseRootNamedEntity { 
        sb.append("    city: ").append(toIndentedString(city)).append("\n");

        sb.append("    country: ").append(toIndentedString(country)).append("\n");

        sb.append("    geographicLocation: ").append(toIndentedString(geographicLocation)).append("\n");

        sb.append("    geographicSubAddress: ").append(toIndentedString(geographicSubAddress)).append("\n");

        sb.append("    geographicSubAddress: ").append(toIndentedString(geographicSubAddresses)).append("\n");

        sb.append("    locality: ").append(toIndentedString(locality)).append("\n");

        sb.append("    postcode: ").append(toIndentedString(postcode)).append("\n");

        sb.append("    stateOrProvince: ").append(toIndentedString(stateOrProvince)).append("\n");

src/main/java/org/etsi/osl/tmf/gam673/model/GeographicAddressValidation.java

+36 −5
Original line number Diff line number Diff line
@@ -8,11 +8,13 @@ import jakarta.persistence.OneToMany; 
import jakarta.persistence.OneToOne;

import jakarta.validation.Valid;

import org.etsi.osl.tmf.common.model.BaseRootEntity;

import org.hibernate.annotations.DialectOverride;

import org.springframework.validation.annotation.Validated;



import java.time.OffsetDateTime;

import java.util.List;

import java.util.HashSet;

import java.util.Objects;

import java.util.Set;



@Schema(description = "GeographicAddressValidation is a base class for defining the validation of a GeographicAddress.")

@Validated
@@ -22,7 +24,7 @@ public class GeographicAddressValidation extends BaseRootEntity { 
    @JsonProperty("alternateGeographicAddress")

    @Valid

    @OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })

    private List<GeographicAddress> alternateGeographicAddress;

    private Set<GeographicAddress> alternateGeographicAddresses;



    @JsonProperty("provideAlternative")

    private Boolean provideAlternative;
@@ -39,6 +41,35 @@ public class GeographicAddressValidation extends BaseRootEntity { 
    @JsonProperty("validationResult")

    private String validationResult;



    public GeographicAddress getValidAddress() {

        return validAddress;

    }



    public void setValidAddress(GeographicAddress validAddress) {

        this.validAddress = validAddress;

    }



    public Set<GeographicAddress> getAlternateGeographicAddresses() {

        return alternateGeographicAddresses;

    }



    public void setAlternateGeographicAddresses(Set<GeographicAddress> alternateGeographicAddresses) {

        this.alternateGeographicAddresses = alternateGeographicAddresses;

    }



    public GeographicAddressValidation alternateGeographicAddress(Set<GeographicAddress> alternateGeographicAddresses) {

        this.alternateGeographicAddresses = alternateGeographicAddresses;

        return this;

    }



    public GeographicAddressValidation addGeographicAddress(GeographicAddress geographicAddress) {

        if (this.alternateGeographicAddresses == null) {

            this.alternateGeographicAddresses = new HashSet<>();

        }

        this.alternateGeographicAddresses.add(geographicAddress);

        return this;

    }



    public Boolean getProvideAlternative() {

        return provideAlternative;

    }
@@ -81,7 +112,7 @@ public class GeographicAddressValidation extends BaseRootEntity { 
            return false;

        }

        GeographicAddressValidation geographicAddressValidation = (GeographicAddressValidation) o;

        return Objects.equals(this.alternateGeographicAddress, geographicAddressValidation.alternateGeographicAddress)

        return Objects.equals(this.alternateGeographicAddresses, geographicAddressValidation.alternateGeographicAddresses)

                && Objects.equals(this.provideAlternative, geographicAddressValidation.provideAlternative)

                && Objects.equals(this.status, geographicAddressValidation.status)

                && Objects.equals(this.validAddress, geographicAddressValidation.validAddress)
@@ -94,7 +125,7 @@ public class GeographicAddressValidation extends BaseRootEntity { 


    @Override

    public int hashCode() {

        return Objects.hash(alternateGeographicAddress,  provideAlternative, status, validAddress, validationDate, validationResult, baseType, schemaLocation, type);

        return Objects.hash(alternateGeographicAddresses,  provideAlternative, status, validAddress, validationDate, validationResult, baseType, schemaLocation, type);

    }



    @Override
@@ -102,7 +133,7 @@ public class GeographicAddressValidation extends BaseRootEntity { 
        StringBuilder sb = new StringBuilder();

        sb.append("class geographicAddressValidation {\n");



        sb.append("    alternateGeographicAddress: ").append(toIndentedString(alternateGeographicAddress)).append("\n");

        sb.append("    alternateGeographicAddress: ").append(toIndentedString(alternateGeographicAddresses)).append("\n");

        sb.append("    provideAlternative: ").append(toIndentedString(provideAlternative)).append("\n");

        sb.append("    status: ").append(toIndentedString(status)).append("\n");

        sb.append("    validAddress: ").append(toIndentedString(validAddress)).append("\n");