Fix some Sonar warnings

(cherry picked from commit 1c3cf6a)

Author: acogoluegnes

pom.xml

@@ -759,6 +759,17 @@
   </dependencies>
 
   <build>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>3.5.0.1254</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <!-- We store the client version in a Java properties file. -->
     <resources>
       <resource>

src/main/java/com/rabbitmq/client/ConnectionFactory.java

@@ -1154,7 +1154,7 @@ public Connection newConnection(ExecutorService executor, AddressResolver addres
 
         if (isAutomaticRecoveryEnabled()) {
             // see com.rabbitmq.client.impl.recovery.RecoveryAwareAMQConnectionFactory#newConnection
-            AutorecoveringConnection conn = new AutorecoveringConnection(params, fhFactory, addressResolver, metricsCollector);
+            AutorecoveringConnection conn = new AutorecoveringConnection(params, fhFactory, addressResolver, metricsCollector); //NOSONAR
 
             conn.init();
             return conn;

src/main/java/com/rabbitmq/client/impl/nio/FrameBuilder.java

@@ -80,7 +80,7 @@ public Frame readFrame() throws IOException {
                 frameBuffer[0] = readFromBuffer();
             } else if (bytesRead == 2) {
                 // channel 2/2
-                frameChannel = (frameBuffer[0] << 8) + (readFromBuffer() << 0);
+                frameChannel = (frameBuffer[0] << 8) + readFromBuffer();
             } else if (bytesRead == 3) {
                 // payload size 1/4
                 frameBuffer[0] = readFromBuffer();
@@ -92,7 +92,7 @@ public Frame readFrame() throws IOException {
                 frameBuffer[2] = readFromBuffer();
             } else if (bytesRead == 6) {
                 // payload size 4/4
-                int framePayloadSize = ((frameBuffer[0] << 24) + (frameBuffer[1] << 16) + (frameBuffer[2] << 8) + (readFromBuffer() << 0));
+                int framePayloadSize = (frameBuffer[0] << 24) + (frameBuffer[1] << 16) + (frameBuffer[2] << 8) + readFromBuffer();
                 framePayload = new byte[framePayloadSize];
             } else if (bytesRead >= PAYLOAD_OFFSET && bytesRead < framePayload.length + PAYLOAD_OFFSET) {
                 framePayload[bytesRead - PAYLOAD_OFFSET] = (byte) readFromBuffer();

src/main/java/com/rabbitmq/client/impl/nio/SocketChannelFrameHandlerFactory.java

@@ -82,7 +82,7 @@ public FrameHandler create(Address addr) throws IOException {
             }
 
             SocketAddress address = new InetSocketAddress(addr.getHost(), portNumber);
-            channel = SocketChannel.open();
+            channel = SocketChannel.open(); //NOSONAR
             channel.configureBlocking(true);
             if(nioParams.getSocketChannelConfigurator() != null) {
                 nioParams.getSocketChannelConfigurator().configure(channel);
@@ -131,7 +131,9 @@ public FrameHandler create(Address addr) throws IOException {
                 if(sslEngine != null && channel != null) {
                     SslEngineHelper.close(channel, sslEngine);
                 }
-                channel.close();
+                if (channel != null) {
+                    channel.close();
+                }
             } catch(IOException closingException) {
                 // ignore
             }

src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringChannel.java

@@ -592,7 +592,7 @@ public void automaticallyRecover(AutorecoveringConnection connection, Connection
         this.connection = connection;
 
         final RecoveryAwareChannelN newChannel = (RecoveryAwareChannelN) connDelegate.createChannel(this.getChannelNumber());
-        if (newChannel == null)
+        if (newChannel == null) //NOSONAR
             throw new IOException("Failed to create new channel for channel number=" + this.getChannelNumber() + " during recovery");
         newChannel.inheritOffsetFrom(defunctChannel);
         this.delegate = newChannel;

src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java

@@ -184,7 +184,7 @@ public void init() throws IOException, TimeoutException {
     @Override
     public Channel createChannel() throws IOException {
         RecoveryAwareChannelN ch = (RecoveryAwareChannelN) delegate.createChannel();
-        if (ch == null) {
+        if (ch == null) { //NOSONAR
             return null;
         } else {
             return this.wrapChannel(ch);

src/main/java/com/rabbitmq/utility/BlockingCell.java

@@ -28,7 +28,7 @@ public class BlockingCell<T> {
     /** Will be null until a value is supplied, and possibly still then. */
     private T _value;
 
-    private static final long NANOS_IN_MILLI = 1000 * 1000;
+    private static final long NANOS_IN_MILLI = 1000L * 1000L;
 
     private static final long INFINITY = -1;