X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fserialization%2FSerializerRegistryImpl.java;h=26cdda1a0b3e80f4894230326c9b7d3e4d014110;hb=29a2a074c78708f6d18583779ece96bb6573f0c6;hp=529f5e0f7bbe24369a7619655ea5518a0e1eaf4b;hpb=7da7ba040e42239389cb6f29b743c9d04af33ea3;p=openflowjava.git

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 529f5e0f..26cdda1a 100644
--- 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
@@ -11,25 +11,28 @@ package org.opendaylight.openflowjava.protocol.impl.serialization;
 import java.util.HashMap;
 import java.util.Map;
 
-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.api.keys.MessageTypeKey;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.OF10MatchSerializer;
-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.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;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.v10.grouping.MatchV10;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * Stores and handles serializers
+ * Stores and handles serializers <br/>
+ * K - {@link MessageTypeKey} type <br/>
+ * S - returned serializer type
  * @author michal.polkorab
  * @author timotej.kubas
  */
 public class SerializerRegistryImpl implements SerializerRegistry {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(SerializerRegistryImpl.class);
     private static final short OF10 = EncodeConstants.OF10_VERSION_ID;
     private static final short OF13 = EncodeConstants.OF13_VERSION_ID;
     private Map<MessageTypeKey<?>, OFGeneralSerializer> registry;
@@ -41,18 +44,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<>(OF13, Instruction.class), new OF13InstructionsSerializer());
 
         // match entry serializers
         MatchEntriesInitializer.registerMatchEntrySerializers(this);
         // action serializers
         ActionsInitializer.registerActionSerializers(this);
-        
-        // default vendor / experimenter serializers
-        DefaultExperimenterInitializer.registerDefaultExperimenterSerializers(this);
+        // instruction serializers
+        InstructionsInitializer.registerInstructionSerializers(this);
     }
 
     /**
@@ -61,25 +62,43 @@ public class SerializerRegistryImpl implements SerializerRegistry {
      */
     @Override
     @SuppressWarnings("unchecked")
-    public <KEY_TYPE, SERIALIZER_TYPE extends OFGeneralSerializer> SERIALIZER_TYPE getSerializer(
-            MessageTypeKey<KEY_TYPE> msgTypeKey) {
+    public <K, S extends OFGeneralSerializer> S getSerializer(
+            MessageTypeKey<K> msgTypeKey) {
         OFGeneralSerializer serializer = registry.get(msgTypeKey);
         if (serializer == null) {
-            throw new NullPointerException("Serializer for key: " + msgTypeKey.toString()
-                    + " was not found");
+            throw new IllegalStateException("Serializer for key: " + msgTypeKey
+                    + " was not found - please verify that you are using correct message"
+                    + " combination (e.g. OF v1.0 message to OF v1.0 device)");
         }
-        return (SERIALIZER_TYPE) serializer;
+        return (S) serializer;
     }
 
     @Override
-    public <KEY_TYPE> void registerSerializer(
-            MessageTypeKey<KEY_TYPE> msgTypeKey, OFGeneralSerializer serializer) {
+    public <K> void registerSerializer(
+            MessageTypeKey<K> msgTypeKey, OFGeneralSerializer serializer) {
         if ((msgTypeKey == null) || (serializer == null)) {
-            throw new NullPointerException("MessageTypeKey or Serializer is null");
+            throw new IllegalArgumentException("MessageTypeKey or Serializer is null");
+        }
+        OFGeneralSerializer serInRegistry = registry.put(msgTypeKey, serializer);
+        if (serInRegistry != null) {
+            LOGGER.debug("Serializer for key " + msgTypeKey + " overwritten. Old serializer: "
+                    + serInRegistry.getClass().getName() + ", new serializer: "
+                    + serializer.getClass().getName() );
         }
         if (serializer instanceof SerializerRegistryInjector) {
             ((SerializerRegistryInjector) serializer).injectSerializerRegistry(this);
         }
-        registry.put(msgTypeKey, serializer);
+    }
+
+    @Override
+    public <K> boolean unregisterSerializer(MessageTypeKey<K> msgTypeKey) {
+        if (msgTypeKey == null) {
+            throw new IllegalArgumentException("MessageTypeKey is null");
+        }
+        OFGeneralSerializer serializer = registry.remove(msgTypeKey);
+        if (serializer == null) {
+            return false;
+        }
+        return true;
     }
 }