Fix some Sonar warnings

(cherry picked from commit 36d12f8)

Conflicts:
	src/main/java/com/rabbitmq/client/SslEngineConfigurators.java

Author: acogoluegnes

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

@@ -1154,7 +1154,9 @@ 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);
+            // No Sonar: no need to close this resource because we're the one that creates it
+            // and hands it over to the user
+            AutorecoveringConnection conn = new AutorecoveringConnection(params, fhFactory, addressResolver, metricsCollector); //NOSONAR
 
             conn.init();
             return conn;

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

@@ -54,7 +54,7 @@ public class ConnectionFactoryConfigurator {
     public static final String DEFAULT_PREFIX = "rabbitmq.";
 
     public static final String USERNAME = "username";
-    public static final String PASSWORD = "password";
+    public static final String PASSWORD = "password"; //NOSONAR
     public static final String VIRTUAL_HOST = "virtual.host";
     public static final String HOST = "host";
     public static final String PORT = "port";

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

@@ -32,7 +32,7 @@ public abstract class SslEngineConfigurators {
     /**
      * Default {@link SslEngineConfigurator}, does nothing.
      */
-    public static AbstractSslEngineConfigurator DEFAULT = new AbstractSslEngineConfigurator() {
+    public static final AbstractSslEngineConfigurator DEFAULT = new AbstractSslEngineConfigurator() {
 
         @Override
         public void configure(SSLEngine sslEngine) {
@@ -46,7 +46,7 @@ public void configure(SSLEngine sslEngine) {
      * Requires Java 7 or more.
      *
      */
-    public static AbstractSslEngineConfigurator ENABLE_HOSTNAME_VERIFICATION = new AbstractSslEngineConfigurator() {
+    public static final AbstractSslEngineConfigurator ENABLE_HOSTNAME_VERIFICATION = new AbstractSslEngineConfigurator() {
 
         @Override
         public void configure(SSLEngine sslEngine) throws IOException {

src/main/java/com/rabbitmq/client/impl/AMQChannel.java

@@ -66,7 +66,7 @@ public abstract class AMQChannel extends ShutdownNotifierComponent {
     private RpcContinuation _activeRpc = null;
 
     /** Whether transmission of content-bearing methods should be blocked */
-    public volatile boolean _blockContent = false;
+    protected volatile boolean _blockContent = false;
 
     /** Timeout for RPC calls */
     protected final int _rpcTimeout;
@@ -193,8 +193,9 @@ public void enqueueRpc(RpcContinuation k)
             while (_activeRpc != null) {
                 try {
                     _channelMutex.wait();
-                } catch (InterruptedException e) {
+                } catch (InterruptedException e) { //NOSONAR
                     waitClearedInterruptStatus = true;
+                    // No Sonar: we re-interrupt the thread later
                 }
             }
             if (waitClearedInterruptStatus) {

src/main/java/com/rabbitmq/client/impl/ChannelManager.java

@@ -143,8 +143,14 @@ public void run() {
                 for (CountDownLatch latch : sdSet) {
                     try {
                         int shutdownTimeout = ssWorkService.getShutdownTimeout();
-                        if (shutdownTimeout == 0) latch.await();
-                        else                      latch.await(shutdownTimeout, TimeUnit.MILLISECONDS);
+                        if (shutdownTimeout == 0) {
+                            latch.await();
+                        } else {
+                            boolean completed = latch.await(shutdownTimeout, TimeUnit.MILLISECONDS);
+                            if (!completed) {
+                                LOGGER.warn("Consumer dispatcher for channel didn't shutdown after waiting for {} ms", shutdownTimeout);
+                            }
+                        }
                     } catch (Throwable e) {
                          /*ignored*/
                     }

src/main/java/com/rabbitmq/client/impl/ContentHeaderPropertyReader.java

@@ -34,10 +34,10 @@ public class ContentHeaderPropertyReader {
     private final ValueReader in;
 
     /** Current field flag word */
-    public int flagWord;
+    private int flagWord;
 
     /** Current flag position counter */
-    public int bitCount;
+    private int bitCount;
 
     /**
      * Protected API - Constructs a reader from the given input stream

src/main/java/com/rabbitmq/client/impl/ContentHeaderPropertyWriter.java

@@ -33,10 +33,10 @@ public class ContentHeaderPropertyWriter {
     private final ValueWriter out;
 
     /** Current flags word being accumulated */
-    public int flagWord;
+    private int flagWord;
 
     /** Position within current flags word */
-    public int bitCount;
+    private int bitCount;
 
     /**
      * Constructs a fresh ContentHeaderPropertyWriter.

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

@@ -82,7 +82,10 @@ public FrameHandler create(Address addr) throws IOException {
             }
 
             SocketAddress address = new InetSocketAddress(addr.getHost(), portNumber);
-            channel = SocketChannel.open();
+            // No Sonar: the channel is closed in case of error and it cannot
+            // be closed here because it's part of the state of the connection
+            // to be returned.
+            channel = SocketChannel.open(); //NOSONAR
             channel.configureBlocking(true);
             if(nioParams.getSocketChannelConfigurator() != null) {
                 nioParams.getSocketChannelConfigurator().configure(channel);

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

@@ -592,7 +592,8 @@ public void automaticallyRecover(AutorecoveringConnection connection, Connection
         this.connection = connection;
 
         final RecoveryAwareChannelN newChannel = (RecoveryAwareChannelN) connDelegate.createChannel(this.getChannelNumber());
-        if (newChannel == null)
+        // No Sonar: the channel could be 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,8 @@ public void init() throws IOException, TimeoutException {
     @Override
     public Channel createChannel() throws IOException {
         RecoveryAwareChannelN ch = (RecoveryAwareChannelN) delegate.createChannel();
-        if (ch == null) {
+        // No Sonar: the channel could be null
+        if (ch == null) { //NOSONAR
             return null;
         } else {
             return this.wrapChannel(ch);
@@ -605,7 +606,9 @@ private RecoveryAwareAMQConnection recoverConnection() throws InterruptedExcepti
         while (!manuallyClosed) {
             try {
                 attempts++;
-				RecoveryAwareAMQConnection newConn = this.cf.newConnection();
+                // No Sonar: no need to close this resource because we're the one that creates it
+                // and hands it over to the user
+				RecoveryAwareAMQConnection newConn = this.cf.newConnection(); //NOSONAR
 				synchronized(recoveryLock) {
 					if (!manuallyClosed) {
 						// This is the standard case.