Commit b69a81c5 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

refactor code

parent 00963c15
Loading
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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() {
+2 −5
Original line number Diff line number Diff line
@@ -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