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.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.OF13MatchSerializer;
-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
*/
*/
@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 IllegalArgumentException("Serializer for key: {}" + msgTypeKey.toString()
+ 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 IllegalArgumentException("MessageTypeKey or Serializer is null");
}
OFGeneralSerializer serInRegistry = registry.put(msgTypeKey, serializer);
if (serInRegistry != null) {
- LOGGER.warn("Serializer for key " + msgTypeKey + " overwritten. Old serializer: "
+ LOGGER.debug("Serializer for key " + msgTypeKey + " overwritten. Old serializer: "
+ serInRegistry.getClass().getName() + ", new serializer: "
+ serializer.getClass().getName() );
}
}
@Override
- public <KEY_TYPE> boolean unregisterSerializer(MessageTypeKey<KEY_TYPE> msgTypeKey) {
+ public <K> boolean unregisterSerializer(MessageTypeKey<K> msgTypeKey) {
if (msgTypeKey == null) {
throw new IllegalArgumentException("MessageTypeKey is null");
}