Bug 2756 - Match model update

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / util / MatchEntrySerializerRegistryHelper.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java
index e3f49e30661eb0e4be07420b660baca06810cd7a..1c704bb2432235e102343b8c71bb8bd61df2115a 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java
@@ -10,17 +10,17 @@ 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.MatchEntrySerializerKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.MatchField;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OxmClassBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase;
 
 /**
  * @author michal.polkorab
- * @param <OXM_CLASS> OXM class
+ * @param <C> OXM class
  */
-public class MatchEntrySerializerRegistryHelper<OXM_CLASS extends OxmClassBase> {
+public class MatchEntrySerializerRegistryHelper<C extends OxmClassBase> {
 
     private short version;
-    private Class<OXM_CLASS> generalClass;
+    private Class<C> generalClass;
     private SerializerRegistry serializerRegistry;
 
     /**
@@ -28,7 +28,7 @@ public class MatchEntrySerializerRegistryHelper<OXM_CLASS extends OxmClassBase>
      * @param generalClass
      * @param serializerRegistry
      */
-    public MatchEntrySerializerRegistryHelper(short version, Class<OXM_CLASS> generalClass,
+    public MatchEntrySerializerRegistryHelper(short version, Class<C> generalClass,
             SerializerRegistry serializerRegistry) {
         this.version = version;
         this.generalClass = generalClass;
@@ -37,11 +37,11 @@ public class MatchEntrySerializerRegistryHelper<OXM_CLASS extends OxmClassBase>
 
     /**
      * Registers given serializer
-     * @param specificClass 
-     * @param serializer 
+     * @param specificClass
+     * @param serializer
      */
-    public <OXM_FIELD extends MatchField> void registerSerializer(
-            Class<OXM_FIELD> specificClass, OFGeneralSerializer serializer) {
+    public <F extends MatchField> void registerSerializer(
+            Class<F> specificClass, OFGeneralSerializer serializer) {
         MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(version, generalClass, specificClass);
         key.setExperimenterId(null);
         serializerRegistry.registerSerializer(key, serializer);