Bug 1277 - Move ByteBuffUtils to separate bundle

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / SerializerRegistryImpl.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java
index d0ccbf066da4ff6319ca818c7c4720966a6b7b9f..4336015b941049912c9a813b3e6846b98a6ad689 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImpl.java
@@ -15,14 +15,10 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFGeneralSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistryInjector;
-import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;
-import org.opendaylight.openflowjava.protocol.impl.util.OF10ActionsSerializer;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.openflowjava.protocol.impl.util.InstructionsInitializer;
 import org.opendaylight.openflowjava.protocol.impl.util.OF10MatchSerializer;
-import org.opendaylight.openflowjava.protocol.impl.util.OF13ActionsSerializer;
-import org.opendaylight.openflowjava.protocol.impl.util.OF13InstructionsSerializer;
 import org.opendaylight.openflowjava.protocol.impl.util.OF13MatchSerializer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.v10.grouping.MatchV10;
 
@@ -44,16 +40,16 @@ public class SerializerRegistryImpl implements SerializerRegistry {
         // Openflow message type serializers
         MessageFactoryInitializer.registerMessageSerializers(this);
 
-        // common structure serializers
+        // match structure serializers
         registerSerializer(new MessageTypeKey<>(OF10, MatchV10.class), new OF10MatchSerializer());
         registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer());
-        registerSerializer(new MessageTypeKey<>(OF10, Action.class), new OF10ActionsSerializer());
-        registerSerializer(new MessageTypeKey<>(OF13, Action.class), new OF13ActionsSerializer());
-        registerSerializer(new MessageTypeKey<>(OF13, Instruction.class), new OF13InstructionsSerializer());
 
         // match entry serializers
         MatchEntriesInitializer.registerMatchEntrySerializers(this);
-        
+        // action serializers
+        ActionsInitializer.registerActionSerializers(this);
+        // instruction serializers
+        InstructionsInitializer.registerInstructionSerializers(this);
         // default vendor / experimenter serializers
         DefaultExperimenterInitializer.registerDefaultExperimenterSerializers(this);
     }