Fix some Sonar warnings

(cherry picked from commit c176ff9)

Conflicts:
	src/main/java/com/rabbitmq/client/impl/WorkPool.java

Author: acogoluegnes

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); //NOSONAR
+            AutorecoveringConnection conn = new AutorecoveringConnection(params, fhFactory, addressResolver, metricsCollector);
 
             conn.init();
             return conn;

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

@@ -389,7 +389,9 @@ public void quiescingTransmit(AMQCommand c) throws IOException {
                 while (_blockContent) {
                     try {
                         _channelMutex.wait();
-                    } catch (InterruptedException ignored) {}
+                    } catch (InterruptedException ignored) {
+                        Thread.currentThread().interrupt();
+                    }
 
                     // This is to catch a situation when the thread wakes up during
                     // shutdown. Currently, no command that has content is allowed

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

@@ -77,7 +77,7 @@ public void enqueue(BlockingQueue<W> queue, W item) {
                             throw new WorkPoolFullException("Could not enqueue in work pool after " + queueingTimeout + " ms.");
                         }
                     } catch (InterruptedException e) {
-                        Thread.currentThread();
+                        Thread.currentThread().interrupt();
                     }
                 }
             };

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(); //NOSONAR
+            channel = SocketChannel.open();
             channel.configureBlocking(true);
             if(nioParams.getSocketChannelConfigurator() != null) {
                 nioParams.getSocketChannelConfigurator().configure(channel);

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

@@ -137,6 +137,7 @@ private void sendWriteRequest(WriteRequest writeRequest) throws IOException {
             }
         } catch (InterruptedException e) {
             LOGGER.warn("Thread interrupted during enqueuing frame in write queue");
+            Thread.currentThread().interrupt();
         }
     }
 

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

@@ -113,7 +113,7 @@ private static int retryRead(ReadableByteChannel channel, ByteBuffer buffer) thr
             try {
                 Thread.sleep(100L);
             } catch (InterruptedException e) {
-                // ignore
+                Thread.currentThread().interrupt();
             }
             read = NioHelper.read(channel, buffer);
             if(read > 0) {

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) //NOSONAR
+        if (newChannel == null)
             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) { //NOSONAR
+        if (ch == null) {
             return null;
         } else {
             return this.wrapChannel(ch);
@@ -565,7 +565,7 @@ public void removeConsumerRecoveryListener(ConsumerRecoveryListener listener) {
     }
 
     private synchronized void beginAutomaticRecovery() throws InterruptedException {
-        Thread.sleep(this.params.getRecoveryDelayHandler().getDelay(0));
+        this.wait(this.params.getRecoveryDelayHandler().getDelay(0));
 
         this.notifyRecoveryListenersStarted();