Commit 00963c15 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

refactor to use BaseRootNamed entity instead

parent 68c2867c

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

+2 −12
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; 
import jakarta.persistence.CascadeType;

import jakarta.persistence.Entity;

import jakarta.persistence.OneToMany;

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

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

import org.etsi.osl.tmf.prm669.model.RelatedParty;



import java.util.HashSet;
@@ -12,7 +12,7 @@ import java.util.Objects; 
import java.util.Set;



@Entity(name = "GeographicSite")

public class GeographicSite extends BaseRootEntity {

public class GeographicSite extends BaseRootNamedEntity {



    @JsonProperty("id")

    private String id;
@@ -20,8 +20,6 @@ public class GeographicSite extends BaseRootEntity { 
    private String code;

    @JsonProperty("description")

    private String description;

    @JsonProperty("name")

    private String name;

    @JsonProperty("status")

    private String status;
@@ -112,14 +110,6 @@ public class GeographicSite extends BaseRootEntity { 
        this.description = description;

    }



    public String getName() {

        return name;

    }



    public void setName(String name) {

        this.name = name;

    }



    public String getStatus() {

        return status;

    }

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

+3 −11
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ package org.etsi.osl.tmf.gsm674.model; 


import com.fasterxml.jackson.annotation.JsonProperty;

import jakarta.persistence.Entity;

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

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



import java.util.Objects;



@Entity(name="PlaceRefOrValue")

public class PlaceRefOrValue extends BaseRootEntity {

public class PlaceRefOrValue extends BaseRootNamedEntity {

    @JsonProperty("id")

    private String id;
@@ -28,14 +28,6 @@ public class PlaceRefOrValue extends BaseRootEntity { 
        this.id = id;

    }



    public String getName() {

        return name;

    }



    public void setName(String name) {

        this.name = name;

    }



    public String getReferredType() {

        return referredType;

    }
@@ -55,7 +47,7 @@ public class PlaceRefOrValue extends BaseRootEntity { 


    @Override

    public int hashCode() {

        return Objects.hash(id, name, referredType);

        return Objects.hash(super.hashCode(), id, name, referredType);

    }



    @Override