Add missing equals(), hashCode() and toString()
Change-Id: I99e313b1672369092596d8e28e08778021eb1998
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EmptyDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EmptyDiscreteResources.java
index 87da883..c3d63d6 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EmptyDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EmptyDiscreteResources.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.store.resource.impl;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import org.onosproject.net.resource.DiscreteResource;
import org.onosproject.net.resource.DiscreteResourceId;
@@ -65,4 +66,11 @@
public Set<DiscreteResource> values() {
return ImmutableSet.of();
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("values", ImmutableSet.of())
+ .toString();
+ }
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java
index 540a98f..061cf14 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodableDiscreteResources.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.store.resource.impl;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.Sets;
import org.onosproject.net.resource.DiscreteResource;
import org.onosproject.net.resource.DiscreteResourceCodec;
@@ -24,6 +25,7 @@
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -125,4 +127,29 @@
Map<Class<?>, EncodedDiscreteResources> rawValues() {
return values;
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(parent, values);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ final EncodableDiscreteResources other = (EncodableDiscreteResources) obj;
+ return Objects.equals(this.parent, other.parent)
+ && Objects.equals(this.values, other.values);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("values", values())
+ .toString();
+ }
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodedDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodedDiscreteResources.java
index 59c39d8..6e3f613 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodedDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/EncodedDiscreteResources.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.store.resource.impl;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.DiscreteDomain;
import com.google.common.collect.Range;
import com.google.common.collect.RangeSet;
@@ -26,6 +27,7 @@
import org.onosproject.net.resource.Resources;
import java.util.LinkedHashSet;
+import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -83,4 +85,30 @@
boolean isEmpty() {
return rangeSet.isEmpty();
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(rangeSet, codec);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ final EncodedDiscreteResources other = (EncodedDiscreteResources) obj;
+ return Objects.equals(this.rangeSet, other.rangeSet)
+ && Objects.equals(this.codec, other.codec);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("rangeSet", rangeSet)
+ .add("codec", codec)
+ .toString();
+ }
}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java
index 31c6488..1959a59 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/UnifiedDiscreteResources.java
@@ -15,6 +15,7 @@
*/
package org.onosproject.store.resource.impl;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.Sets;
import org.onosproject.net.resource.DiscreteResource;
import org.onosproject.net.resource.DiscreteResourceId;
@@ -22,6 +23,7 @@
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -95,4 +97,29 @@
return Stream.concat(encodables.values().stream(), generics.values().stream())
.collect(Collectors.toCollection(LinkedHashSet::new));
}
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(generics, encodables);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ final UnifiedDiscreteResources other = (UnifiedDiscreteResources) obj;
+ return Objects.equals(this.generics, other.generics)
+ && Objects.equals(this.encodables, other.encodables);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("values", values())
+ .toString();
+ }
}