[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/iptopology-api/src/main/java/org/onosproject/iptopology/api/AreaId.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/AreaId.java
index f3c3b5d..2039e75 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/AreaId.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/AreaId.java
@@ -15,23 +15,19 @@
*/
package org.onosproject.iptopology.api;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
-import java.util.Objects;
+import org.onlab.util.Identifier;
/**
* Area identifier class (32 Bit Area-ID).
*/
-public class AreaId {
- private final int areaId;
-
+public class AreaId extends Identifier<Integer> {
/**
* Constructor to set area identifier.
*
* @param areaId area id
*/
public AreaId(int areaId) {
- this.areaId = areaId;
+ super(areaId);
}
/**
@@ -40,31 +36,6 @@
* @return area identifier
*/
public int areaId() {
- return areaId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(areaId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
-
- if (obj instanceof AreaId) {
- AreaId other = (AreaId) obj;
- return Objects.equals(areaId, other.areaId);
- }
- return false;
- }
-
- @Override
- public String toString() {
- return toStringHelper(this)
- .add("areaId", areaId)
- .toString();
+ return identifier;
}
}
\ No newline at end of file