Address PR comments

Signed-off-by: Jiandong Ma <[email protected]>

Author: mjd507

spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java

@@ -17,6 +17,7 @@
 package org.springframework.integration.jms;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.micrometer.observation.ObservationRegistry;
@@ -114,7 +115,8 @@ public class ChannelPublishingJmsMessageListener
 
 	private JmsHeaderMapper headerMapper = new DefaultJmsHeaderMapper();
 
-	private @Nullable BeanFactory beanFactory;
+	@SuppressWarnings("NullAway.Init")
+	private BeanFactory beanFactory;
 
 	private MessageBuilderFactory messageBuilderFactory = new DefaultMessageBuilderFactory();
 
@@ -175,8 +177,8 @@ public void setShouldTrack(boolean shouldTrack) {
 	}
 
 	@Override
-	public @Nullable String getComponentName() {
-		return this.gatewayDelegate.getComponentName();
+	public String getComponentName() {
+		return Objects.requireNonNull(this.gatewayDelegate.getComponentName());
 	}
 
 	@Override

spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsInboundGateway.java

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.jms;
 
+import java.util.Objects;
+
 import io.micrometer.observation.ObservationRegistry;
 import org.jspecify.annotations.Nullable;
 
@@ -157,8 +159,7 @@ public void setBeanFactory(BeanFactory beanFactory) {
 
 	@Override
 	protected void onInit() {
-		String componentName = getComponentName();
-		this.endpoint.setComponentName(componentName == null ? "jms-inbound-gateway" : componentName);
+		this.endpoint.setComponentName(Objects.requireNonNull(getComponentName()));
 		this.endpoint.afterPropertiesSet();
 	}
 

spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java

@@ -16,6 +16,8 @@
 
 package org.springframework.integration.jms;
 
+import java.util.Objects;
+
 import io.micrometer.observation.ObservationRegistry;
 import org.jspecify.annotations.Nullable;
 
@@ -219,8 +221,7 @@ protected void onInit() {
 				this.listenerContainer.setSessionAcknowledgeMode(acknowledgeMode);
 			}
 		}
-		String componentName = getComponentName();
-		this.listener.setComponentName(componentName == null ? "jms-message-listener" : componentName);
+		this.listener.setComponentName(Objects.requireNonNull(getComponentName()));
 	}
 
 	@Override

spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java

@@ -21,7 +21,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
@@ -753,7 +752,7 @@ public boolean isRunning() {
 							this.replyContainer.start();
 							this.idleTask =
 									getTaskScheduler()
-											.scheduleAtFixedRate(new IdleContainerStopper(),
+											.scheduleAtFixedRate(new IdleContainerStopper(this.replyContainer),
 													Duration.ofMillis(this.idleReplyContainerTimeout / 2));
 						}
 					}
@@ -809,10 +808,10 @@ private AbstractIntegrationMessageBuilder<?> buildReply(jakarta.jms.Message jmsR
 		}
 	}
 
+	@SuppressWarnings("NullAway") // Dataflow analysis limitation
 	private @Nullable Object sendAndReceiveWithContainer(Message<?> requestMessage) throws JMSException {
 		Connection connection = createConnection(); // NOSONAR - closed in ConnectionFactoryUtils.
 		Session session = null;
-		Assert.notNull(this.replyContainer, "'replyContainer' must not be null");
 		Destination replyTo = this.replyContainer.getReplyDestination();
 		try {
 			session = createSession(connection);
@@ -1074,6 +1073,7 @@ else if (replyTo instanceof TemporaryQueue || replyTo instanceof TemporaryTopic)
 		}
 	}
 
+	@SuppressWarnings("NullAway") // Dataflow analysis limitation
 	private @Nullable Object doSendAndReceiveAsync(Destination reqDestination, jakarta.jms.Message jmsRequest, Session session,
 			int priority) throws JMSException {
 
@@ -1082,7 +1082,6 @@ else if (replyTo instanceof TemporaryQueue || replyTo instanceof TemporaryTopic)
 		try {
 			messageProducer = session.createProducer(reqDestination);
 			correlation = this.gatewayCorrelation + "_" + this.correlationId.incrementAndGet();
-			Assert.notNull(this.correlationKey, "'correlationKey' must not be null");
 			if (this.correlationKey.equals("JMSCorrelationID")) {
 				jmsRequest.setJMSCorrelationID(correlation);
 			}
@@ -1113,7 +1112,7 @@ else if (replyTo instanceof TemporaryQueue || replyTo instanceof TemporaryTopic)
 				return future;
 			}
 			else {
-				return obtainReplyFromContainer(correlation, Objects.requireNonNull(replyQueue));
+				return obtainReplyFromContainer(correlation, replyQueue);
 			}
 		}
 		finally {
@@ -1495,7 +1494,10 @@ public void run() {
 
 	private class IdleContainerStopper implements Runnable {
 
-		IdleContainerStopper() {
+		private final GatewayReplyListenerContainer replyContainer;
+
+		IdleContainerStopper(GatewayReplyListenerContainer replyContainer) {
+			this.replyContainer = replyContainer;
 		}
 
 		@Override
@@ -1505,11 +1507,14 @@ public void run() {
 				if (System.currentTimeMillis() - JmsOutboundGateway.this.lastSend >
 						JmsOutboundGateway.this.idleReplyContainerTimeout
 						&& JmsOutboundGateway.this.replies.isEmpty() &&
-						Objects.requireNonNull(JmsOutboundGateway.this.replyContainer).isRunning()) {
+						this.replyContainer.isRunning()) {
 
 					logger.debug(() -> getComponentName() + ": Stopping idle reply container.");
-					JmsOutboundGateway.this.replyContainer.stop();
-					Objects.requireNonNull(JmsOutboundGateway.this.idleTask).cancel(false);
+					this.replyContainer.stop();
+					ScheduledFuture<?> idleTask = JmsOutboundGateway.this.idleTask;
+					if (idleTask != null) {
+						idleTask.cancel(false);
+					}
 					JmsOutboundGateway.this.idleTask = null;
 				}
 			}

spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java

@@ -209,6 +209,7 @@ private static final class DispatchingMessageListener implements MessageListener
 			this.messageBuilderFactory = messageBuilderFactory;
 		}
 
+		@SuppressWarnings("NullAway") // Dataflow analysis limitation
 		@Override
 		public void onMessage(jakarta.jms.Message message) {
 			Message<?> messageToSend = null;
@@ -240,9 +241,7 @@ else if (this.logger.isWarnEnabled()) {
 					}
 				}
 				else {
-					throw messageToSend != null
-							? new MessageDeliveryException(messageToSend, exceptionMessage, e)
-							: new MessageDeliveryException(exceptionMessage);
+					throw new MessageDeliveryException(messageToSend, exceptionMessage, e);
 				}
 			}
 			catch (Exception e) {