From b69a81c59dae4ac998d0157831918e53812ba3dc Mon Sep 17 00:00:00 2001
From: lpapadopoulos <lpapadopoulos@ubitech.eu>
Date: Wed, 10 Apr 2024 13:27:59 +0300
Subject: [PATCH] refactor code
---
.../java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java | 4 ++--
.../org/etsi/osl/tmf/gsm674/model/PlaceRefOrValue.java | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
index db14ec4..5a00733 100644
--- a/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
+++ b/src/main/java/org/etsi/osl/tmf/gsm674/model/GeographicSite.java
@@ -78,12 +78,12 @@ public class GeographicSite extends BaseRootNamedEntity {
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
GeographicSite that = (GeographicSite) o;
- return Objects.equals(id, that.id) && Objects.equals(code, that.code) && Objects.equals(description, that.description) && Objects.equals(name, that.name) && Objects.equals(status, that.status) && Objects.equals(calendar, that.calendar) && Objects.equals(placeRefOrValue, that.placeRefOrValue) && Objects.equals(geographicSiteRelationship, that.geographicSiteRelationship) && Objects.equals(relatedParties, that.relatedParties);
+ return Objects.equals(id, that.id) && Objects.equals(code, that.code) && Objects.equals(description, that.description) && Objects.equals(status, that.status) && Objects.equals(calendar, that.calendar) && Objects.equals(placeRefOrValue, that.placeRefOrValue) && Objects.equals(geographicSiteRelationship, that.geographicSiteRelationship) && Objects.equals(relatedParties, that.relatedParties);
}
@Override
public int hashCode() {
- return Objects.hash(id, code, description, name, status, calendar, placeRefOrValue, geographicSiteRelationship, relatedParties);
+ return Objects.hash(super.hashCode(), id, code, description, status, calendar, placeRefOrValue, geographicSiteRelationship, relatedParties);
}
public String getId() {
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 759e2b8..5a63806 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
@@ -11,9 +11,6 @@ public class PlaceRefOrValue extends BaseRootNamedEntity {
@JsonProperty("id")
private String id;
- @JsonProperty("name")
- private String name;
-
@JsonProperty("@referredType")
private String referredType;
@@ -42,12 +39,12 @@ public class PlaceRefOrValue extends BaseRootNamedEntity {
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
PlaceRefOrValue that = (PlaceRefOrValue) o;
- return Objects.equals(id, that.id) && Objects.equals(name, that.name) && Objects.equals(referredType, that.referredType);
+ return Objects.equals(id, that.id) && Objects.equals(referredType, that.referredType);
}
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), id, name, referredType);
+ return Objects.hash(super.hashCode(), id, referredType);
}
@Override
--
GitLab