commit 025a915ff9ee16effd4b3c2c23b16920605cddac
author Toshio Koide <t-koide@onlab.us> Mon Jul 21 11:00:34 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Mon Jul 21 17:46:09 2014 -0700
tree b0b877c2dd42be8d9fdd3ac675b46046a2de4a3b
parent d46b66d63b483b2ea33f514734849cbba1f3d80e

Define ID representation for Intent, IFlow and MatchAction

- Defines BatchOperationTargetId abstract class.
- The above class is the base class of IntentId, FlowId, and MatchActionId.
 -- Intent objects use IntentId class for its ID.
 -- IFlow objects use FlowId class for its ID.
 -- MatchAction objects use MatchActionId class for its ID.
- BatchOperation classes requires the BatchOperationTargetId as the target object's ID.
- This work is a part of ONOS-1758.

Change-Id: I71bb4e6acd3836d1ced3beb6fb331bca451abdc3

src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java b/src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java
index 9b829a5..9a87da9 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java
@@ -23,7 +23,7 @@
      * @param id ID for MatchaAction object to be removed.
      * @return true if succeeded, false otherwise.
      */
-    boolean removeMatchAction(String id);
+    boolean removeMatchAction(MatchActionId id);
 
     /**
      * Replaces the existing match-action entry by specified match-action entry.

src/main/java/net/onrc/onos/core/matchaction/MatchAction.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java b/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
index 2f21baf..cf4bf0f 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
@@ -18,7 +18,7 @@
  * A filter and actions for traffic.
  */
 public class MatchAction implements IBatchOperationTarget {
-    protected String id;
+    protected final MatchActionId id;
     protected SwitchPort port;
     protected List<IMatch> matches;
     protected List<IAction> actions;
@@ -33,7 +33,7 @@
      */
     public MatchAction(String id, SwitchPort port, List<IMatch> matches,
             List<IAction> actions) {
-        this.id = id;
+        this.id = new MatchActionId(id);
         this.port = port;
         this.matches = matches;
         this.actions = actions;
@@ -64,7 +64,7 @@
     }
 
     @Override
-    public String getId() {
+    public MatchActionId getId() {
         return id;
     }
 

src/main/java/net/onrc/onos/core/matchaction/MatchActionId.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchActionId.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionId.java
new file mode 100644
index 0000000..d4acae6
--- /dev/null
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionId.java
@@ -0,0 +1,31 @@
+package net.onrc.onos.core.matchaction;
+
+import net.onrc.onos.api.batchoperation.BatchOperationTargetId;
+
+public class MatchActionId extends BatchOperationTargetId {
+    private final String value;
+
+    public MatchActionId(String id) {
+        value = id;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof MatchActionId) {
+            MatchActionId other = (MatchActionId) obj;
+            return (this.value.equals(other.value));
+        }
+        return false;
+    }
+
+}

src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java

diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
index e0957f0..a734026 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
@@ -23,7 +23,7 @@
     }
 
     @Override
-    public boolean removeMatchAction(String id) {
+    public boolean removeMatchAction(MatchActionId id) {
         BatchOperation<MatchAction> phase = new BatchOperation<MatchAction>();
         phase.addRemoveOperation(id);
         MatchActionPlan plan = new MatchActionPlan();