From cdcaa6e9a62be2ea7680e60a2c45cf7a943784e8 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 2 Nov 2022 11:37:48 -0400 Subject: [PATCH] Address Sonar Issues --- ...teInvocationAwareMessageConverterAdapter.java | 6 +----- .../stream/listener/StreamListenerContainer.java | 2 +- .../connection/ConsumerChannelRegistry.java | 4 ++-- .../amqp/rabbit/connection/RabbitAccessor.java | 1 - .../amqp/rabbit/core/RabbitAdmin.java | 16 +++++++--------- .../AbstractMessageListenerContainer.java | 2 +- .../adapter/MessagingMessageListenerAdapter.java | 7 +++---- .../rabbit/retry/RepublishMessageRecoverer.java | 2 +- .../micrometer/RabbitMessageReceiverContext.java | 1 + 9 files changed, 17 insertions(+), 24 deletions(-) diff --git a/spring-amqp/src/main/java/org/springframework/amqp/support/converter/RemoteInvocationAwareMessageConverterAdapter.java b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/RemoteInvocationAwareMessageConverterAdapter.java index 41199af6..61fe092e 100644 --- a/spring-amqp/src/main/java/org/springframework/amqp/support/converter/RemoteInvocationAwareMessageConverterAdapter.java +++ b/spring-amqp/src/main/java/org/springframework/amqp/support/converter/RemoteInvocationAwareMessageConverterAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2021 the original author or authors. + * Copyright 2016-2022 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. @@ -34,17 +34,13 @@ public class RemoteInvocationAwareMessageConverterAdapter implements MessageConv private final MessageConverter delegate; - private final boolean shouldSetClassLoader; - public RemoteInvocationAwareMessageConverterAdapter() { this.delegate = new SimpleMessageConverter(); - this.shouldSetClassLoader = true; } public RemoteInvocationAwareMessageConverterAdapter(MessageConverter delegate) { Assert.notNull(delegate, "'delegate' converter cannot be null"); this.delegate = delegate; - this.shouldSetClassLoader = false; } @Override diff --git a/spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/listener/StreamListenerContainer.java b/spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/listener/StreamListenerContainer.java index 201abed3..ea5d2fe8 100644 --- a/spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/listener/StreamListenerContainer.java +++ b/spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/listener/StreamListenerContainer.java @@ -103,7 +103,7 @@ public class StreamListenerContainer implements MessageListenerContainer, BeanNa * Mutually exclusive with {@link #superStream(String, String)}. */ @Override - public void setQueueNames(String... queueNames) { + public synchronized void setQueueNames(String... queueNames) { Assert.isTrue(!this.superStream, "setQueueNames() and superStream() are mutually exclusive"); Assert.isTrue(queueNames != null && queueNames.length == 1, "Only one stream is supported"); this.builder.stream(queueNames[0]); diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConsumerChannelRegistry.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConsumerChannelRegistry.java index 1d2b61ab..0aac6947 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConsumerChannelRegistry.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/ConsumerChannelRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2022 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. @@ -101,7 +101,7 @@ public final class ConsumerChannelRegistry { public static Channel getConsumerChannel(ConnectionFactory connectionFactory) { ChannelHolder channelHolder = consumerChannel.get(); Channel channel = null; - if (channelHolder != null && channelHolder.getConnectionFactory() == connectionFactory) { + if (channelHolder != null && channelHolder.getConnectionFactory().equals(connectionFactory)) { channel = channelHolder.getChannel(); } return channel; diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitAccessor.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitAccessor.java index b8c23f63..88d7d9b6 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitAccessor.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/RabbitAccessor.java @@ -126,7 +126,6 @@ public abstract class RabbitAccessor implements InitializingBean { } } - @Nullable protected ObservationRegistry getObservationRegistry() { return this.observationRegistry; } 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 6644c447..4cfb540d 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 @@ -264,11 +264,10 @@ public class RabbitAdmin implements AmqpAdmin, ApplicationContextAware, Applicat Iterator> iterator = this.manualDeclarables.entrySet().iterator(); while (iterator.hasNext()) { Entry next = iterator.next(); - if (next.getValue() instanceof Binding binding) { - if ((!binding.isDestinationQueue() && binding.getDestination().equals(exchangeName)) - || binding.getExchange().equals(exchangeName)) { - iterator.remove(); - } + if (next.getValue() instanceof Binding binding && + ((!binding.isDestinationQueue() && binding.getDestination().equals(exchangeName)) + || binding.getExchange().equals(exchangeName))) { + iterator.remove(); } } } @@ -362,10 +361,9 @@ public class RabbitAdmin implements AmqpAdmin, ApplicationContextAware, Applicat Iterator> iterator = this.manualDeclarables.entrySet().iterator(); while (iterator.hasNext()) { Entry next = iterator.next(); - if (next.getValue() instanceof Binding binding) { - if (binding.isDestinationQueue() && binding.getDestination().equals(queueName)) { - iterator.remove(); - } + if (next.getValue() instanceof Binding binding && + (binding.isDestinationQueue() && binding.getDestination().equals(queueName))) { + iterator.remove(); } } } 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 156c55c0..3a76dab6 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 @@ -1642,7 +1642,7 @@ public abstract class AbstractMessageListenerContainer extends RabbitAccessor if (listener instanceof ChannelAwareMessageListener chaml) { doInvokeListener(chaml, channel, data); } - else if (listener instanceof MessageListener msgListener) { + else if (listener instanceof MessageListener msgListener) { // NOSONAR boolean bindChannel = isExposeListenerChannel() && isChannelLocallyTransacted(); if (bindChannel) { RabbitResourceHolder resourceHolder = new RabbitResourceHolder(channel, false); diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java index 27fa54ea..d38bab75 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/adapter/MessagingMessageListenerAdapter.java @@ -436,10 +436,9 @@ public class MessagingMessageListenerAdapter extends AbstractAdaptableMessageLis || parameterType.equals(org.springframework.amqp.core.Message.class)) { return false; } - if (parameterType instanceof ParameterizedType parameterizedType) { - if (parameterizedType.getRawType().equals(Message.class)) { - return !(parameterizedType.getActualTypeArguments()[0] instanceof WildcardType); - } + if (parameterType instanceof ParameterizedType parameterizedType && + (parameterizedType.getRawType().equals(Message.class))) { + return !(parameterizedType.getActualTypeArguments()[0] instanceof WildcardType); } return !parameterType.equals(Message.class); // could be Message without a generic type } diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/retry/RepublishMessageRecoverer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/retry/RepublishMessageRecoverer.java index 304e4f7a..ae84767a 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/retry/RepublishMessageRecoverer.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/retry/RepublishMessageRecoverer.java @@ -113,7 +113,7 @@ public class RepublishMessageRecoverer implements MessageRecoverer { public RepublishMessageRecoverer(AmqpTemplate errorTemplate, @Nullable String errorExchange, @Nullable String errorRoutingKey) { - this(errorTemplate, new LiteralExpression(errorExchange), new LiteralExpression(errorRoutingKey)); + this(errorTemplate, new LiteralExpression(errorExchange), new LiteralExpression(errorRoutingKey)); // NOSONAR } /** diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/micrometer/RabbitMessageReceiverContext.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/micrometer/RabbitMessageReceiverContext.java index f37b56f1..6e6deb5b 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/micrometer/RabbitMessageReceiverContext.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/support/micrometer/RabbitMessageReceiverContext.java @@ -30,6 +30,7 @@ import io.micrometer.observation.transport.ReceiverContext; */ public class RabbitMessageReceiverContext extends ReceiverContext { + @Nullable private final String listenerId; private final Message message;