From 30edb16a0521c80081a6e474f3452fffcc3ca30c Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Mon, 24 Nov 2014 15:02:14 -0800 Subject: [PATCH] Add equals() methods because hashCode() was defined These are reported as 'Blocker' bugs by SonarQube Change-Id: I6c25e365522f26e9f50b67a57878ad75c42aa9d2 --- .../java/org/onlab/onos/cluster/Leadership.java | 16 +++++++++++++++- .../org/onlab/onos/cluster/LeadershipEvent.java | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java b/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java index dbf36a527e..cf247f57f2 100644 --- a/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java +++ b/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java @@ -48,6 +48,20 @@ public class Leadership { return Objects.hash(topic, leader, epoch); } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof Leadership) { + final Leadership other = (Leadership) obj; + return Objects.equals(this.topic, other.topic) && + Objects.equals(this.leader, other.leader) && + Objects.equals(this.epoch, other.epoch); + } + return false; + } + @Override public String toString() { return MoreObjects.toStringHelper(this.getClass()) @@ -56,4 +70,4 @@ public class Leadership { .add("epoch", epoch) .toString(); } -} \ No newline at end of file +} diff --git a/core/api/src/main/java/org/onlab/onos/cluster/LeadershipEvent.java b/core/api/src/main/java/org/onlab/onos/cluster/LeadershipEvent.java index 246f0fce6d..bf202704b6 100644 --- a/core/api/src/main/java/org/onlab/onos/cluster/LeadershipEvent.java +++ b/core/api/src/main/java/org/onlab/onos/cluster/LeadershipEvent.java @@ -76,6 +76,20 @@ public class LeadershipEvent extends AbstractEvent