Bump MRI upstreams

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / device / BuildSwitchCapabilitiesOF10.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java
index 745a3a7c664a9101cd4653716c1d45bd3ac7e4a8..046c0046ffb82fbd0393cdfe5c9a056b3add2c3b 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF10.java
@@ -7,8 +7,7 @@
  */
 package org.opendaylight.openflowplugin.impl.device;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.google.common.collect.ImmutableSet;
 import org.opendaylight.openflowplugin.api.openflow.md.core.sal.BuildSwitchFeatures;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FeatureCapability;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowFeatureCapabilityArpMatchIp;
@@ -27,10 +26,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * SwitchFeature builder for OF 1.0.
  */
 public final class BuildSwitchCapabilitiesOF10 implements BuildSwitchFeatures {
-
-    private static BuildSwitchCapabilitiesOF10 instance = new BuildSwitchCapabilitiesOF10();
+    private static final BuildSwitchCapabilitiesOF10 INSTANCE = new BuildSwitchCapabilitiesOF10();
 
     private BuildSwitchCapabilitiesOF10() {
+        // Hidden on purpose
     }
 
     /**
@@ -39,47 +38,46 @@ public final class BuildSwitchCapabilitiesOF10 implements BuildSwitchFeatures {
      * @return instance
      */
     public static BuildSwitchCapabilitiesOF10 getInstance() {
-        return instance;
+        return INSTANCE;
     }
 
     @Override
-    public SwitchFeatures build(GetFeaturesOutput features) {
-
-        SwitchFeaturesBuilder builderSwFeatures = new SwitchFeaturesBuilder();
-        builderSwFeatures.setMaxBuffers(features.getBuffers());
-        builderSwFeatures.setMaxTables(features.getTables());
-
-        List<Class<? extends FeatureCapability>> capabilities = new ArrayList<>();
+    public SwitchFeatures build(final GetFeaturesOutput features) {
+        final var capabilities = features.getCapabilitiesV10();
+        if (capabilities == null) {
+            return null;
+        }
 
-        if (features.getCapabilitiesV10().isOFPCARPMATCHIP()) {
-            capabilities.add(FlowFeatureCapabilityArpMatchIp.class);
+        final var builder = ImmutableSet.<Class<? extends FeatureCapability>>builder();
+        if (capabilities.getOFPCARPMATCHIP()) {
+            builder.add(FlowFeatureCapabilityArpMatchIp.class);
         }
-        if (features.getCapabilitiesV10().isOFPCFLOWSTATS()) {
-            capabilities.add(FlowFeatureCapabilityFlowStats.class);
+        if (capabilities.getOFPCFLOWSTATS()) {
+            builder.add(FlowFeatureCapabilityFlowStats.class);
         }
-        if (features.getCapabilitiesV10().isOFPCIPREASM()) {
-            capabilities.add(FlowFeatureCapabilityIpReasm.class);
+        if (capabilities.getOFPCIPREASM()) {
+            builder.add(FlowFeatureCapabilityIpReasm.class);
         }
-        if (features.getCapabilitiesV10().isOFPCPORTSTATS()) {
-            capabilities.add(FlowFeatureCapabilityPortStats.class);
+        if (capabilities.getOFPCPORTSTATS()) {
+            builder.add(FlowFeatureCapabilityPortStats.class);
         }
-        if (features.getCapabilitiesV10().isOFPCQUEUESTATS()) {
-            capabilities.add(FlowFeatureCapabilityQueueStats.class);
+        if (capabilities.getOFPCQUEUESTATS()) {
+            builder.add(FlowFeatureCapabilityQueueStats.class);
         }
-        if (features.getCapabilitiesV10().isOFPCRESERVED()) {
-            capabilities.add(FlowFeatureCapabilityReserved.class);
+        if (capabilities.getOFPCRESERVED()) {
+            builder.add(FlowFeatureCapabilityReserved.class);
         }
-        if (features.getCapabilitiesV10().isOFPCSTP()) {
-            capabilities.add(FlowFeatureCapabilityStp.class);
+        if (capabilities.getOFPCSTP()) {
+            builder.add(FlowFeatureCapabilityStp.class);
         }
-        if (features.getCapabilitiesV10().isOFPCTABLESTATS()) {
-            capabilities.add(FlowFeatureCapabilityTableStats.class);
+        if (capabilities.getOFPCTABLESTATS()) {
+            builder.add(FlowFeatureCapabilityTableStats.class);
         }
 
-        builderSwFeatures.setCapabilities(capabilities);
-
-        return builderSwFeatures.build();
+        return new SwitchFeaturesBuilder()
+            .setMaxBuffers(features.getBuffers())
+            .setMaxTables(features.getTables())
+            .setCapabilities(builder.build())
+            .build();
     }
-
-
 }