commit a3a476d1c4400e3a84ff899ceae54bd7608860c0
author alshabib <alshabibi.ali@gmail.com> Fri Apr 10 14:35:38 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Sat Apr 11 00:37:36 2015 +0000
tree 7312cab3ed536cd621124acd32d8acf836a3d59b
parent 1097c978fb72dc23a5c2c0ad678a765fd9df6edb

reinstating the key field in FilterObjectives

Change-Id: I25f7d105edd562785cb213f747e7d9e0650f2635

core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
index 5164e45..29bb2f7 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
@@ -375,6 +375,10 @@
         return new OpticalSignalTypeCriterion(sigType, Type.OCH_SIGTYPE);
     }
 
+    public static Criterion dummy() {
+        return new DummyCriterion();
+    }
+
     /**
      * Implementation of input port criterion.
      */
@@ -1729,4 +1733,15 @@
             return false;
         }
     }
+
+    /**
+     * Dummy Criterion used with @see{FilteringObjective}.
+     */
+    private static class DummyCriterion implements Criterion {
+
+        @Override
+        public Type type() {
+            return Type.DUMMY;
+        }
+    }
 }

core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
index 25764d4..b42376d 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
@@ -124,7 +124,12 @@
         /** Optical channel signal ID (lambda). */
         OCH_SIGID,
         /** Optical channel signal type (fixed or flexible). */
-        OCH_SIGTYPE
+        OCH_SIGTYPE,
+
+        /**
+         * An empty criterion.
+         */
+        DUMMY
     }
 
     /**