[ONOS-4014] Refactor *Id classes to extend from Identifier class
- Refactor all of *Id classes in apps package
Change-Id: I31fafbf7f15aee3a1b3b37b7c281b3f99eae0883
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPortId.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPortId.java
index a386348..5496ad3 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPortId.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/VirtualPortId.java
@@ -15,23 +15,21 @@
*/
package org.onosproject.vtnrsc;
-import static com.google.common.base.Preconditions.checkNotNull;
+import org.onlab.util.Identifier;
-import java.util.Objects;
+import static com.google.common.base.Preconditions.checkNotNull;
/**
* Immutable representation of a virtual port identifier.
*/
-public final class VirtualPortId {
- private final String portId;
+public final class VirtualPortId extends Identifier<String> {
// Public construction is prohibited
private VirtualPortId(String virtualPortId) {
- checkNotNull(virtualPortId, "VirtualPortId cannot be null");
- this.portId = virtualPortId;
+ super(checkNotNull(virtualPortId, "VirtualPortId cannot be null"));
}
public String portId() {
- return portId;
+ return identifier;
}
/**
@@ -43,28 +41,4 @@
public static VirtualPortId portId(String portId) {
return new VirtualPortId(portId);
}
-
- @Override
- public int hashCode() {
- return portId.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj instanceof VirtualPortId) {
- final VirtualPortId that = (VirtualPortId) obj;
- return this.getClass() == that.getClass()
- && Objects.equals(this.portId, that.portId);
- }
- return false;
- }
-
- @Override
- public String toString() {
- return portId;
- }
-
}