Fix new Sonar issues

Method complexity.

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java

@@ -547,7 +547,8 @@ private Semaphore obtainPermit(ChannelCachingConnectionProxy connection) {
 		return permits;
 	}
 
-	private ChannelProxy findOpenChannel(LinkedList<ChannelProxy> channelList, ChannelProxy channel) {
+	private ChannelProxy findOpenChannel(LinkedList<ChannelProxy> channelList, // NOSONAR LinkedList.removeFirst()
+			ChannelProxy channel) {
 		synchronized (channelList) {
 			while (!channelList.isEmpty()) {
 				channel = channelList.removeFirst();
@@ -558,38 +559,42 @@ private ChannelProxy findOpenChannel(LinkedList<ChannelProxy> channelList, Chann
 					break;
 				}
 				else {
-					try {
-						Channel target = channel.getTargetChannel();
-						if (target != null) {
-							target.close();
-							/*
-							 *  To remove it from auto-recovery if so configured,
-							 *  and nack any pending confirms if PublisherCallbackChannel.
-							 */
-						}
-					}
-					catch (AlreadyClosedException e) {
-						if (logger.isTraceEnabled()) {
-							logger.trace(channel + " is already closed");
-						}
-					}
-					catch (IOException e) {
-						if (logger.isDebugEnabled()) {
-							logger.debug("Unexpected Exception closing channel " + e.getMessage());
-						}
-					}
-					catch (TimeoutException e) {
-						if (logger.isWarnEnabled()) {
-							logger.warn("TimeoutException closing channel " + e.getMessage());
-						}
-					}
+					cleanUpClosedChannel(channel);
 					channel = null;
 				}
 			}
 		}
 		return channel;
 	}
 
+	private void cleanUpClosedChannel(ChannelProxy channel) {
+		try {
+			Channel target = channel.getTargetChannel();
+			if (target != null) {
+				target.close();
+				/*
+				 *  To remove it from auto-recovery if so configured,
+				 *  and nack any pending confirms if PublisherCallbackChannel.
+				 */
+			}
+		}
+		catch (AlreadyClosedException e) {
+			if (logger.isTraceEnabled()) {
+				logger.trace(channel + " is already closed");
+			}
+		}
+		catch (IOException e) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Unexpected Exception closing channel " + e.getMessage());
+			}
+		}
+		catch (TimeoutException e) {
+			if (logger.isWarnEnabled()) {
+				logger.warn("TimeoutException closing channel " + e.getMessage());
+			}
+		}
+	}
+
 	private ChannelProxy getCachedChannelProxy(ChannelCachingConnectionProxy connection,
 			LinkedList<ChannelProxy> channelList, boolean transactional) { //NOSONAR LinkedList for addLast()
 
@@ -689,17 +694,8 @@ else if (this.cacheMode == CacheMode.CONNECTION) {
 	private Connection connectionFromCache() {
 		ChannelCachingConnectionProxy cachedConnection = findIdleConnection();
 		long now = System.currentTimeMillis();
-		while (cachedConnection == null && System.currentTimeMillis() - now < this.channelCheckoutTimeout) {
-			if (countOpenConnections() >= this.connectionLimit) {
-				try {
-					this.connectionMonitor.wait(this.channelCheckoutTimeout);
-					cachedConnection = findIdleConnection();
-				}
-				catch (InterruptedException e) {
-					Thread.currentThread().interrupt();
-					throw new AmqpException("Interrupted while waiting for a connection", e);
-				}
-			}
+		if (cachedConnection == null) {
+			cachedConnection = waitForConnection(cachedConnection, now);
 		}
 		if (cachedConnection == null) {
 			if (countOpenConnections() >= this.connectionLimit
@@ -737,6 +733,22 @@ else if (!cachedConnection.isOpen()) {
 		return cachedConnection;
 	}
 
+	private ChannelCachingConnectionProxy waitForConnection(ChannelCachingConnectionProxy cachedConnection, long now) {
+		while (cachedConnection == null && System.currentTimeMillis() - now < this.channelCheckoutTimeout) {
+			if (countOpenConnections() >= this.connectionLimit) {
+				try {
+					this.connectionMonitor.wait(this.channelCheckoutTimeout);
+					cachedConnection = findIdleConnection();
+				}
+				catch (InterruptedException e) {
+					Thread.currentThread().interrupt();
+					throw new AmqpException("Interrupted while waiting for a connection", e);
+				}
+			}
+		}
+		return cachedConnection;
+	}
+
 	/*
 	 * Iterate over the idle connections looking for an open one. If there are no idle,
 	 * return null, if there are no open idle, return the first closed idle so it can