Add methods for experimenter (de)serializer registration

 + update comments
 + remove unused imports

Change-Id: I87f432417a62cb5a58fe4e0103f9ee491e99017d
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdDeserializerKey.java
index 8f66900d4f1c71f70077e4a7dc1f1a781139a6f7..ec2cf3e1c8322ed5402937894441b91170b75414 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdDeserializerKey.java
@@ -13,10 +13,8 @@ import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 /**
  * @author michal.polkorab
- *
  */
-public class ExperimenterIdDeserializerKey extends MessageCodeKey
-        implements ExperimenterDeserializerKey {
+public class ExperimenterIdDeserializerKey extends MessageCodeKey implements ExperimenterDeserializerKey {
 
     private long experimenterId;
 
@@ -26,8 +24,8 @@ public class ExperimenterIdDeserializerKey extends MessageCodeKey
      * @param experimenterId experimenter / vendor ID
      * @param objectClass class of created object
      */
-    public <E extends DataContainer> ExperimenterIdDeserializerKey(short version,
-                                                                   long experimenterId, Class<E> objectClass) {
+    public <E extends DataContainer> ExperimenterIdDeserializerKey(final short version, final long experimenterId,
+                                                                   final Class<E> objectClass) {
         super(version, EncodeConstants.EXPERIMENTER_VALUE, objectClass);
         this.experimenterId = experimenterId;
     }

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java
index cb88b1ad255fe0a61dfbe6a3352072bdae13311a..c956feb06c1d355db06c191fc48adb1c381b47d5 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/ExperimenterIdTypeDeserializerKey.java
@@ -18,14 +18,15 @@ public class ExperimenterIdTypeDeserializerKey extends ExperimenterIdDeserialize
     private long type;
 
     /**
-     * @param msgVersion     protocol wire version
+     * @param <T>            type of target experimenter object
+     * @param version        protocol wire version
      * @param experimenterId experimenter / vendor ID
      * @param type           data type according to vendor implementation
      * @param objectClass    class of object to be serialized
      */
-    public <T extends DataContainer> ExperimenterIdTypeDeserializerKey(short msgVersion,
-                                                                       long experimenterId, long type, Class<T> objectClass) {
-        super(msgVersion, experimenterId, objectClass);
+    public <T extends DataContainer> ExperimenterIdTypeDeserializerKey(final short version, final long experimenterId,
+                                                                       final long type, Class<T> objectClass) {
+        super(version, experimenterId, objectClass);
         this.type = type;
     }
 

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java
index 10ec3f06d792addb7c10bbc88a68488babe7b023..33fc1ac138da9fb80653b5a2be812e080d8dc384 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/AdditionalMessageDeserializerInitializer.java
@@ -60,51 +60,50 @@ public class AdditionalMessageDeserializerInitializer {
      * Registers additional message deserializers.
      * @param registry registry to be filled with deserializers
      */
-    public static void registerMessageDeserializers(DeserializerRegistry registry) {
-
-        SimpleDeserializerRegistryHelper helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID,
-                registry);
+    public static void registerMessageDeserializers(final DeserializerRegistry registry) {
+        SimpleDeserializerRegistryHelper helper;
 
         // register OF v1.0 message deserializers
-        helper.registerDeserializer(5, null, GetFeaturesInput.class, new OF10FeaturesRequestMessageFactory());
-        helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
-        helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
-        helper.registerDeserializer(13, null, PacketOutInput.class, new OF10PacketOutInputMessageFactory());
-        helper.registerDeserializer(14, null, FlowModInput.class, new OF10FlowModInputMessageFactory());
-        helper.registerDeserializer(15, null, PortModInput.class, new OF10PortModInputMessageFactory());
-        helper.registerDeserializer(16, null, MultipartRequestInput.class, new OF10StatsRequestInputFactory());
-        helper.registerDeserializer(18, null, BarrierInput.class, new BarrierInputMessageFactory());
-        helper.registerDeserializer(20, null, GetQueueConfigInput.class, new OF10GetQueueConfigInputMessageFactory());
+        helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry);
+        helper.registerDeserializer(5, GetFeaturesInput.class, new OF10FeaturesRequestMessageFactory());
+        helper.registerDeserializer(7, GetConfigInput.class, new GetConfigInputMessageFactory());
+        helper.registerDeserializer(9, SetConfigInput.class, new SetConfigInputMessageFactory());
+        helper.registerDeserializer(13, PacketOutInput.class, new OF10PacketOutInputMessageFactory());
+        helper.registerDeserializer(14, FlowModInput.class, new OF10FlowModInputMessageFactory());
+        helper.registerDeserializer(15, PortModInput.class, new OF10PortModInputMessageFactory());
+        helper.registerDeserializer(16, MultipartRequestInput.class, new OF10StatsRequestInputFactory());
+        helper.registerDeserializer(18, BarrierInput.class, new BarrierInputMessageFactory());
+        helper.registerDeserializer(20, GetQueueConfigInput.class, new OF10GetQueueConfigInputMessageFactory());
 
         // register OF v1.3 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry);
-        helper.registerDeserializer(5, null, GetFeaturesInput.class, new GetFeaturesInputMessageFactory());
-        helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
-        helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
-        helper.registerDeserializer(13, null, PacketOutInput.class, new PacketOutInputMessageFactory());
-        helper.registerDeserializer(14, null, FlowModInput.class, new FlowModInputMessageFactory());
-        helper.registerDeserializer(15, null, GroupModInput.class, new GroupModInputMessageFactory());
-        helper.registerDeserializer(16, null, PortModInput.class, new PortModInputMessageFactory());
-        helper.registerDeserializer(17, null, TableModInput.class, new TableModInputMessageFactory());
-        helper.registerDeserializer(18, null, MultipartRequestInput.class, new MultipartRequestInputMessageFactory());
-        helper.registerDeserializer(20, null, BarrierInput.class, new BarrierInputMessageFactory());
-        helper.registerDeserializer(22, null, GetQueueConfigInput.class, new GetQueueConfigInputMessageFactory());
-        helper.registerDeserializer(24, null, RoleRequestInput.class, new RoleRequestInputMessageFactory());
-        helper.registerDeserializer(26, null, GetAsyncInput.class, new GetAsyncRequestMessageFactory());
-        helper.registerDeserializer(28, null, SetAsyncInput.class, new SetAsyncInputMessageFactory());
-        helper.registerDeserializer(29, null, MeterModInput.class, new MeterModInputMessageFactory());
+        helper.registerDeserializer(5, GetFeaturesInput.class, new GetFeaturesInputMessageFactory());
+        helper.registerDeserializer(7, GetConfigInput.class, new GetConfigInputMessageFactory());
+        helper.registerDeserializer(9, SetConfigInput.class, new SetConfigInputMessageFactory());
+        helper.registerDeserializer(13, PacketOutInput.class, new PacketOutInputMessageFactory());
+        helper.registerDeserializer(14, FlowModInput.class, new FlowModInputMessageFactory());
+        helper.registerDeserializer(15, GroupModInput.class, new GroupModInputMessageFactory());
+        helper.registerDeserializer(16, PortModInput.class, new PortModInputMessageFactory());
+        helper.registerDeserializer(17, TableModInput.class, new TableModInputMessageFactory());
+        helper.registerDeserializer(18, MultipartRequestInput.class, new MultipartRequestInputMessageFactory());
+        helper.registerDeserializer(20, BarrierInput.class, new BarrierInputMessageFactory());
+        helper.registerDeserializer(22, GetQueueConfigInput.class, new GetQueueConfigInputMessageFactory());
+        helper.registerDeserializer(24, RoleRequestInput.class, new RoleRequestInputMessageFactory());
+        helper.registerDeserializer(26, GetAsyncInput.class, new GetAsyncRequestMessageFactory());
+        helper.registerDeserializer(28, SetAsyncInput.class, new SetAsyncInputMessageFactory());
+        helper.registerDeserializer(29, MeterModInput.class, new MeterModInputMessageFactory());
 
         // register OF v1.4 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF14_VERSION_ID, registry);
-        helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
-        helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
-        helper.registerDeserializer(20, null, BarrierInput.class, new BarrierInputMessageFactory());
+        helper.registerDeserializer(7, GetConfigInput.class, new GetConfigInputMessageFactory());
+        helper.registerDeserializer(9, SetConfigInput.class, new SetConfigInputMessageFactory());
+        helper.registerDeserializer(20, BarrierInput.class, new BarrierInputMessageFactory());
 
         // register OF v1.5 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF15_VERSION_ID, registry);
-        helper.registerDeserializer(7, null, GetConfigInput.class, new GetConfigInputMessageFactory());
-        helper.registerDeserializer(9, null, SetConfigInput.class, new SetConfigInputMessageFactory());
-        helper.registerDeserializer(20, null, BarrierInput.class, new BarrierInputMessageFactory());
+        helper.registerDeserializer(7, GetConfigInput.class, new GetConfigInputMessageFactory());
+        helper.registerDeserializer(9, SetConfigInput.class, new SetConfigInputMessageFactory());
+        helper.registerDeserializer(20, BarrierInput.class, new BarrierInputMessageFactory());
     }
 
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java
index c20f63dfe513a7a6cf698e1246fe6eb06dd873e0..79873cc1b49a31329d6dc3ba906034981c29e459 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageDeserializerInitializer.java
@@ -69,52 +69,52 @@ public final class MessageDeserializerInitializer {
 
         // register OF v1.0 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry);
-        helper.registerDeserializer(0, null, HelloMessage.class, new OF10HelloMessageFactory());
-        helper.registerDeserializer(1, null, ErrorMessage.class, new OF10ErrorMessageFactory());
-        helper.registerDeserializer(2, null, EchoRequestMessage.class, new EchoRequestMessageFactory());
-        helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
-        helper.registerDeserializer(4, null, ExperimenterMessage.class, new VendorMessageFactory());
-        helper.registerDeserializer(6, null, GetFeaturesOutput.class, new OF10FeaturesReplyMessageFactory());
-        helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
-        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 BarrierReplyMessageFactory());
-        helper.registerDeserializer(21, null, GetQueueConfigOutput.class, new OF10QueueGetConfigReplyMessageFactory());
+        helper.registerDeserializer(0, HelloMessage.class, new OF10HelloMessageFactory());
+        helper.registerDeserializer(1, ErrorMessage.class, new OF10ErrorMessageFactory());
+        helper.registerDeserializer(2, EchoRequestMessage.class, new EchoRequestMessageFactory());
+        helper.registerDeserializer(3, EchoOutput.class, new EchoReplyMessageFactory());
+        helper.registerDeserializer(4, ExperimenterMessage.class, new VendorMessageFactory());
+        helper.registerDeserializer(6, GetFeaturesOutput.class, new OF10FeaturesReplyMessageFactory());
+        helper.registerDeserializer(8, GetConfigOutput.class, new GetConfigReplyMessageFactory());
+        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 BarrierReplyMessageFactory());
+        helper.registerDeserializer(21, GetQueueConfigOutput.class, new OF10QueueGetConfigReplyMessageFactory());
 
         // register OF v1.3 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF13_VERSION_ID, registry);
-        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(4, null, ExperimenterMessage.class, new ExperimenterMessageFactory());
-        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());
+        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(4, ExperimenterMessage.class, new ExperimenterMessageFactory());
+        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());
 
         // register OF v1.4 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF14_VERSION_ID, registry);
-        helper.registerDeserializer(0, null, HelloMessage.class, new HelloMessageFactory());
-        helper.registerDeserializer(2, null, EchoRequestMessage.class, new EchoRequestMessageFactory());
-        helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
-        helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
-        helper.registerDeserializer(21, null, BarrierOutput.class, new BarrierReplyMessageFactory());
+        helper.registerDeserializer(0, HelloMessage.class, new HelloMessageFactory());
+        helper.registerDeserializer(2, EchoRequestMessage.class, new EchoRequestMessageFactory());
+        helper.registerDeserializer(3, EchoOutput.class, new EchoReplyMessageFactory());
+        helper.registerDeserializer(8, GetConfigOutput.class, new GetConfigReplyMessageFactory());
+        helper.registerDeserializer(21, BarrierOutput.class, new BarrierReplyMessageFactory());
 
         // register OF v1.5 message deserializers
         helper = new SimpleDeserializerRegistryHelper(EncodeConstants.OF15_VERSION_ID, registry);
-        helper.registerDeserializer(0, null, HelloMessage.class, new HelloMessageFactory());
-        helper.registerDeserializer(2, null, EchoRequestMessage.class, new EchoRequestMessageFactory());
-        helper.registerDeserializer(3, null, EchoOutput.class, new EchoReplyMessageFactory());
-        helper.registerDeserializer(8, null, GetConfigOutput.class, new GetConfigReplyMessageFactory());
-        helper.registerDeserializer(21, null, BarrierOutput.class, new BarrierReplyMessageFactory());
+        helper.registerDeserializer(0, HelloMessage.class, new HelloMessageFactory());
+        helper.registerDeserializer(2, EchoRequestMessage.class, new EchoRequestMessageFactory());
+        helper.registerDeserializer(3, EchoOutput.class, new EchoReplyMessageFactory());
+        helper.registerDeserializer(8, GetConfigOutput.class, new GetConfigReplyMessageFactory());
+        helper.registerDeserializer(21, BarrierOutput.class, new BarrierReplyMessageFactory());
     }
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactory.java
index 6fecf66989c6b710e9a83dbbf822b54257c0d0be..84bb66fabae3be342556de859248d74576ae8ced 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigInputMessageFactory.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.VersionAssignableFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigInputBuilder;

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactory.java
index 98fc2c99b9edbbf8248e1e9392de616ae5fb2cfd..c8c8071cda613e4ea5bcff079f329fc33ce44e6a 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactory.java
@@ -9,9 +9,7 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
-
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.VersionAssignableFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.SwitchConfigFlag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetConfigOutput;

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactory.java
index 52e80b71df6e308d2a688bd34b51eb5100992076..5dc4c9b50717d5c32da225efa44281c27971e57a 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/SetConfigInputMessageFactory.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.VersionAssignableFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.SwitchConfigFlag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInput;

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java
index a150de89bb118a64c655f33ab7f4b5a71de597cc..23551bb7530ba438c199b2e214b270758ef7991e 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/MessageFactoryInitializer.java
@@ -58,8 +58,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.TableModInput;
 
 /**
+ * Util class for init registration of serializers.
  * @author michal.polkorab
- *
  */
 public final class MessageFactoryInitializer {
 
@@ -68,15 +68,14 @@ public final class MessageFactoryInitializer {
     }
 
     /**
-     * Registers message serializers into provided registry
-     *
-     * @param serializerRegistry
-     *            registry to be initialized with message serializers
+     * Registers message serializers into provided registry.
+     * @param serializerRegistry registry to be initialized with message serializers
      */
     public static void registerMessageSerializers(SerializerRegistry serializerRegistry) {
+        CommonMessageRegistryHelper registryHelper;
+
         // register OF v1.0 message serializers
-        short version = EncodeConstants.OF10_VERSION_ID;
-        CommonMessageRegistryHelper registryHelper = new CommonMessageRegistryHelper(version, serializerRegistry);
+        registryHelper = new CommonMessageRegistryHelper(EncodeConstants.OF10_VERSION_ID, serializerRegistry);
         registryHelper.registerSerializer(BarrierInput.class, new OF10BarrierInputMessageFactory());
         registryHelper.registerSerializer(EchoInput.class, new EchoInputMessageFactory());
         registryHelper.registerSerializer(EchoReplyInput.class, new EchoReplyInputMessageFactory());
@@ -92,8 +91,7 @@ public final class MessageFactoryInitializer {
         registryHelper.registerSerializer(SetConfigInput.class, new SetConfigMessageFactory());
 
         // register OF v1.3 message serializers
-        version = EncodeConstants.OF13_VERSION_ID;
-        registryHelper = new CommonMessageRegistryHelper(version, serializerRegistry);
+        registryHelper = new CommonMessageRegistryHelper(EncodeConstants.OF13_VERSION_ID, serializerRegistry);
         registryHelper.registerSerializer(BarrierInput.class, new BarrierInputMessageFactory());
         registryHelper.registerSerializer(EchoInput.class, new EchoInputMessageFactory());
         registryHelper.registerSerializer(EchoReplyInput.class, new EchoReplyInputMessageFactory());

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
index 2287a64abf2534cc69c9e7067266b796bf63e371..d4f7ab54e8338a4ba1db657f6c0bac1b03d1a827 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
@@ -64,7 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties;
 
 /**
- * Translates MultipartRequest messages
+ * Translates MultipartRequest messages.
  * @author timotej.kubas
  * @author michal.polkorab
  */
@@ -160,50 +160,26 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
         return ByteBufUtils.fillBitMask(0, flags.isOFPMPFREQMORE());
     }
 
-    /**
-     * @param multipartRequestBody
-     * @param output
-     */
     private void serializeDescBody() {
         // The body of MultiPartRequestDesc is empty
     }
 
-    /**
-     * @param multipartRequestBody
-     * @param out
-     */
     private void serializeTableBody() {
      // The body of MultiPartTable is empty
     }
 
-    /**
-     * @param multipartRequestBody
-     * @param out
-     */
     private void serializeGroupDescBody() {
      // The body of MultiPartRequestGroupDesc is empty
     }
 
-    /**
-     * @param multipartRequestBody
-     * @param out
-     */
     private void serializeGroupFeaturesBody() {
      // The body of MultiPartRequestGroupFeatures is empty
     }
 
-    /**
-     * @param multipartRequestBody
-     * @param out
-     */
     private void serializeMeterFeaturesBody() {
      // The body of MultiPartMeterFeatures is empty
     }
 
-    /**
-     * @param multipartRequestBody
-     * @param out
-     */
     private void serializePortDescBody() {
      // The body of MultiPartPortDesc is empty
     }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java
index b19b47e4178a72b45f4497d0eb67fee5865f7257..260d1b3f36df99ce1d935d9518e51dc2627bda88 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/CommonMessageRegistryHelper.java
@@ -10,10 +10,11 @@ package org.opendaylight.openflowjava.protocol.impl.util;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
+import org.opendaylight.openflowjava.util.ExperimenterSerializerKeyFactory;
 
 /**
+ * Helper class for serializer registration.
  * @author michal.polkorab
- *
  */
 public class CommonMessageRegistryHelper {
 
@@ -21,8 +22,8 @@ public class CommonMessageRegistryHelper {
     private SerializerRegistry serializerRegistry;
 
     /**
-     * @param version
-     * @param serializerRegistry
+     * @param version wire protocol version
+     * @param serializerRegistry registry to be filled with message serializers
      */
     public CommonMessageRegistryHelper(short version, SerializerRegistry serializerRegistry) {
         this.version = version;
@@ -30,10 +31,23 @@ public class CommonMessageRegistryHelper {
     }
 
     /**
-     * @param msgType
-     * @param serializer
+     * Registers serializer in registry.
+     * @param msgType class of object that will be serialized by given serializer
+     * @param serializer serializer instance
      */
     public void registerSerializer(Class<?> msgType, OFGeneralSerializer serializer) {
         serializerRegistry.registerSerializer(new MessageTypeKey<>(version, msgType), serializer);
     }
+
+    /**
+     * Registers experimenter serializer in registry.
+     * @param experimenterId experimenterID of experimenter message
+     * @param type type of experimenter message
+     * @param serializer serializer instance
+     */
+    public void registerExperimenterSerializer(final long experimenterId, final long type,
+                                               final OFGeneralSerializer serializer) {
+        serializerRegistry.registerSerializer(ExperimenterSerializerKeyFactory
+                .createExperimenterMessageSerializerKey(version, experimenterId, type), serializer);
+    }
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java
index 9e2fc83bbbcf517e628819ebb67da55c2c4877b9..25b29d1dcfa7365c93ae7dd5c338aab5f50c97e9 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/SimpleDeserializerRegistryHelper.java
@@ -10,9 +10,10 @@ package org.opendaylight.openflowjava.protocol.impl.util;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralDeserializer;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageCodeKey;
+import org.opendaylight.openflowjava.util.ExperimenterDeserializerKeyFactory;
 
 /**
- * Helper class for deserializer registration assigning particular version if necessary.
+ * Helper class for deserializer registration.
  * @author michal.polkorab
  */
 public class SimpleDeserializerRegistryHelper {
@@ -32,11 +33,10 @@ public class SimpleDeserializerRegistryHelper {
     /**
      * Register deserializer in registry. If deserializer supports more protocol versions assign actual one.
      * @param code code / value to distinguish between deserializers
-     * @param experimenterID TODO
      * @param deserializedObjectClass class of object that will be deserialized by given deserializer
      * @param deserializer deserializer instance
      */
-    public void registerDeserializer(final int code, final Long experimenterID, final Class<?> deserializedObjectClass,
+    public void registerDeserializer(final int code, final Class<?> deserializedObjectClass,
                                      final OFGeneralDeserializer deserializer) {
         registry.registerDeserializer(new MessageCodeKey(version, code, deserializedObjectClass), deserializer);
 
@@ -44,4 +44,17 @@ public class SimpleDeserializerRegistryHelper {
             ((VersionAssignableFactory) deserializer).assignVersion(version);
         }
     }
+
+    /**
+     * Register experimenter deserializer in registry.
+     * @param experimenterId experimenterID of experimenter message
+     * @param type type of experimenter message
+     * @param deserializer deserializer instance
+     */
+    public void registerExperimenterDeserializer (final long experimenterId, final long type,
+                                                  final OFGeneralDeserializer deserializer) {
+        registry.registerDeserializer(ExperimenterDeserializerKeyFactory
+                .createExperimenterMessageDeserializerKey(version, experimenterId, type), deserializer);
+    }
+
 }

diff --git a/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java b/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java
index 6c65deedb717f85fc788f4a285173485436b193f..bbb9ee871282bfdaf409cbfa8b94e74c23406a70 100644 (file)
--- a/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java
+++ b/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterDeserializerKeyFactory.java
@@ -18,7 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 
 /**
  * @author michal.polkorab
- *
  */
 public abstract class ExperimenterDeserializerKeyFactory {
 

diff --git a/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java b/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java
index 0155893d6625422cbfcc95258cc370ff93e8b434..613cd804aef4ef069b6b47478f19aeacf9c61a32 100755 (executable)
--- a/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java
+++ b/openflowjava-util/src/main/java/org/opendaylight/openflowjava/util/ExperimenterSerializerKeyFactory.java
@@ -18,7 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 
 /**
  * @author michal.polkorab
- *
  */
 public abstract class ExperimenterSerializerKeyFactory {