Updated extension registration keys

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / deserialization / ActionDeserializerInitializer.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java
index 7c1d110b00c86fa74c148c03cd7c0fb698067747..e641ee93518fe82124f85553518d6d5cbc8b8dce 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java
@@ -9,6 +9,7 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization;\r
 \r
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;\r
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.openflowjava.protocol.impl.deserialization.action.OF10EnqueueActionDeserializer;\r
 import org.opendaylight.openflowjava.protocol.impl.deserialization.action.OF10OutputActionDeserializer;\r
 import org.opendaylight.openflowjava.protocol.impl.deserialization.action.OF10SetDlDstActionDeserializer;\r
@@ -37,9 +38,7 @@ import org.opendaylight.openflowjava.protocol.impl.deserialization.action.OF13Se
 import org.opendaylight.openflowjava.protocol.impl.deserialization.action.OF13SetMplsTtlActionDeserializer;\r
 import org.opendaylight.openflowjava.protocol.impl.deserialization.action.OF13SetNwTtlActionDeserializer;\r
 import org.opendaylight.openflowjava.protocol.impl.deserialization.action.OF13SetQueueActionDeserializer;\r
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
-import org.opendaylight.openflowjava.protocol.impl.util.SimpleDeserializerRegistryHelper;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;\r
+import org.opendaylight.openflowjava.protocol.impl.util.ActionDeserializerRegistryHelper;\r
 \r
 /**\r
  * @author michal.polkorab\r
@@ -53,37 +52,37 @@ public class ActionDeserializerInitializer {
      */\r
     public static void registerDeserializers(DeserializerRegistry registry) {\r
         // register OF v1.0 action deserializers\r
-        SimpleDeserializerRegistryHelper helper =\r
-                new SimpleDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry);\r
-        helper.registerDeserializer(0, Action.class, new OF10OutputActionDeserializer());\r
-        helper.registerDeserializer(1, Action.class, new OF10SetVlanVidActionDeserializer());\r
-        helper.registerDeserializer(2, Action.class, new OF10SetVlanPcpActionDeserializer());\r
-        helper.registerDeserializer(3, Action.class, new OF10StripVlanActionDeserializer());\r
-        helper.registerDeserializer(4, Action.class, new OF10SetDlSrcActionDeserializer());\r
-        helper.registerDeserializer(5, Action.class, new OF10SetDlDstActionDeserializer());\r
-        helper.registerDeserializer(6, Action.class, new OF10SetNwSrcActionDeserializer());\r
-        helper.registerDeserializer(7, Action.class, new OF10SetNwDstActionDeserializer());\r
-        helper.registerDeserializer(8, Action.class, new OF10SetNwTosActionDeserializer());\r
-        helper.registerDeserializer(9, Action.class, new OF10SetTpSrcActionDeserializer());\r
-        helper.registerDeserializer(10, Action.class, new OF10SetTpDstActionDeserializer());\r
-        helper.registerDeserializer(11, Action.class, new OF10EnqueueActionDeserializer());\r
+        ActionDeserializerRegistryHelper helper = \r
+                new ActionDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry);\r
+        helper.registerDeserializer(0, new OF10OutputActionDeserializer());\r
+        helper.registerDeserializer(1, new OF10SetVlanVidActionDeserializer());\r
+        helper.registerDeserializer(2, new OF10SetVlanPcpActionDeserializer());\r
+        helper.registerDeserializer(3, new OF10StripVlanActionDeserializer());\r
+        helper.registerDeserializer(4, new OF10SetDlSrcActionDeserializer());\r
+        helper.registerDeserializer(5, new OF10SetDlDstActionDeserializer());\r
+        helper.registerDeserializer(6, new OF10SetNwSrcActionDeserializer());\r
+        helper.registerDeserializer(7, new OF10SetNwDstActionDeserializer());\r
+        helper.registerDeserializer(8, new OF10SetNwTosActionDeserializer());\r
+        helper.registerDeserializer(9, new OF10SetTpSrcActionDeserializer());\r
+        helper.registerDeserializer(10, new OF10SetTpDstActionDeserializer());\r
+        helper.registerDeserializer(11, new OF10EnqueueActionDeserializer());\r
         // register OF v1.3 action deserializers\r
-        helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry);\r
-        helper.registerDeserializer(0, Action.class, new OF13OutputActionDeserializer());\r
-        helper.registerDeserializer(11, Action.class, new OF13CopyTtlOutActionDeserializer());\r
-        helper.registerDeserializer(12, Action.class, new OF13CopyTtlInActionDeserializer());\r
-        helper.registerDeserializer(15, Action.class, new OF13SetMplsTtlActionDeserializer());\r
-        helper.registerDeserializer(16, Action.class, new OF13DecMplsTtlActionDeserializer());\r
-        helper.registerDeserializer(17, Action.class, new OF13PushVlanActionDeserializer());\r
-        helper.registerDeserializer(18, Action.class, new OF13PopVlanActionDeserializer());\r
-        helper.registerDeserializer(19, Action.class, new OF13PushMplsActionDeserializer());\r
-        helper.registerDeserializer(20, Action.class, new OF13PopMplsActionDeserializer());\r
-        helper.registerDeserializer(21, Action.class, new OF13SetQueueActionDeserializer());\r
-        helper.registerDeserializer(22, Action.class, new OF13GroupActionDeserializer());\r
-        helper.registerDeserializer(23, Action.class, new OF13SetNwTtlActionDeserializer());\r
-        helper.registerDeserializer(24, Action.class, new OF13DecNwTtlActionDeserializer());\r
-        helper.registerDeserializer(25, Action.class, new OF13SetFieldActionDeserializer());\r
-        helper.registerDeserializer(26, Action.class, new OF13PushPbbActionDeserializer());\r
-        helper.registerDeserializer(27, Action.class, new OF13PopPbbActionDeserializer());\r
+        helper = new ActionDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry);\r
+        helper.registerDeserializer(0, new OF13OutputActionDeserializer());\r
+        helper.registerDeserializer(11, new OF13CopyTtlOutActionDeserializer());\r
+        helper.registerDeserializer(12, new OF13CopyTtlInActionDeserializer());\r
+        helper.registerDeserializer(15, new OF13SetMplsTtlActionDeserializer());\r
+        helper.registerDeserializer(16, new OF13DecMplsTtlActionDeserializer());\r
+        helper.registerDeserializer(17, new OF13PushVlanActionDeserializer());\r
+        helper.registerDeserializer(18, new OF13PopVlanActionDeserializer());\r
+        helper.registerDeserializer(19, new OF13PushMplsActionDeserializer());\r
+        helper.registerDeserializer(20, new OF13PopMplsActionDeserializer());\r
+        helper.registerDeserializer(21, new OF13SetQueueActionDeserializer());\r
+        helper.registerDeserializer(22, new OF13GroupActionDeserializer());\r
+        helper.registerDeserializer(23, new OF13SetNwTtlActionDeserializer());\r
+        helper.registerDeserializer(24, new OF13DecNwTtlActionDeserializer());\r
+        helper.registerDeserializer(25, new OF13SetFieldActionDeserializer());\r
+        helper.registerDeserializer(26, new OF13PushPbbActionDeserializer());\r
+        helper.registerDeserializer(27, new OF13PopPbbActionDeserializer());\r
     }\r
-}\r
+}
\ No newline at end of file