From 9e91234545eecf921bcfbb96cee04fa1f65c4254 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Thu, 25 Oct 2018 15:54:49 -0400 Subject: [PATCH] Sonar fixes - False positives --- .../springframework/amqp/rabbit/AsyncRabbitTemplate.java | 4 ++-- .../rabbit/listener/AbstractMessageListenerContainer.java | 2 +- .../org/springframework/amqp/rabbit/support/Delivery.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.java index 9018211b..dcd39d1c 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/AsyncRabbitTemplate.java @@ -687,7 +687,7 @@ public class AsyncRabbitTemplate implements AsyncAmqpTemplate, ChannelAwareMessa } AsyncRabbitTemplate.this.pending.remove(this.correlationId); if (this.channelHolder != null && AsyncRabbitTemplate.this.directReplyToContainer != null) { - AsyncRabbitTemplate.this.directReplyToContainer.releaseConsumerFor(this.channelHolder, false, null); + AsyncRabbitTemplate.this.directReplyToContainer.releaseConsumerFor(this.channelHolder, false, null); // NOSONAR } return super.cancel(mayInterruptIfRunning); } @@ -742,7 +742,7 @@ public class AsyncRabbitTemplate implements AsyncAmqpTemplate, ChannelAwareMessa if (RabbitFuture.this.channelHolder != null && AsyncRabbitTemplate.this.directReplyToContainer != null) { AsyncRabbitTemplate.this.directReplyToContainer - .releaseConsumerFor(RabbitFuture.this.channelHolder, false, null); + .releaseConsumerFor(RabbitFuture.this.channelHolder, false, null); // NOSONAR } setException(new AmqpReplyTimeoutException("Reply timed out", RabbitFuture.this.requestMessage)); } diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java index 8ce06468..3e0168bc 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java @@ -1516,7 +1516,7 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor // so the channel exposed (because exposeListenerChannel is false) will be closed resourceHolder.setSynchronizedWithTransaction(false); } - ConnectionFactoryUtils.releaseResources(resourceHolder); + ConnectionFactoryUtils.releaseResources(resourceHolder); // NOSONAR - null check in method if (boundHere) { // unbind if we bound TransactionSynchronizationManager.unbindResource(this.getConnectionFactory()); diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/Delivery.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/Delivery.java index 258baf27..68a0121f 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/Delivery.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/Delivery.java @@ -38,12 +38,12 @@ public class Delivery { private final byte[] body; - public Delivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body, - String queue) { //NOSONAR + public Delivery(String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body, // NOSONAR + String queue) { this.consumerTag = consumerTag; this.envelope = envelope; this.properties = properties; - this.body = body; + this.body = body; // NOSONAR this.queue = queue; }