Yuta HIGUCHI

Reverting ElementId hashCode + equals logic, which was breaking TopologyManagerTest

- requires further investigation later

Change-Id: I22de937c1ffdd60f674813e5e5dd10b0ddce524b
...@@ -38,7 +38,7 @@ public abstract class ElementId { ...@@ -38,7 +38,7 @@ public abstract class ElementId {
38 38
39 @Override 39 @Override
40 public int hashCode() { 40 public int hashCode() {
41 - return Objects.hash(str); 41 + return Objects.hash(uri);
42 } 42 }
43 43
44 @Override 44 @Override
...@@ -49,7 +49,7 @@ public abstract class ElementId { ...@@ -49,7 +49,7 @@ public abstract class ElementId {
49 if (obj instanceof ElementId) { 49 if (obj instanceof ElementId) {
50 final ElementId that = (ElementId) obj; 50 final ElementId that = (ElementId) obj;
51 return this.getClass() == that.getClass() && 51 return this.getClass() == that.getClass() &&
52 - Objects.equals(this.str, that.str); 52 + Objects.equals(this.uri, that.uri);
53 } 53 }
54 return false; 54 return false;
55 } 55 }
......