Extensibility fix - simplified too strict key limitation

 - MessageTypeKey in SwitchConnectionProvider#registerCustomSerializer was restricted to <E extends DataObject>, which does not allow for use of other objects (such as descendants of BaseIdentity)

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java
index cd864bd4a0da5b4a26d20e434e52bf67244366df..92d42626cfc99d14faf80bb1db772800c486442f 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java
@@ -130,7 +130,7 @@ public class SwitchConnectionProviderImpl implements SwitchConnectionProvider {
     }
 
     @Override
-    public <E extends DataObject> void registerCustomSerializer(MessageTypeKey<E> key,
+    public <KEY_TYPE, E extends DataObject> void registerCustomSerializer(MessageTypeKey<KEY_TYPE> key,
             OFSerializer<E> serializer) {
         serializerRegistry.registerSerializer(key, serializer);
     }

diff --git a/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java b/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java
index a61f10330c01a7adb3305409ee55918b336083a4..abcaabac7e40c2d5986db0543ee045181ab3d1cc 100644 (file)
--- a/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java
+++ b/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java
@@ -54,7 +54,7 @@ public interface SwitchConnectionProvider extends AutoCloseable {
      * @param key used for serializer lookup
      * @param serializer serializer implementation
      */
-    public  <E extends DataObject> void registerCustomSerializer(MessageTypeKey<E> key,
+    public  <KEY_TYPE, E extends DataObject> void registerCustomSerializer(MessageTypeKey<KEY_TYPE> key,
             OFSerializer<E> serializer);
             
     /**