Fix Issues Reported by Sonar

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/ListenerContainerFactoryBean.java

@@ -48,8 +48,6 @@
 import org.springframework.util.ErrorHandler;
 import org.springframework.util.backoff.BackOff;
 
-import com.rabbitmq.client.Channel;
-
 /**
  * A Factory bean to create a listener container.
  *
@@ -276,7 +274,7 @@ public void setPrefetchCount(int prefetchCount) {
 	 * Apply prefetch to the entire channel.
 	 * @param globalQos true for a channel-wide prefetch.
 	 * @since 2.2.17
-	 * @see Channel#basicQos(int, boolean)
+	 * @see com.rabbitmq.client.Channel#basicQos(int, boolean)
 	 */
 	public void setGlobalQos(boolean globalQos) {
 		this.globalQos = globalQos;

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

@@ -212,7 +212,7 @@ protected ApplicationEventPublisher getApplicationEventPublisher() {
 
 	@Override
 	public void onApplicationEvent(ContextClosedEvent event) {
-		if (getApplicationContext() == event.getApplicationContext()) {
+		if (getApplicationContext().equals(event.getApplicationContext())) {
 			this.contextStopped = true;
 		}
 		if (this.publisherConnectionFactory != null) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1098,7 +1098,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			}
 			if (methodName.equals("equals")) {
 				// Only consider equal when proxies are identical.
-				return (proxy == args[0]);
+				return (proxy == args[0]); // NOSONAR
 			}
 			else if (methodName.equals("hashCode")) {
 				// Use hashCode of Channel proxy.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -161,7 +161,7 @@ public void commitAll() throws AmqpException {
 	public void closeAll() {
 		for (Channel channel : this.channels) {
 			try {
-				if (channel != ConsumerChannelRegistry.getConsumerChannel()) {
+				if (channel != ConsumerChannelRegistry.getConsumerChannel()) { // NOSONAR
 					channel.close();
 				}
 				else {

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/core/RabbitTemplate.java

@@ -454,7 +454,7 @@ public MessageConverter getMessageConverter() {
 	}
 
 	public void setConfirmCallback(ConfirmCallback confirmCallback) {
-		Assert.state(this.confirmCallback == null || this.confirmCallback == confirmCallback,
+		Assert.state(this.confirmCallback == null || this.confirmCallback.equals(confirmCallback),
 				"Only one ConfirmCallback is supported by each RabbitTemplate");
 		this.confirmCallback = confirmCallback;
 	}
@@ -466,7 +466,7 @@ public void setConfirmCallback(ConfirmCallback confirmCallback) {
 	 */
 	@Deprecated
 	public void setReturnCallback(ReturnCallback returnCallback) {
-		Assert.state(this.returnsCallback == null || this.returnsCallback.delegate() == returnCallback,
+		Assert.state(this.returnsCallback == null || this.returnsCallback.delegate().equals(returnCallback),
 				"Only one ReturnCallback is supported by each RabbitTemplate");
 		this.returnsCallback = new ReturnsCallback() {
 
@@ -485,7 +485,7 @@ public ReturnCallback delegate() {
 	}
 
 	public void setReturnsCallback(ReturnsCallback returnCallback) {
-		Assert.state(this.returnsCallback == null || this.returnsCallback == returnCallback,
+		Assert.state(this.returnsCallback == null || this.returnsCallback.equals(returnCallback),
 				"Only one ReturnCallback is supported by each RabbitTemplate");
 		this.returnsCallback = returnCallback;
 	}

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -268,7 +268,7 @@ public void onMessage(Message message, Channel channel) throws Exception { // NO
 		// Check whether the delegate is a MessageListener impl itself.
 		// In that case, the adapter will simply act as a pass-through.
 		Object delegateListener = getDelegate();
-		if (delegateListener != this) {
+		if (!delegateListener.equals(this)) {
 			if (delegateListener instanceof ChannelAwareMessageListener) {
 				((ChannelAwareMessageListener) delegateListener).onMessage(message, channel);
 				return;