Bump MRI upstreams

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.java
index 8d3eb9daaeeaf966744496abc4ff4b2511fa33a0..b502cd2d9d7204b0bc3c9b236d79bf3ae446993a 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BuildSwitchCapabilitiesOF13.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.FlowFeatureCapabilityFlowStats;
@@ -26,10 +25,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * SwitchFeature builder for OF 1.3.
  */
 public final class BuildSwitchCapabilitiesOF13 implements BuildSwitchFeatures {
-
-    private static BuildSwitchCapabilitiesOF13 instance = new BuildSwitchCapabilitiesOF13();
+    private static final BuildSwitchCapabilitiesOF13 INSTANCE = new BuildSwitchCapabilitiesOF13();
 
     private BuildSwitchCapabilitiesOF13() {
+        // Hidden on purpose
     }
 
     /**
@@ -38,43 +37,43 @@ public final class BuildSwitchCapabilitiesOF13 implements BuildSwitchFeatures {
      * @return instance
      */
     public static BuildSwitchCapabilitiesOF13 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.getCapabilities();
+        if (capabilities == null) {
+            return null;
+        }
 
-        if (features.getCapabilities().isOFPCFLOWSTATS()) {
-            capabilities.add(FlowFeatureCapabilityFlowStats.class);
+        final var builder = ImmutableSet.<Class<? extends FeatureCapability>>builder();
+        if (capabilities.getOFPCFLOWSTATS()) {
+            builder.add(FlowFeatureCapabilityFlowStats.class);
         }
-        if (features.getCapabilities().isOFPCGROUPSTATS()) {
-            capabilities.add(FlowFeatureCapabilityGroupStats.class);
+        if (capabilities.getOFPCGROUPSTATS()) {
+            builder.add(FlowFeatureCapabilityGroupStats.class);
         }
-        if (features.getCapabilities().isOFPCIPREASM()) {
-            capabilities.add(FlowFeatureCapabilityIpReasm.class);
+        if (capabilities.getOFPCIPREASM()) {
+            builder.add(FlowFeatureCapabilityIpReasm.class);
         }
-        if (features.getCapabilities().isOFPCPORTBLOCKED()) {
-            capabilities.add(FlowFeatureCapabilityPortBlocked.class);
+        if (capabilities.getOFPCPORTBLOCKED()) {
+            builder.add(FlowFeatureCapabilityPortBlocked.class);
         }
-        if (features.getCapabilities().isOFPCPORTSTATS()) {
-            capabilities.add(FlowFeatureCapabilityPortStats.class);
+        if (capabilities.getOFPCPORTSTATS()) {
+            builder.add(FlowFeatureCapabilityPortStats.class);
         }
-        if (features.getCapabilities().isOFPCQUEUESTATS()) {
-            capabilities.add(FlowFeatureCapabilityQueueStats.class);
+        if (capabilities.getOFPCQUEUESTATS()) {
+            builder.add(FlowFeatureCapabilityQueueStats.class);
         }
-        if (features.getCapabilities().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();
     }
-
 }