X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2FMessageDerializerInitializer.java;h=e45da36f9fb7aec34b3b88b9c0a48e5be7645d80;hb=60ad94454217d7d1f6f9e65f39f72ae111ecc845;hp=29ef0f568936321558f0c14f4e2edcae42442476;hpb=1f371ed220f3e70445ed305d45a722dd6a32ded0;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDerializerInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDerializerInitializer.java
index 29ef0f56..e45da36f 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDerializerInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDerializerInitializer.java
@@ -34,7 +34,7 @@ import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.Pac
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.PortStatusMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.QueueGetConfigReplyMessageFactory;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.RoleReplyMessageFactory;
-import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.SimpleDeserializerRegistryHelper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutput;
@@ -65,33 +65,33 @@ public class MessageDerializerInitializer {
         // register OF v1.0 message deserializers
         SimpleDeserializerRegistryHelper helper =
                 new SimpleDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry);
-        helper.registerDeserializer(0, HelloMessage.class, new OF10HelloMessageFactory());
-        helper.registerDeserializer(1, ErrorMessage.class, new OF10ErrorMessageFactory());
-        helper.registerDeserializer(2, EchoRequestMessage.class, new OF10EchoRequestMessageFactory());
-        helper.registerDeserializer(3, EchoOutput.class, new OF10EchoReplyMessageFactory());
-        helper.registerDeserializer(6, GetFeaturesOutput.class, new OF10FeaturesReplyMessageFactory());
-        helper.registerDeserializer(8, GetConfigOutput.class, new OF10GetConfigReplyMessageFactory());
-        helper.registerDeserializer(10, PacketInMessage.class, new OF10PacketInMessageFactory());
-        helper.registerDeserializer(11, FlowRemovedMessage.class, new OF10FlowRemovedMessageFactory());
-        helper.registerDeserializer(12, PortStatusMessage.class, new OF10PortStatusMessageFactory());
-        helper.registerDeserializer(17, MultipartReplyMessage.class, new OF10StatsReplyMessageFactory());
-        helper.registerDeserializer(19, BarrierOutput.class, new OF10BarrierReplyMessageFactory());
-        helper.registerDeserializer(21, GetQueueConfigOutput.class, new OF10QueueGetConfigReplyMessageFactory());
+        helper.registerDeserializer(0, null, HelloMessage.class, new OF10HelloMessageFactory());
+        helper.registerDeserializer(1, null, ErrorMessage.class, new OF10ErrorMessageFactory());
+        helper.registerDeserializer(2, null, EchoRequestMessage.class, new OF10EchoRequestMessageFactory());
+        helper.registerDeserializer(3, null, EchoOutput.class, new OF10EchoReplyMessageFactory());
+        helper.registerDeserializer(6, null, GetFeaturesOutput.class, new OF10FeaturesReplyMessageFactory());
+        helper.registerDeserializer(8, null, GetConfigOutput.class, new OF10GetConfigReplyMessageFactory());
+        helper.registerDeserializer(10, null, PacketInMessage.class, new OF10PacketInMessageFactory());
+        helper.registerDeserializer(11, null, FlowRemovedMessage.class, new OF10FlowRemovedMessageFactory());
+        helper.registerDeserializer(12, null, PortStatusMessage.class, new OF10PortStatusMessageFactory());
+        helper.registerDeserializer(17, null, MultipartReplyMessage.class, new OF10StatsReplyMessageFactory());
+        helper.registerDeserializer(19, null, BarrierOutput.class, new OF10BarrierReplyMessageFactory());
+        helper.registerDeserializer(21, null, GetQueueConfigOutput.class, new OF10QueueGetConfigReplyMessageFactory());
         // register Of v1.3 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry);
-        helper.registerDeserializer(0, HelloMessage.class, new HelloMessageFactory());
-        helper.registerDeserializer(1, ErrorMessage.class, new ErrorMessageFactory());
-        helper.registerDeserializer(2, EchoRequestMessage.class, new EchoRequestMessageFactory());
-        helper.registerDeserializer(3, EchoOutput.class, new EchoReplyMessageFactory());
-        helper.registerDeserializer(6, GetFeaturesOutput.class, new FeaturesReplyMessageFactory());
-        helper.registerDeserializer(8, GetConfigOutput.class, new GetConfigReplyMessageFactory());
-        helper.registerDeserializer(10, PacketInMessage.class, new PacketInMessageFactory());
-        helper.registerDeserializer(11, FlowRemovedMessage.class, new FlowRemovedMessageFactory());
-        helper.registerDeserializer(12, PortStatusMessage.class, new PortStatusMessageFactory());
-        helper.registerDeserializer(19, MultipartReplyMessage.class, new MultipartReplyMessageFactory());
-        helper.registerDeserializer(21, BarrierOutput.class, new BarrierReplyMessageFactory());
-        helper.registerDeserializer(23, GetQueueConfigOutput.class, new QueueGetConfigReplyMessageFactory());
-        helper.registerDeserializer(25, RoleRequestOutput.class, new RoleReplyMessageFactory());
-        helper.registerDeserializer(27, GetAsyncOutput.class, new GetAsyncReplyMessageFactory());
+        helper.registerDeserializer(0, null, HelloMessage.class, new HelloMessageFactory());
+        helper.registerDeserializer(1, null, ErrorMessage.class, new ErrorMessageFactory());
+        helper.registerDeserializer(2, null, EchoRequestMessage.class, new EchoRequestMessageFactory());
+        helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
+        helper.registerDeserializer(6, null, GetFeaturesOutput.class, new FeaturesReplyMessageFactory());
+        helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
+        helper.registerDeserializer(10, null, PacketInMessage.class, new PacketInMessageFactory());
+        helper.registerDeserializer(11, null, FlowRemovedMessage.class, new FlowRemovedMessageFactory());
+        helper.registerDeserializer(12, null, PortStatusMessage.class, new PortStatusMessageFactory());
+        helper.registerDeserializer(19, null, MultipartReplyMessage.class, new MultipartReplyMessageFactory());
+        helper.registerDeserializer(21, null, BarrierOutput.class, new BarrierReplyMessageFactory());
+        helper.registerDeserializer(23, null, GetQueueConfigOutput.class, new QueueGetConfigReplyMessageFactory());
+        helper.registerDeserializer(25, null, RoleRequestOutput.class, new RoleReplyMessageFactory());
+        helper.registerDeserializer(27, null, GetAsyncOutput.class, new GetAsyncReplyMessageFactory());
     }
 }