From 1440b1d3fb07fefbdb9effe8f7319c43ac86f7bf Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Mon, 7 Jan 2019 13:57:36 +0100
Subject: [PATCH] SSDM-7708: missing adaption in EntityGraph, Node.equals()
simplified
---
.../sync/common/entitygraph/EntityGraph.java | 2 +-
.../plugins/sync/common/entitygraph/Node.java | 19 +++----------------
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java
index eca770ee4c5..da773eb3c7d 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/EntityGraph.java
@@ -118,7 +118,7 @@ public class EntityGraph<N extends INode>
for (INode node : getNodes())
{
List<EdgeNodePair> list = adjacencyMap.get(node);
- if (list.isEmpty() && node.getEntityKind().equals("DATA_SET") == false)
+ if (list.isEmpty() && node.getEntityKind().equals(SyncEntityKind.DATA_SET) == false)
{
sb.append(getRightHandNodeRep(node, forTest));
// if(node.getEntityKind().equals("PROJECT")) {
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java
index 8cde4ba9e20..46d08fda539 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/sync/common/entitygraph/Node.java
@@ -75,27 +75,14 @@ public class Node<T extends IModificationDateHolder & IModifierHolder & IRegistr
public boolean equals(Object obj)
{
if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- Node<?> other = (Node<?>) obj;
- if (entity == null)
{
- if (other.entity != null)
- {
- return false;
- }
- } else if (this.getIdentifier().equals(other.getIdentifier()) == false)
- {
- return false;
+ return true;
}
- else if (getEntityKind().equals(other.getEntityKind()) == false)
+ if (obj instanceof Node == false)
{
return false;
}
- return true;
+ return this.getIdentifier().equals(((Node<?>) obj).getIdentifier());
}
@Override
--
GitLab