Default experimenters moved to separate bundle + unit tests

[openflowjava.git] / openflow-protocol-ext / src / main / java / org / opendaylight / openflowjava / protocol / ext / deserialization / DefaultExperimenterDeserializerInitializer.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DefaultExperimenterDeserializerInitializer.java b/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/deserialization/DefaultExperimenterDeserializerInitializer.java
similarity index 55%
rename from openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DefaultExperimenterDeserializerInitializer.java
rename to openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/deserialization/DefaultExperimenterDeserializerInitializer.java
index 44115fad0574fc78f0e33c151bd6d3e78c3a03a2..9dde85e341a4f05a4cd764db6c246ac82408bb10 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DefaultExperimenterDeserializerInitializer.java
+++ b/openflow-protocol-ext/src/main/java/org/opendaylight/openflowjava/protocol/ext/deserialization/DefaultExperimenterDeserializerInitializer.java
@@ -6,13 +6,11 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html\r
  */\r
 \r
-package org.opendaylight.openflowjava.protocol.impl.deserialization;\r
+package org.opendaylight.openflowjava.protocol.ext.deserialization;\r
 \r
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;\r
 import org.opendaylight.openflowjava.protocol.api.extensibility.MessageCodeKey;\r
-import org.opendaylight.openflowjava.protocol.impl.deserialization.experimenters.ExperimenterActionDeserializer;\r
-import org.opendaylight.openflowjava.protocol.impl.deserialization.experimenters.OF13ExperimenterInstructionDeserializer;\r
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
+import org.opendaylight.openflowjava.protocol.ext.util.ExtConstants;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;\r
 \r
@@ -29,14 +27,14 @@ public class DefaultExperimenterDeserializerInitializer {
     public static void registerDeserializers(DeserializerRegistry registry) {\r
         // register OF v1.0 default experimenter deserializers\r
         // - default action deserializer\r
-        registry.registerDeserializer(new MessageCodeKey(EncodeConstants.OF10_VERSION_ID,\r
-                EncodeConstants.EXPERIMENTER_VALUE, Action.class), new ExperimenterActionDeserializer());\r
+        registry.registerDeserializer(new MessageCodeKey(ExtConstants.OF10_VERSION_ID,\r
+                ExtConstants.EXPERIMENTER_VALUE, Action.class), new OF13ExperimenterActionDeserializer());\r
         // register OF v1.3 default experimenter deserializers\r
         // - default action deserializer\r
-        registry.registerDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID,\r
-                EncodeConstants.EXPERIMENTER_VALUE, Action.class), new ExperimenterActionDeserializer());\r
+        registry.registerDeserializer(new MessageCodeKey(ExtConstants.OF13_VERSION_ID,\r
+                ExtConstants.EXPERIMENTER_VALUE, Action.class), new OF13ExperimenterActionDeserializer());\r
         // - default instruction deserializer\r
-        registry.registerDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID,\r
-                EncodeConstants.EXPERIMENTER_VALUE, Instruction.class), new OF13ExperimenterInstructionDeserializer());\r
+        registry.registerDeserializer(new MessageCodeKey(ExtConstants.OF13_VERSION_ID,\r
+                ExtConstants.EXPERIMENTER_VALUE, Instruction.class), new OF13ExperimenterInstructionDeserializer());\r
     }\r
 }\r