From f52a671ff4d490433f1790f9bc8343f66cada650 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 27 Apr 2021 11:06:21 -0400 Subject: [PATCH] Fix Issues Reported by Sonar --- .../amqp/rabbit/config/ListenerContainerFactoryBean.java | 4 +--- .../amqp/rabbit/connection/AbstractConnectionFactory.java | 2 +- .../amqp/rabbit/connection/CachingConnectionFactory.java | 4 ++-- .../amqp/rabbit/connection/RabbitResourceHolder.java | 4 ++-- .../springframework/amqp/rabbit/core/RabbitTemplate.java | 6 +++--- .../rabbit/listener/adapter/MessageListenerAdapter.java | 4 ++-- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/ListenerContainerFactoryBean.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/ListenerContainerFactoryBean.java index 272cc02196..07c7be9f41 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/ListenerContainerFactoryBean.java +++ b/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; diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java index ab6e5020ef..95fb13ba56 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java +++ b/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) { 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 d191a65543..0fa960684b 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 @@ -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. diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitResourceHolder.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitResourceHolder.java index 7690eb8c02..8cea93e04e 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitResourceHolder.java +++ b/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 { 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 f8734c23db..2c3028d70a 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 @@ -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; } diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java index e3165a8eb1..d4ef95993a 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessageListenerAdapter.java +++ b/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;