Bump upstreams for 2022.09 Chlorine

[openflowplugin.git] / extension / openflowplugin-extension-nicira / src / main / java / org / opendaylight / openflowplugin / extension / vendor / nicira / convertor / match / RegConvertor.java

diff --git a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java
index 07e19202b747af63fe01a3f457c65b2a23ba6ca3..42bb027d1ea4e2592ef0a63133d4fd842dab3c51 100644 (file)
--- a/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java
+++ b/extension/openflowplugin-extension-nicira/src/main/java/org/opendaylight/openflowplugin/extension/vendor/nicira/convertor/match/RegConvertor.java
@@ -17,9 +17,9 @@ import org.opendaylight.openflowplugin.extension.vendor.nicira.convertor.CodecPr
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValue;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.RegCaseValueBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.reg.grouping.RegValuesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.RegCaseValueBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.ExtensionKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.grouping.Extension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.match.rev140714.NxAugMatchNodesNodeTableFlow;
@@ -58,22 +58,22 @@ public class RegConvertor implements ConvertorToOFJava<MatchEntry>, ConvertorFro
 
     @SuppressWarnings("unchecked")
     @Override
-    public ExtensionAugment<? extends Augmentation<Extension>> convert(MatchEntry input, MatchPath path) {
+    public ExtensionAugment<? extends Augmentation<Extension>> convert(final MatchEntry input, final MatchPath path) {
         NxmNxRegBuilder nxRegBuilder = new NxmNxRegBuilder();
-        if (!org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg.class
-                .isAssignableFrom(input.getOxmMatchField())) {
+        if (!(input.getOxmMatchField()
+            instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg)) {
             String msg = input.getOxmMatchField()
                     + " does not implement "
                     + org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg.class;
             LOG.warn("Warning {}",msg);
             throw new IllegalStateException(msg);
         }
-        nxRegBuilder.setReg((Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match
-                .rev140421.NxmNxReg>) input.getOxmMatchField());
+        nxRegBuilder.setReg((org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg)
+            input.getOxmMatchField());
         RegCaseValue regCaseValue = (RegCaseValue) input.getMatchEntryValue();
         nxRegBuilder.setValue(regCaseValue.getRegValues().getValue());
 
-        if (input.isHasMask()) {
+        if (input.getHasMask()) {
             nxRegBuilder.setMask(regCaseValue.getRegValues().getMask());
         }
 
@@ -81,7 +81,7 @@ public class RegConvertor implements ConvertorToOFJava<MatchEntry>, ConvertorFro
     }
 
     @Override
-    public MatchEntry convert(Extension extension) {
+    public MatchEntry convert(final Extension extension) {
         Optional<NxmNxRegGrouping> matchGrouping = MatchUtil.REG_RESOLVER.findExtension(extension);
         if (!matchGrouping.isPresent()) {
             throw new CodecPreconditionException(extension);
@@ -94,42 +94,43 @@ public class RegConvertor implements ConvertorToOFJava<MatchEntry>, ConvertorFro
         RegCaseValueBuilder regCaseValueBuilder = new RegCaseValueBuilder();
         regCaseValueBuilder.setRegValues(regValuesBuilder.build());
         return MatchUtil.createDefaultMatchEntryBuilder(nxmNxReg.getReg(),
-                Nxm1Class.class,
+                Nxm1Class.VALUE,
                 regCaseValueBuilder.build())
             .setHasMask(nxmNxReg.getMask() != null)
             .build();
     }
 
-    private static Class<? extends ExtensionKey> resolveRegKey(Class<? extends MatchField> oxmMatchField) {
-        if (NiciraMatchCodecs.REG0_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg0Key.class;
+    private static ExtensionKey resolveRegKey(final MatchField oxmMatchField) {
+        // FIXME: Use direct field value equalitity
+        if (NiciraMatchCodecs.REG0_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg0Key.VALUE;
         }
-        if (NiciraMatchCodecs.REG1_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg1Key.class;
+        if (NiciraMatchCodecs.REG1_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg1Key.VALUE;
         }
-        if (NiciraMatchCodecs.REG2_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg2Key.class;
+        if (NiciraMatchCodecs.REG2_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg2Key.VALUE;
         }
-        if (NiciraMatchCodecs.REG3_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg3Key.class;
+        if (NiciraMatchCodecs.REG3_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg3Key.VALUE;
         }
-        if (NiciraMatchCodecs.REG4_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg4Key.class;
+        if (NiciraMatchCodecs.REG4_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg4Key.VALUE;
         }
-        if (NiciraMatchCodecs.REG5_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg5Key.class;
+        if (NiciraMatchCodecs.REG5_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg5Key.VALUE;
         }
-        if (NiciraMatchCodecs.REG6_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg6Key.class;
+        if (NiciraMatchCodecs.REG6_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg6Key.VALUE;
         }
-        if (NiciraMatchCodecs.REG7_CODEC.getNxmField().isAssignableFrom(oxmMatchField)) {
-            return NxmNxReg7Key.class;
+        if (NiciraMatchCodecs.REG7_CODEC.getNxmField().equals(oxmMatchField)) {
+            return NxmNxReg7Key.VALUE;
         }
         throw new CodecPreconditionException("There is no key for " + oxmMatchField);
     }
 
-    private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(NxmNxReg nxmNxReg,
-            MatchPath path, Class<? extends ExtensionKey> key) {
+    private static ExtensionAugment<? extends Augmentation<Extension>> resolveAugmentation(final NxmNxReg nxmNxReg,
+            final MatchPath path, final ExtensionKey key) {
         switch (path) {
             case FLOWS_STATISTICS_UPDATE_MATCH:
                 return new ExtensionAugment<>(NxAugMatchNodesNodeTableFlow.class,