Bug 2756 - Match model update

[openflowjava.git] / openflow-protocol-api / src / main / java / org / opendaylight / openflowjava / protocol / api / keys / MatchEntrySerializerKey.java

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java
index fddc35c6e8390e8180921799f5ce151c73d74daa..a0867ceb1d3c055d40afc7b31c80c0538043ae03 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKey.java
@@ -8,22 +8,20 @@
 
 package org.opendaylight.openflowjava.protocol.api.keys;
 
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
-import org.opendaylight.openflowjava.protocol.api.keys.experimenter.ExperimenterSerializerKey;
-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.rev130731.oxm.fields.grouping.MatchEntries;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
 
 /**
  * @author michal.polkorab
- * @param <OXM_CLASS> oxm_class (see specification)
- * @param <OXM_FIELD> oxm_field (see specification)
+ * @param <C> oxm_class (see specification)
+ * @param <F> oxm_field (see specification)
  */
-public final class MatchEntrySerializerKey<OXM_CLASS extends OxmClassBase, OXM_FIELD extends MatchField>
-        extends MessageTypeKey<MatchEntries> implements ExperimenterSerializerKey {
+public final class MatchEntrySerializerKey<C extends OxmClassBase, F extends MatchField>
+        extends MessageTypeKey<MatchEntry> implements ExperimenterSerializerKey {
 
-    private Class<OXM_CLASS> oxmClass;
-    private Class<OXM_FIELD> oxmField;
+    private Class<C> oxmClass;
+    private Class<F> oxmField;
     private Long experimenterId;
 
     /**
@@ -32,9 +30,9 @@ public final class MatchEntrySerializerKey<OXM_CLASS extends OxmClassBase, OXM_F
      * @param oxmClass oxm_class (see specification)
      * @param oxmField oxm_field (see specification)
      */
-    public MatchEntrySerializerKey(short msgVersion, Class<OXM_CLASS> oxmClass,
-            Class<OXM_FIELD> oxmField) {
-        super(msgVersion, MatchEntries.class);
+    public MatchEntrySerializerKey(short msgVersion, Class<C> oxmClass,
+            Class<F> oxmField) {
+        super(msgVersion, MatchEntry.class);
         this.oxmClass = oxmClass;
         this.oxmField = oxmField;
     }