diff options
author | 2015-12-01 05:49:27 -0800 | |
---|---|---|
committer | 2015-12-01 05:49:27 -0800 | |
commit | e63291850fd0795c5700e25e67e5dee89ba54c5f (patch) | |
tree | 9707289536ad95bb739c9856761ad43275e07d8c /framework/src/onos/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java | |
parent | 671823e12bc13be9a8b87a5d7de33da1bb7a44e8 (diff) |
onos commit hash c2999f30c69e50df905a9d175ef80b3f23a98514
Change-Id: I2bb8562c4942b6d6a6d60b663db2e17540477b81
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>
Diffstat (limited to 'framework/src/onos/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java')
-rw-r--r-- | framework/src/onos/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/framework/src/onos/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java b/framework/src/onos/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java index 27c75ebd..14bc2200 100644 --- a/framework/src/onos/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java +++ b/framework/src/onos/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/SuppressionRules.java @@ -18,38 +18,33 @@ package org.onosproject.provider.lldp.impl; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import java.util.Set; import org.onosproject.net.Annotations; import org.onosproject.net.Device; -import org.onosproject.net.DeviceId; import org.onosproject.net.Element; import org.onosproject.net.Port; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.base.MoreObjects; public class SuppressionRules { public static final String ANY_VALUE = "(any)"; - private final Set<DeviceId> suppressedDevice; private final Set<Device.Type> suppressedDeviceType; private final Map<String, String> suppressedAnnotation; - public SuppressionRules(Set<DeviceId> suppressedDevice, - Set<Device.Type> suppressedType, - Map<String, String> suppressedAnnotation) { + public SuppressionRules(Set<Device.Type> suppressedType, + Map<String, String> suppressedAnnotation) { - this.suppressedDevice = ImmutableSet.copyOf(suppressedDevice); this.suppressedDeviceType = ImmutableSet.copyOf(suppressedType); this.suppressedAnnotation = ImmutableMap.copyOf(suppressedAnnotation); } public boolean isSuppressed(Device device) { - if (suppressedDevice.contains(device.id())) { - return true; - } if (suppressedDeviceType.contains(device.type())) { return true; } @@ -92,10 +87,6 @@ public class SuppressionRules { return false; } - Set<DeviceId> getSuppressedDevice() { - return suppressedDevice; - } - Set<Device.Type> getSuppressedDeviceType() { return suppressedDeviceType; } @@ -103,4 +94,30 @@ public class SuppressionRules { Map<String, String> getSuppressedAnnotation() { return suppressedAnnotation; } + + @Override + public int hashCode() { + return Objects.hash(suppressedDeviceType, + suppressedAnnotation); + } + + @Override + public boolean equals(Object object) { + if (object != null && getClass() == object.getClass()) { + SuppressionRules that = (SuppressionRules) object; + return Objects.equals(this.suppressedDeviceType, + that.suppressedDeviceType) + && Objects.equals(this.suppressedAnnotation, + that.suppressedAnnotation); + } + return false; + } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("suppressedDeviceType", suppressedDeviceType) + .add("suppressedAnnotation", suppressedAnnotation) + .toString(); + } } |