commit c44c0c3268bd9f6fd54e7b0fc0973c575dc7c76f
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Jun 01 11:40:48 2015 -0700
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Mon Jun 01 11:57:46 2015 -0700
tree dc7b1fa321fc6ae00e46dc8fd17ff14911b3da28
parent bcb0237f3bfd840677dc0d0df7d8918a8f2eef19

Fix cast error on execution of "flow -j" command

This resolves ONOS-2037.

Change-Id: Ie6bf0c7ca0644ae8029df72d3ea7084fa0297aca

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 0421e02..1670361 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
@@ -19,6 +19,7 @@
 
 import org.onosproject.codec.CodecContext;
 import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.OchSignal;
 import org.onosproject.net.flow.criteria.Criterion;
 import org.onosproject.net.flow.criteria.EthCriterion;
 import org.onosproject.net.flow.criteria.EthTypeCriterion;
@@ -34,9 +35,9 @@
 import org.onosproject.net.flow.criteria.IcmpTypeCriterion;
 import org.onosproject.net.flow.criteria.Icmpv6CodeCriterion;
 import org.onosproject.net.flow.criteria.Icmpv6TypeCriterion;
-import org.onosproject.net.flow.criteria.LambdaCriterion;
 import org.onosproject.net.flow.criteria.MetadataCriterion;
 import org.onosproject.net.flow.criteria.MplsCriterion;
+import org.onosproject.net.flow.criteria.OchSignalCriterion;
 import org.onosproject.net.flow.criteria.OchSignalTypeCriterion;
 import org.onosproject.net.flow.criteria.PortCriterion;
 import org.onosproject.net.flow.criteria.SctpPortCriterion;
@@ -325,9 +326,15 @@
     private static class FormatOchSigId implements CriterionTypeFormatter {
         @Override
         public ObjectNode encodeCriterion(ObjectNode root, Criterion criterion) {
-            final LambdaCriterion lambdaCriterion =
-                    (LambdaCriterion) criterion;
-            return root.put("lambda", lambdaCriterion.lambda());
+            OchSignal ochSignal = ((OchSignalCriterion) criterion).lambda();
+            ObjectNode child = root.putObject("ochSignalId");
+
+            child.put("gridType", ochSignal.gridType().name());
+            child.put("channelSpacing", ochSignal.channelSpacing().name());
+            child.put("spacingMultiplier", ochSignal.spacingMultiplier());
+            child.put("slotGranularity", ochSignal.slotGranularity());
+
+            return root;
         }
     }