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/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
index 0be03d8..57cff66 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/CriterionCodec.java
@@ -74,6 +74,7 @@
         formatMap.put(Criterion.Type.IPV6_EXTHDR, new FormatIpV6Exthdr());
         formatMap.put(Criterion.Type.OCH_SIGID, new FormatOchSigId());
         formatMap.put(Criterion.Type.OCH_SIGTYPE, new FormatOchSigType());
+        formatMap.put(Criterion.Type.DUMMY, new FormatDummyType());
 
         // Currently unimplemented
         formatMap.put(Criterion.Type.ARP_OP, new FormatUnknown());
@@ -316,6 +317,17 @@
         }
     }
 
+    private class FormatDummyType implements CriterionTypeFormatter {
+
+        @Override
+        public ObjectNode formatCriterion(ObjectNode root, Criterion criterion) {
+            checkNotNull(criterion, "Criterion cannot be null");
+
+            return root.put("type", criterion.type().toString());
+
+        }
+    }
+
     @Override
     public ObjectNode encode(Criterion criterion, CodecContext context) {
         checkNotNull(criterion, "Criterion cannot be null");
@@ -331,4 +343,6 @@
 
         return formatter.formatCriterion(result, criterion);
     }
+
+
 }