Merge changes I400fdd74,I18d70f22,Icc83aef3,I3a67dc87,I05b3e988

* changes:
  Make two classes _static_ inner classes, as recommended by FindBugs
  Suppress FindBugs null analysis warning in FlowDescriptorDtoTest
  Suppress FindBugs concurrency warning which is wrong
  Fix FindBugs null analysis problems due to wrong @nullable
  Fix FindBugs level "Scariest" problem in SalAsyncConfigServiceImplTest

Author: vishnoianil

openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/ConnectionContextImpl.java

@@ -48,7 +48,7 @@ public class ConnectionContextImpl implements ConnectionContext {
     private OutboundQueueHandlerRegistration<OutboundQueueProvider> outboundQueueHandlerRegistration;
     private HandshakeContext handshakeContext;
     private DeviceInfo deviceInfo;
-    private List<PortStatusMessage> portStatusMessages = new ArrayList<>();
+    private final List<PortStatusMessage> portStatusMessages = new ArrayList<>();
 
     /**
      * Constructor.
@@ -288,7 +288,7 @@ public int hashCode() {
         return result;
     }
 
-    private class DeviceInfoImpl implements DeviceInfo {
+    private static class DeviceInfoImpl implements DeviceInfo {
 
         private final NodeId nodeId;
         private final KeyedInstanceIdentifier<Node, NodeKey> nodeII;
@@ -348,10 +348,10 @@ public boolean equals(Object object) {
 
             DeviceInfoImpl that = (DeviceInfoImpl) object;
 
-            return  (nodeId.equals(that.nodeId)
+            return  nodeId.equals(that.nodeId)
                     && nodeII.equals(that.nodeII)
                     && version.equals(that.version)
-                    && datapathId.equals(that.datapathId));
+                    && datapathId.equals(that.datapathId);
 
         }
 

openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/ofpspecific/EventsTimeCounter.java

@@ -8,6 +8,7 @@
 
 package org.opendaylight.openflowplugin.impl.statistics.ofpspecific;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -84,6 +85,7 @@ public synchronized void markStart() {
             delta = System.nanoTime();
         }
 
+        @SuppressFBWarnings("VO_VOLATILE_INCREMENT") // counter++ is volatile, but this is synchronized, so OK
         public synchronized void markEnd() {
             if (0 == delta) {
                 return;
@@ -97,7 +99,7 @@ public synchronized void markEnd() {
             if (delta > maximum) {
                 maximum = delta;
             }
-            if (average > 0 && delta > (average * 1.8)) {
+            if (average > 0 && delta > average * 1.8) {
                 summary += average;
             } else {
                 summary += delta;

openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/translator/TranslatorLibraryBuilder.java

@@ -28,7 +28,7 @@ public TranslatorLibrary build() {
         return new TranslatorLibraryImpl(translators);
     }
 
-    private final class TranslatorLibraryImpl implements TranslatorLibrary {
+    private static final class TranslatorLibraryImpl implements TranslatorLibrary {
         private final Map<TranslatorKey, MessageTranslator<?, ?>> translators;
 
         TranslatorLibraryImpl(final Map<TranslatorKey, MessageTranslator<?, ?>> translators) {

openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/FlowUtil.java

@@ -138,7 +138,7 @@ private FlowUtil() {
      * @return batch flow operation output of given type containing list of flow-ids and corresponding success flag
      */
     private static <T extends BatchFlowOutputListGrouping> RpcResultBuilder<T> createCumulativeRpcResult(
-            final @Nullable RpcResult<List<BatchFailedFlowsOutput>> batchFlowsCumulativeResult,
+            final RpcResult<List<BatchFailedFlowsOutput>> batchFlowsCumulativeResult,
             final T batchOutput) {
         final RpcResultBuilder<T> resultBld;
         if (batchFlowsCumulativeResult.isSuccessful()) {

openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/GroupUtil.java

@@ -150,22 +150,22 @@ public static List<Long> extractGroupActionsSupportBitmap(final List<ActionType>
         for (org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType supportedActions
                 : actionsSupported) {
             long supportActionBitmap = 0;
-            supportActionBitmap |= supportedActions.isOFPATOUTPUT() ? (1) : 0;
-            supportActionBitmap |= supportedActions.isOFPATCOPYTTLOUT() ? (1 << 11) : 0;
-            supportActionBitmap |= supportedActions.isOFPATCOPYTTLIN() ? (1 << 12) : 0;
-            supportActionBitmap |= supportedActions.isOFPATSETMPLSTTL() ? (1 << 15) : 0;
-            supportActionBitmap |= supportedActions.isOFPATDECMPLSTTL() ? (1 << 16) : 0;
-            supportActionBitmap |= supportedActions.isOFPATPUSHVLAN() ? (1 << 17) : 0;
-            supportActionBitmap |= supportedActions.isOFPATPOPVLAN() ? (1 << 18) : 0;
-            supportActionBitmap |= supportedActions.isOFPATPUSHMPLS() ? (1 << 19) : 0;
-            supportActionBitmap |= supportedActions.isOFPATPOPMPLS() ? (1 << 20) : 0;
-            supportActionBitmap |= supportedActions.isOFPATSETQUEUE() ? (1 << 21) : 0;
-            supportActionBitmap |= supportedActions.isOFPATGROUP() ? (1 << 22) : 0;
-            supportActionBitmap |= supportedActions.isOFPATSETNWTTL() ? (1 << 23) : 0;
-            supportActionBitmap |= supportedActions.isOFPATDECNWTTL() ? (1 << 24) : 0;
-            supportActionBitmap |= supportedActions.isOFPATSETFIELD() ? (1 << 25) : 0;
-            supportActionBitmap |= supportedActions.isOFPATPUSHPBB() ? (1 << 26) : 0;
-            supportActionBitmap |= supportedActions.isOFPATPOPPBB() ? (1 << 27) : 0;
+            supportActionBitmap |= supportedActions.isOFPATOUTPUT() ? 1 : 0;
+            supportActionBitmap |= supportedActions.isOFPATCOPYTTLOUT() ? 1 << 11 : 0;
+            supportActionBitmap |= supportedActions.isOFPATCOPYTTLIN() ? 1 << 12 : 0;
+            supportActionBitmap |= supportedActions.isOFPATSETMPLSTTL() ? 1 << 15 : 0;
+            supportActionBitmap |= supportedActions.isOFPATDECMPLSTTL() ? 1 << 16 : 0;
+            supportActionBitmap |= supportedActions.isOFPATPUSHVLAN() ? 1 << 17 : 0;
+            supportActionBitmap |= supportedActions.isOFPATPOPVLAN() ? 1 << 18 : 0;
+            supportActionBitmap |= supportedActions.isOFPATPUSHMPLS() ? 1 << 19 : 0;
+            supportActionBitmap |= supportedActions.isOFPATPOPMPLS() ? 1 << 20 : 0;
+            supportActionBitmap |= supportedActions.isOFPATSETQUEUE() ? 1 << 21 : 0;
+            supportActionBitmap |= supportedActions.isOFPATGROUP() ? 1 << 22 : 0;
+            supportActionBitmap |= supportedActions.isOFPATSETNWTTL() ? 1 << 23 : 0;
+            supportActionBitmap |= supportedActions.isOFPATDECNWTTL() ? 1 << 24 : 0;
+            supportActionBitmap |= supportedActions.isOFPATSETFIELD() ? 1 << 25 : 0;
+            supportActionBitmap |= supportedActions.isOFPATPUSHPBB() ? 1 << 26 : 0;
+            supportActionBitmap |= supportedActions.isOFPATPOPPBB() ? 1 << 27 : 0;
             supportActionByGroups.add(supportActionBitmap);
         }
         return supportActionByGroups;
@@ -213,7 +213,6 @@ public RpcResult<T> apply(@Nullable final Pair<RpcResult<T>, RpcResult<Void>> in
      * @return batch group operation output of given type containing list of group-ids and corresponding success flag
      */
     private static <T extends BatchGroupOutputListGrouping> RpcResultBuilder<T> createCumulativeRpcResult(
-        @Nullable
         final RpcResult<List<BatchFailedGroupsOutput>> batchGroupsCumulativeResult, final T batchOutput) {
         final RpcResultBuilder<T> resultBld;
         if (batchGroupsCumulativeResult.isSuccessful()) {

openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MeterUtil.java

@@ -182,7 +182,7 @@ public RpcResult<T> apply(@Nullable final Pair<RpcResult<T>, RpcResult<Void>> in
      */
     private static <T extends BatchMeterOutputListGrouping>
         RpcResultBuilder<T> createCumulativeRpcResult(
-            final @Nullable RpcResult<List<BatchFailedMetersOutput>> batchMetersCumulativeResult,
+            final RpcResult<List<BatchFailedMetersOutput>> batchMetersCumulativeResult,
             final T batchOutput) {
         final RpcResultBuilder<T> resultBld;
         if (batchMetersCumulativeResult.isSuccessful()) {

openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/registry/flow/FlowDescriptorDtoTest.java

@@ -8,6 +8,7 @@
 
 package org.opendaylight.openflowplugin.impl.registry.flow;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowplugin.api.openflow.registry.flow.FlowDescriptor;
@@ -27,7 +28,8 @@ public void testCreate() throws Exception {
     }
 
     @Test(expected = Exception.class)
+    @SuppressFBWarnings("NP_NONNULL_PARAM_VIOLATION") // that is the point of this test
     public void testCreateNegative1() throws Exception {
         FlowDescriptorFactory.create((short) 1, null);
     }
-}
+}

openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalAsyncConfigServiceImplTest.java

@@ -15,7 +15,6 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.concurrent.Future;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
@@ -39,8 +38,8 @@ public class SalAsyncConfigServiceImplTest extends ServiceMocking {
 
     private SalAsyncConfigServiceImpl salAsyncConfigService;
 
-    @Before
-    public void setUp() throws Exception {
+    @Override
+    public void setup() throws Exception {
         salAsyncConfigService = new SalAsyncConfigServiceImpl(
                 mockedRequestContextStack, mockedDeviceContext);
     }
@@ -79,4 +78,4 @@ public void testGetAsyncTest() throws Exception {
         verify(mockedOutboundQueue).commitEntry(Matchers.eq(ServiceMocking.DUMMY_XID_VALUE),
                 Matchers.<OfHeader>any(), Matchers.<FutureCallback<OfHeader>>any());
     }
-}
+}