commit 08d9898714452f71980987137c6043530edc2dd3
author alshabib <alshabibi.ali@gmail.com> Tue Apr 21 16:25:50 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Apr 21 23:52:19 2015 +0000
tree 570d48f8153d5d9db6d9ec1a42ce6642718ac032
parent a668122db17564604758342c62b285666484595e

FlowRule api no longer uses TableTypes. Existing usages are converted to
integer representations via Type.ordinal() call

Change-Id: Ie2a26c5ced166e12f0e1ea22e39cd5195455a1ad

core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
index 63baa68..7d3525c 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
@@ -42,7 +42,6 @@
     private final boolean permanent;
     private final GroupId groupId;
 
-    private final Type type;
     private final Integer tableId;
 
 
@@ -61,7 +60,6 @@
         this.appId = (short) (flowId >>> 48);
         this.groupId = new DefaultGroupId((short) ((flowId >>> 32) & 0xFFFF));
         this.id = FlowId.valueOf(flowId);
-        this.type = Type.DEFAULT;
         this.tableId = 0;
     }
 
@@ -80,8 +78,7 @@
         this.appId = (short) (flowId >>> 48);
         this.groupId = new DefaultGroupId((short) ((flowId >>> 32) & 0xFFFF));
         this.id = FlowId.valueOf(flowId);
-        this.type = tableType;
-        this.tableId = 0;
+        this.tableId = tableType.ordinal();
 
     }
 
@@ -111,8 +108,7 @@
         this.timeout = timeout;
         this.permanent = permanent;
         this.created = System.currentTimeMillis();
-        this.type = type;
-        this.tableId = 0;
+        this.tableId = type.ordinal();
 
         /*
          * id consists of the following.
@@ -141,7 +137,6 @@
         this.timeout = timeout;
         this.permanent = permanent;
         this.created = System.currentTimeMillis();
-        this.type = Type.DEFAULT;
         this.tableId = 0;
 
         /*
@@ -163,7 +158,6 @@
         this.timeout = rule.timeout();
         this.permanent = rule.isPermanent();
         this.created = System.currentTimeMillis();
-        this.type = rule.type();
         this.tableId = rule.tableId();
 
     }
@@ -187,7 +181,6 @@
 
         //FIXME: fields below will be removed.
         this.groupId = null;
-        this.type = null;
 
 
     }
@@ -235,11 +228,11 @@
      * @see java.lang.Object#equals(java.lang.Object)
      */
     public int hashCode() {
-        return Objects.hash(deviceId, selector, priority, type, tableId);
+        return Objects.hash(deviceId, selector, priority, tableId);
     }
 
     public int hash() {
-        return Objects.hash(deviceId, selector, treatment, type);
+        return Objects.hash(deviceId, selector, treatment, tableId);
     }
 
     @Override
@@ -258,8 +251,7 @@
             return Objects.equals(deviceId, that.deviceId) &&
                     Objects.equals(priority, that.priority) &&
                     Objects.equals(selector, that.selector) &&
-                    Objects.equals(tableId, that.tableId) &&
-                    Objects.equals(type, that.type);
+                    Objects.equals(tableId, that.tableId);
 
         }
         return false;
@@ -273,7 +265,7 @@
                 .add("priority", priority)
                 .add("selector", selector.criteria())
                 .add("treatment", treatment == null ? "N/A" : treatment.allInstructions())
-                .add("table type", type)
+                .add("tableId", tableId)
                 .add("created", created)
                 .toString();
     }
@@ -289,11 +281,6 @@
     }
 
     @Override
-    public Type type() {
-        return type;
-    }
-
-    @Override
     public int tableId() {
         return tableId;
     }