From c7ced039c9b4c6165b6c9b80d239326cd6927922 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 29 Jan 2021 17:04:37 -0500
Subject: [PATCH] Sonar: Add Nullable to Possibly Null Parameters

---
 .../rabbit/connection/CachingConnectionFactory.java    |  9 +++++----
 .../springframework/amqp/rabbit/core/RabbitAdmin.java  |  4 ++--
 .../amqp/rabbit/core/RabbitTemplate.java               | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
index 83f6400495..b192eab711 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/CachingConnectionFactory.java
@@ -529,7 +529,7 @@ private Channel getChannel(ChannelCachingConnectionProxy connection, boolean tra
 		LinkedList<ChannelProxy> channelList = determineChannelList(connection, transactional);
 		ChannelProxy channel = null;
 		if (connection.isOpen()) {
-			channel = findOpenChannel(channelList, channel);
+			channel = findOpenChannel(channelList);
 			if (channel != null && logger.isTraceEnabled()) {
 				logger.trace("Found cached Rabbit Channel: " + channel.toString());
 			}
@@ -576,9 +576,10 @@ private Semaphore obtainPermits(ChannelCachingConnectionProxy connection) {
 		return permits;
 	}
 
-	private ChannelProxy findOpenChannel(LinkedList<ChannelProxy> channelList, // NOSONAR LinkedList.removeFirst()
-			ChannelProxy channelArg) {
-		ChannelProxy channel = channelArg;
+	@Nullable
+	private ChannelProxy findOpenChannel(LinkedList<ChannelProxy> channelList) {
+
+		ChannelProxy channel = null;
 		synchronized (channelList) {
 			while (!channelList.isEmpty()) {
 				channel = channelList.removeFirst();
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java
index e19cfbcd1a..3c740a9599 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitAdmin.java
@@ -769,7 +769,7 @@ private void declareBindings(final Channel channel, final Binding... bindings) t
 		}
 	}
 
-	private <T extends Throwable> void logOrRethrowDeclarationException(@Nullable Declarable element,
+	private <T extends Throwable> void logOrRethrowDeclarationException(Declarable element,
 			String elementType, T t) throws T {
 
 		publishDeclarationExceptionEvent(element, t);
@@ -794,7 +794,7 @@ else if (this.logger.isWarnEnabled()) {
 		}
 	}
 
-	private <T extends Throwable> void publishDeclarationExceptionEvent(Declarable element, T t) {
+	private <T extends Throwable> void publishDeclarationExceptionEvent(@Nullable Declarable element, T t) {
 		DeclarationExceptionEvent event = new DeclarationExceptionEvent(this, element, t);
 		this.lastDeclarationExceptionEvent = event;
 		if (this.applicationEventPublisher != null) {
diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
index b12cf96cd1..802f8de7cc 100644
--- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
+++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java
@@ -1444,7 +1444,7 @@ private Delivery consumeDelivery(Channel channel, String queueName, long timeout
 		return delivery;
 	}
 
-	private void logReceived(Message message) {
+	private void logReceived(@Nullable Message message) {
 		if (message == null) {
 			logger.debug("Received no message");
 		}
@@ -2161,8 +2161,8 @@ private <T> T doExecute(ChannelCallback<T> action, ConnectionFactory connectionF
 		}
 	}
 
-	private void cleanUpAfterAction(Channel channel, boolean invokeScope, RabbitResourceHolder resourceHolder,
-			Connection connection) {
+	private void cleanUpAfterAction(@Nullable Channel channel, boolean invokeScope,
+			@Nullable RabbitResourceHolder resourceHolder, @Nullable Connection connection) {
 
 		if (!invokeScope) {
 			if (resourceHolder != null) {
@@ -2257,8 +2257,8 @@ private ConfirmListener addConfirmListener(@Nullable com.rabbitmq.client.Confirm
 		return listener;
 	}
 
-	private void cleanUpAfterAction(RabbitResourceHolder resourceHolder, Connection connection, Channel channel,
-			ConfirmListener listener) {
+	private void cleanUpAfterAction(@Nullable RabbitResourceHolder resourceHolder, @Nullable Connection connection,
+			@Nullable Channel channel, @Nullable ConfirmListener listener) {
 
 		if (listener != null) {
 			channel.removeConfirmListener(listener);