Improve conditions in code

* Reduce `else` condition and modernize switch pattern
* Check condition after calling lock method
* Some additional code clean up

spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/producer/RabbitStreamTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 the original author or authors.
+ * Copyright 2021-2024 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.
@@ -55,6 +55,7 @@ import io.micrometer.observation.ObservationRegistry;
  *
  * @author Gary Russell
  * @author Christian Tzolov
+ * @author Ngoc Nhan
  * @since 2.4
  *
  */
@@ -107,29 +108,31 @@ public class RabbitStreamTemplate implements RabbitStreamOperations, Application
 
 
 	private Producer createOrGetProducer() {
-		this.lock.lock();
-		try {
-			if (this.producer == null) {
-				ProducerBuilder builder = this.environment.producerBuilder();
-				if (this.superStreamRouting == null) {
-					builder.stream(this.streamName);
-				}
-				else {
-					builder.superStream(this.streamName)
-							.routing(this.superStreamRouting);
-				}
-				this.producerCustomizer.accept(this.beanName, builder);
-				this.producer = builder.build();
-				if (!this.streamConverterSet) {
-					((DefaultStreamMessageConverter) this.streamConverter).setBuilderSupplier(
-							() -> this.producer.messageBuilder());
+		if (this.producer == null) {
+			this.lock.lock();
+			try {
+				if (this.producer == null) {
+					ProducerBuilder builder = this.environment.producerBuilder();
+					if (this.superStreamRouting == null) {
+						builder.stream(this.streamName);
+					}
+					else {
+						builder.superStream(this.streamName)
+								.routing(this.superStreamRouting);
+					}
+					this.producerCustomizer.accept(this.beanName, builder);
+					this.producer = builder.build();
+					if (!this.streamConverterSet) {
+						((DefaultStreamMessageConverter) this.streamConverter).setBuilderSupplier(
+								() -> this.producer.messageBuilder());
+					}
 				}
 			}
-			return this.producer;
-		}
-		finally {
-			this.lock.unlock();
+			finally {
+				this.lock.unlock();
+			}
 		}
+		return this.producer;
 	}
 
 	@Override
@@ -305,24 +308,13 @@ public class RabbitStreamTemplate implements RabbitStreamOperations, Application
 			}
 			else {
 				int code = confStatus.getCode();
-				String errorMessage;
-				switch (code) {
-				case Constants.CODE_MESSAGE_ENQUEUEING_FAILED:
-					errorMessage = "Message Enqueueing Failed";
-					break;
-				case Constants.CODE_PRODUCER_CLOSED:
-					errorMessage = "Producer Closed";
-					break;
-				case Constants.CODE_PRODUCER_NOT_AVAILABLE:
-					errorMessage = "Producer Not Available";
-					break;
-				case Constants.CODE_PUBLISH_CONFIRM_TIMEOUT:
-					errorMessage = "Publish Confirm Timeout";
-					break;
-				default:
-					errorMessage = "Unknown code: " + code;
-					break;
-				}
+				String errorMessage = switch (code) {
+					case Constants.CODE_MESSAGE_ENQUEUEING_FAILED -> "Message Enqueueing Failed";
+					case Constants.CODE_PRODUCER_CLOSED -> "Producer Closed";
+					case Constants.CODE_PRODUCER_NOT_AVAILABLE -> "Producer Not Available";
+					case Constants.CODE_PUBLISH_CONFIRM_TIMEOUT -> "Publish Confirm Timeout";
+					default -> "Unknown code: " + code;
+				};
 				StreamSendException ex = new StreamSendException(errorMessage, code);
 				observation.error(ex);
 				observation.stop();
@@ -339,15 +331,17 @@ public class RabbitStreamTemplate implements RabbitStreamOperations, Application
 	 */
 	@Override
 	public void close() {
-		this.lock.lock();
-		try {
-			if (this.producer != null) {
-				this.producer.close();
-				this.producer = null;
+		if (this.producer != null) {
+			this.lock.lock();
+			try {
+				if (this.producer != null) {
+					this.producer.close();
+					this.producer = null;
+				}
+			}
+			finally {
+				this.lock.unlock();
 			}
-		}
-		finally {
-			this.lock.unlock();
 		}
 	}
 

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/annotation/RabbitListenerAnnotationBeanPostProcessor.java

@@ -76,6 +76,7 @@ import org.springframework.context.EnvironmentAware;
 import org.springframework.context.expression.StandardBeanExpressionResolver;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
 import org.springframework.core.convert.ConversionService;
@@ -357,7 +358,7 @@ public class RabbitListenerAnnotationBeanPostProcessor
 					}
 					return !name.contains("$MockitoMock$");
 				})
-				.map(ann -> ann.synthesize())
+				.map(MergedAnnotation::synthesize)
 				.collect(Collectors.toList());
 	}
 
@@ -893,7 +894,7 @@ public class RabbitListenerAnnotationBeanPostProcessor
 			}
 		}
 		else {
-			if (value instanceof String && !StringUtils.hasText((String) value)) {
+			if (value instanceof String string && !StringUtils.hasText(string)) {
 				putEmpty(map, key);
 			}
 			else {

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/batch/SimpleBatchingStrategy.java

@@ -107,13 +107,12 @@ public class SimpleBatchingStrategy implements BatchingStrategy {
 		if (this.messages.isEmpty() || this.timeout <= 0) {
 			return null;
 		}
-		else if (this.currentSize >= this.bufferLimit) {
+		if (this.currentSize >= this.bufferLimit) {
 			// release immediately, we're already over the limit
 			return new Date();
 		}
-		else {
-			return new Date(System.currentTimeMillis() + this.timeout);
-		}
+
+		return new Date(System.currentTimeMillis() + this.timeout);
 	}
 
 	@Override
@@ -122,9 +121,8 @@ public class SimpleBatchingStrategy implements BatchingStrategy {
 		if (batch == null) {
 			return Collections.emptyList();
 		}
-		else {
-			return Collections.singletonList(batch);
-		}
+
+		return Collections.singletonList(batch);
 	}
 
 	private MessageBatch doReleaseBatch() {

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

@@ -575,14 +575,13 @@ public class ListenerContainerFactoryBean extends AbstractFactoryBean<AbstractMe
 					.acceptIfNotNull(this.retryDeclarationInterval, container::setRetryDeclarationInterval);
 			return container;
 		}
-		else {
-			DirectMessageListenerContainer container = new DirectMessageListenerContainer(this.connectionFactory);
-			JavaUtils.INSTANCE
-					.acceptIfNotNull(this.consumersPerQueue, container::setConsumersPerQueue)
-					.acceptIfNotNull(this.taskScheduler, container::setTaskScheduler)
-					.acceptIfNotNull(this.monitorInterval, container::setMonitorInterval);
-			return container;
-		}
+
+		DirectMessageListenerContainer container = new DirectMessageListenerContainer(this.connectionFactory);
+		JavaUtils.INSTANCE
+				.acceptIfNotNull(this.consumersPerQueue, container::setConsumersPerQueue)
+				.acceptIfNotNull(this.taskScheduler, container::setTaskScheduler)
+				.acceptIfNotNull(this.monitorInterval, container::setMonitorInterval);
+		return container;
 	}
 
 	@Override

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

@@ -101,8 +101,8 @@ class ListenerContainerParser implements BeanDefinitionParser {
 		}
 
 		List<Element> childElements = DomUtils.getChildElementsByTagName(element, LISTENER_ELEMENT);
-		for (int i = 0; i < childElements.size(); i++) {
-			parseListener(childElements.get(i), element, parserContext, containerList);
+		for (Element childElement : childElements) {
+			parseListener(childElement, element, parserContext, containerList);
 		}
 
 		parserContext.popAndRegisterContainingComponent();
@@ -190,8 +190,8 @@ class ListenerContainerParser implements BeanDefinitionParser {
 			else {
 				String[] names = StringUtils.commaDelimitedListToStringArray(queues);
 				List<RuntimeBeanReference> values = new ManagedList<>();
-				for (int i = 0; i < names.length; i++) {
-					values.add(new RuntimeBeanReference(names[i].trim()));
+				for (String name : names) {
+					values.add(new RuntimeBeanReference(name.trim()));
 				}
 				containerDef.getPropertyValues().add("queues", values);
 			}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -27,12 +27,14 @@ import org.springframework.amqp.rabbit.retry.MessageBatchRecoverer;
 import org.springframework.amqp.rabbit.retry.MessageKeyGenerator;
 import org.springframework.amqp.rabbit.retry.MessageRecoverer;
 import org.springframework.amqp.rabbit.retry.NewMessageIdentifier;
+import org.springframework.lang.Nullable;
 import org.springframework.retry.RetryOperations;
 import org.springframework.retry.interceptor.MethodArgumentsKeyGenerator;
 import org.springframework.retry.interceptor.MethodInvocationRecoverer;
 import org.springframework.retry.interceptor.NewMethodArgumentsIdentifier;
 import org.springframework.retry.interceptor.StatefulRetryOperationsInterceptor;
 import org.springframework.retry.support.RetryTemplate;
+import org.springframework.util.Assert;
 
 /**
  * Convenient factory bean for creating a stateful retry interceptor for use in a message listener container, giving you
@@ -47,6 +49,7 @@ import org.springframework.retry.support.RetryTemplate;
  *
  * @author Dave Syer
  * @author Gary Russell
+ * @author Ngoc Nhan
  *
  * @see RetryOperations#execute(org.springframework.retry.RetryCallback, org.springframework.retry.RecoveryCallback,
  * org.springframework.retry.RetryState)
@@ -90,9 +93,8 @@ public class StatefulRetryOperationsInterceptorFactoryBean extends AbstractRetry
 			if (StatefulRetryOperationsInterceptorFactoryBean.this.newMessageIdentifier == null) {
 				return !message.getMessageProperties().isRedelivered();
 			}
-			else {
-				return StatefulRetryOperationsInterceptorFactoryBean.this.newMessageIdentifier.isNew(message);
-			}
+
+			return StatefulRetryOperationsInterceptorFactoryBean.this.newMessageIdentifier.isNew(message);
 		};
 	}
 
@@ -120,6 +122,7 @@ public class StatefulRetryOperationsInterceptorFactoryBean extends AbstractRetry
 	private MethodArgumentsKeyGenerator createKeyGenerator() {
 		return args -> {
 			Message message = argToMessage(args);
+			Assert.notNull(message, "The 'args' must not convert to null");
 			if (StatefulRetryOperationsInterceptorFactoryBean.this.messageKeyGenerator == null) {
 				String messageId = message.getMessageProperties().getMessageId();
 				if (messageId == null && message.getMessageProperties().isRedelivered()) {
@@ -127,23 +130,20 @@ public class StatefulRetryOperationsInterceptorFactoryBean extends AbstractRetry
 				}
 				return messageId;
 			}
-			else {
-				return StatefulRetryOperationsInterceptorFactoryBean.this.messageKeyGenerator.getKey(message);
-			}
+			return StatefulRetryOperationsInterceptorFactoryBean.this.messageKeyGenerator.getKey(message);
 		};
 	}
 
-	@SuppressWarnings("unchecked")
+	@Nullable
 	private Message argToMessage(Object[] args) {
 		Object arg = args[1];
-		Message message = null;
 		if (arg instanceof Message msg) {
-			message = msg;
+			return msg;
 		}
-		else if (arg instanceof List) {
-			message = ((List<Message>) arg).get(0);
+		if (arg instanceof List<?> list) {
+			return (Message) list.get(0);
 		}
-		return message;
+		return null;
 	}
 
 	@Override
@@ -151,9 +151,4 @@ public class StatefulRetryOperationsInterceptorFactoryBean extends AbstractRetry
 		return StatefulRetryOperationsInterceptor.class;
 	}
 
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
 }

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

@@ -69,7 +69,7 @@ public abstract class AbstractRoutingConnectionFactory implements ConnectionFact
 		Assert.noNullElements(targetConnectionFactories.values().toArray(),
 				"'targetConnectionFactories' cannot have null values.");
 		this.targetConnectionFactories.putAll(targetConnectionFactories);
-		targetConnectionFactories.values().stream().forEach(cf -> checkConfirmsAndReturns(cf));
+		targetConnectionFactories.values().forEach(this::checkConfirmsAndReturns);
 	}
 
 	/**
@@ -293,7 +293,7 @@ public abstract class AbstractRoutingConnectionFactory implements ConnectionFact
 
 	@Override
 	public void resetConnection() {
-		this.targetConnectionFactories.values().forEach(factory -> factory.resetConnection());
+		this.targetConnectionFactories.values().forEach(ConnectionFactory::resetConnection);
 		this.defaultTargetConnectionFactory.resetConnection();
 	}
 

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

@@ -84,11 +84,9 @@ public final class ConsumerChannelRegistry {
 	@Nullable
 	public static Channel getConsumerChannel() {
 		ChannelHolder channelHolder = consumerChannel.get();
-		Channel channel = null;
-		if (channelHolder != null) {
-			channel = channelHolder.getChannel();
-		}
-		return channel;
+		return channelHolder != null
+				? channelHolder.getChannel()
+				: null;
 	}
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -27,6 +27,7 @@ import org.springframework.lang.Nullable;
  * expired. It also holds {@link CorrelationData} for
  * the client to correlate a confirm with a sent message.
  * @author Gary Russell
+ * @author Ngoc Nhan
  * @since 1.0.1
  *
  */
@@ -115,7 +116,7 @@ public class PendingConfirm {
 	 * @since 2.2.10
 	 */
 	public boolean waitForReturnIfNeeded() throws InterruptedException {
-		return this.returned ? this.latch.await(RETURN_CALLBACK_TIMEOUT, TimeUnit.SECONDS) : true;
+		return !this.returned || this.latch.await(RETURN_CALLBACK_TIMEOUT, TimeUnit.SECONDS);
 	}
 
 	/**

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

@@ -55,6 +55,7 @@ import com.rabbitmq.client.ShutdownListener;
  * @author Gary Russell
  * @author Leonardo Ferreira
  * @author Christian Tzolov
+ * @author Ngoc Nhan
  * @since 2.3
  *
  */
@@ -255,23 +256,21 @@ public class PooledChannelConnectionFactory extends AbstractConnectionFactory
 			Advice advice =
 					(MethodInterceptor) invocation -> {
 						String method = invocation.getMethod().getName();
-						switch (method) {
-						case "close":
-							handleClose(channel, transacted, proxy);
-							return null;
-						case "getTargetChannel":
-							return channel;
-						case "isTransactional":
-							return transacted;
-						case "confirmSelect":
-							confirmSelected.set(true);
-							return channel.confirmSelect();
-						case "isConfirmSelected":
-							return confirmSelected.get();
-						case "isPublisherConfirms":
-							return false;
-						}
-						return null;
+						return switch (method) {
+							case "close" -> {
+								handleClose(channel, transacted, proxy);
+								yield null;
+							}
+							case "getTargetChannel" -> channel;
+							case "isTransactional" -> transacted;
+							case "confirmSelect" -> {
+								confirmSelected.set(true);
+								yield channel.confirmSelect();
+							}
+							case "isConfirmSelected" -> confirmSelected.get();
+							case "isPublisherConfirms" -> false;
+							default -> null;
+						};
 					};
 			NameMatchMethodPointcutAdvisor advisor = new NameMatchMethodPointcutAdvisor(advice);
 			advisor.addMethodName("close");

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

@@ -922,27 +922,26 @@ public class PublisherCallbackChannelImpl
 		try {
 			SortedMap<Long, PendingConfirm> pendingConfirmsForListener = this.pendingConfirms.get(listener);
 			if (pendingConfirmsForListener == null) {
-				return Collections.<PendingConfirm>emptyList();
+				return Collections.emptyList();
 			}
-			else {
-				List<PendingConfirm> expired = new ArrayList<>();
-				Iterator<Entry<Long, PendingConfirm>> iterator = pendingConfirmsForListener.entrySet().iterator();
-				while (iterator.hasNext()) {
-					PendingConfirm pendingConfirm = iterator.next().getValue();
-					if (pendingConfirm.getTimestamp() < cutoffTime) {
-						expired.add(pendingConfirm);
-						iterator.remove();
-						CorrelationData correlationData = pendingConfirm.getCorrelationData();
-						if (correlationData != null && StringUtils.hasText(correlationData.getId())) {
-							this.pendingReturns.remove(correlationData.getId()); // NOSONAR never null
-						}
-					}
-					else {
-						break;
+
+			List<PendingConfirm> expired = new ArrayList<>();
+			Iterator<Entry<Long, PendingConfirm>> iterator = pendingConfirmsForListener.entrySet().iterator();
+			while (iterator.hasNext()) {
+				PendingConfirm pendingConfirm = iterator.next().getValue();
+				if (pendingConfirm.getTimestamp() < cutoffTime) {
+					expired.add(pendingConfirm);
+					iterator.remove();
+					CorrelationData correlationData = pendingConfirm.getCorrelationData();
+					if (correlationData != null && StringUtils.hasText(correlationData.getId())) {
+						this.pendingReturns.remove(correlationData.getId()); // NOSONAR never null
 					}
 				}
-				return expired;
+				else {
+					break;
+				}
 			}
+			return expired;
 		}
 		finally {
 			this.lock.unlock();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -79,6 +79,7 @@ import com.rabbitmq.client.impl.nio.NioParams;
  * @author Hareendran
  * @author Dominique Villard
  * @author Zachary DeLuca
+ * @author Ngoc Nhan
  *
  * @since 1.4
  */
@@ -360,12 +361,11 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
 		if (this.keyStoreType == null && this.sslProperties.getProperty(KEY_STORE_TYPE) == null) {
 			return KEY_STORE_DEFAULT_TYPE;
 		}
-		else if (this.keyStoreType != null) {
+		if (this.keyStoreType != null) {
 			return this.keyStoreType;
 		}
-		else {
-			return this.sslProperties.getProperty(KEY_STORE_TYPE);
-		}
+
+		return this.sslProperties.getProperty(KEY_STORE_TYPE);
 	}
 
 	/**
@@ -389,12 +389,11 @@ public class RabbitConnectionFactoryBean extends AbstractFactoryBean<ConnectionF
 		if (this.trustStoreType == null && this.sslProperties.getProperty(TRUST_STORE_TYPE) == null) {
 			return TRUST_STORE_DEFAULT_TYPE;
 		}
-		else if (this.trustStoreType != null) {
+		if (this.trustStoreType != null) {
 			return this.trustStoreType;
 		}
-		else {
-			return this.sslProperties.getProperty(TRUST_STORE_TYPE);
-		}
+
+		return this.sslProperties.getProperty(TRUST_STORE_TYPE);
 	}
 
 	/**

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

@@ -228,12 +228,7 @@ public abstract class RabbitUtils {
 	 */
 	public static boolean isPhysicalCloseRequired() {
 		Boolean mustClose = physicalCloseRequired.get();
-		if (mustClose == null) {
-			return false;
-		}
-		else {
-			return mustClose;
-		}
+		return mustClose != null && mustClose;
 	}
 
 	/**
@@ -322,13 +317,12 @@ public abstract class RabbitUtils {
 		if (sig == null) {
 			return false;
 		}
-		else {
-			Method shutdownReason = sig.getReason();
-			return shutdownReason instanceof AMQP.Channel.Close closeReason
-					&& AMQP.PRECONDITION_FAILED == closeReason.getReplyCode()
-					&& closeReason.getClassId() == QUEUE_CLASS_ID_50
-					&& closeReason.getMethodId() == DECLARE_METHOD_ID_10;
-		}
+
+		Method shutdownReason = sig.getReason();
+		return shutdownReason instanceof AMQP.Channel.Close closeReason
+				&& AMQP.PRECONDITION_FAILED == closeReason.getReplyCode()
+				&& closeReason.getClassId() == QUEUE_CLASS_ID_50
+				&& closeReason.getMethodId() == DECLARE_METHOD_ID_10;
 	}
 
 	/**
@@ -352,13 +346,12 @@ public abstract class RabbitUtils {
 		if (sig == null) {
 			return false;
 		}
-		else {
-			Method shutdownReason = sig.getReason();
-			return shutdownReason instanceof AMQP.Channel.Close closeReason
-					&& AMQP.PRECONDITION_FAILED == closeReason.getReplyCode()
-					&& closeReason.getClassId() == EXCHANGE_CLASS_ID_40
-					&& closeReason.getMethodId() == DECLARE_METHOD_ID_10;
-		}
+
+		Method shutdownReason = sig.getReason();
+		return shutdownReason instanceof AMQP.Channel.Close closeReason
+				&& AMQP.PRECONDITION_FAILED == closeReason.getReplyCode()
+				&& closeReason.getClassId() == EXCHANGE_CLASS_ID_40
+				&& closeReason.getMethodId() == DECLARE_METHOD_ID_10;
 	}
 
 	/**
@@ -395,18 +388,13 @@ public abstract class RabbitUtils {
 	public static SaslConfig stringToSaslConfig(String saslConfig,
 			com.rabbitmq.client.ConnectionFactory connectionFactory) {
 
-		switch (saslConfig) {
-		case "DefaultSaslConfig.PLAIN":
-			return DefaultSaslConfig.PLAIN;
-		case "DefaultSaslConfig.EXTERNAL":
-			return DefaultSaslConfig.EXTERNAL;
-		case "JDKSaslConfig":
-			return new JDKSaslConfig(connectionFactory);
-		case "CRDemoSaslConfig":
-			return new CRDemoMechanism.CRDemoSaslConfig();
-		default:
-			throw new IllegalStateException("Unrecognized SaslConfig: " + saslConfig);
-		}
+		return switch (saslConfig) {
+			case "DefaultSaslConfig.PLAIN" -> DefaultSaslConfig.PLAIN;
+			case "DefaultSaslConfig.EXTERNAL" -> DefaultSaslConfig.EXTERNAL;
+			case "JDKSaslConfig" -> new JDKSaslConfig(connectionFactory);
+			case "CRDemoSaslConfig" -> new CRDemoMechanism.CRDemoSaslConfig();
+			default -> throw new IllegalStateException("Unrecognized SaslConfig: " + saslConfig);
+		};
 	}
 
 	/**

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

@@ -24,7 +24,6 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-import java.util.stream.Collectors;
 
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInterceptor;
@@ -196,8 +195,8 @@ public class ThreadChannelConnectionFactory extends AbstractConnectionFactory
 				this.logger.warn("Unclaimed context switches from threads:" +
 						this.switchesInProgress.values()
 								.stream()
-								.map(t -> t.getName())
-								.collect(Collectors.toList()));
+								.map(Thread::getName)
+								.toList());
 			}
 			this.contextSwitches.clear();
 			this.switchesInProgress.clear();
@@ -319,23 +318,21 @@ public class ThreadChannelConnectionFactory extends AbstractConnectionFactory
 			Advice advice =
 					(MethodInterceptor) invocation -> {
 						String method = invocation.getMethod().getName();
-						switch (method) {
-							case "close":
+						return switch (method) {
+							case "close" -> {
 								handleClose(channel, transactional);
-								return null;
-							case "getTargetChannel":
-								return channel;
-							case "isTransactional":
-								return transactional;
-							case "confirmSelect":
+								yield null;
+							}
+							case "getTargetChannel" -> channel;
+							case "isTransactional" -> transactional;
+							case "confirmSelect" -> {
 								confirmSelected.set(true);
-								return channel.confirmSelect();
-							case "isConfirmSelected":
-								return confirmSelected.get();
-							case "isPublisherConfirms":
-								return false;
-						}
-						return null;
+								yield channel.confirmSelect();
+							}
+							case "isConfirmSelected" -> confirmSelected.get();
+							case "isPublisherConfirms" -> false;
+							default -> null;
+						};
 					};
 			NameMatchMethodPointcutAdvisor advisor = new NameMatchMethodPointcutAdvisor(advice);
 			advisor.addMethodName("close");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2024 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,6 +34,7 @@ import org.springframework.web.util.UriUtils;
  * A {@link NodeLocator} using the Spring WebFlux {@link WebClient}.
  *
  * @author Gary Russell
+ * @author Ngoc Nhan
  * @since 2.4.8
  *
  */
@@ -46,14 +47,13 @@ public class WebFluxNodeLocator implements NodeLocator<WebClient> {
 
 		URI uri = new URI(baseUri)
 				.resolve("/api/queues/" + UriUtils.encodePathSegment(vhost, StandardCharsets.UTF_8) + "/" + queue);
-		HashMap<String, Object> queueInfo = client.get()
+		return client.get()
 				.uri(uri)
 				.accept(MediaType.APPLICATION_JSON)
 				.retrieve()
 				.bodyToMono(new ParameterizedTypeReference<HashMap<String, Object>>() {
 				})
 				.block(Duration.ofSeconds(10)); // NOSONAR magic#
-		return queueInfo != null ? queueInfo : null;
 	}
 
 	/**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2024 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.
@@ -33,6 +33,7 @@ import io.micrometer.core.instrument.Timer.Sample;
  * Abstraction to avoid hard reference to Micrometer.
  *
  * @author Gary Russell
+ * @author Ngoc Nhan
  * @since 2.4.6
  *
  */
@@ -95,7 +96,7 @@ public final class MicrometerHolder {
 				.tag("result", result)
 				.tag("exception", exception);
 		if (this.tags != null && !this.tags.isEmpty()) {
-			this.tags.forEach((key, value) -> builder.tag(key, value));
+			this.tags.forEach(builder::tag);
 		}
 		Timer registeredTimer = builder.register(this.registry);
 		this.timers.put(queue + exception, registeredTimer);