Add nullability to org.springframework.messaging.core package

Author: cppwfs

spring-integration-core/src/main/java/org/springframework/integration/core/ErrorMessagePublisher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 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.
@@ -18,6 +18,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
@@ -27,7 +28,6 @@
 import org.springframework.integration.support.ErrorMessageStrategy;
 import org.springframework.integration.support.ErrorMessageUtils;
 import org.springframework.integration.support.channel.ChannelResolverUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessagingException;
@@ -54,10 +54,13 @@ public class ErrorMessagePublisher implements BeanFactoryAware {
 
 	protected final MessagingTemplate messagingTemplate = new MessagingTemplate(); // NOSONAR final
 
+	@SuppressWarnings("NullAway.Init")
 	private DestinationResolver<MessageChannel> channelResolver;
 
+	@Nullable
 	private MessageChannel channel;
 
+	@Nullable
 	private String channelName;
 
 	private ErrorMessageStrategy errorMessageStrategy = new DefaultErrorMessageStrategy();
@@ -79,6 +82,7 @@ public ErrorMessageStrategy getErrorMessageStrategy() {
 		return this.errorMessageStrategy;
 	}
 
+	@Nullable
 	public MessageChannel getChannel() {
 		populateChannel();
 		return this.channel;
@@ -146,7 +150,7 @@ public void publish(Message<?> inputMessage, MessagingException exception) {
 	 * @param failedMessage the message.
 	 * @param throwable the throwable.
 	 */
-	public void publish(@Nullable Message<?> inputMessage, Message<?> failedMessage, Throwable throwable) {
+	public void publish(@Nullable Message<?> inputMessage, @Nullable Message<?> failedMessage, Throwable throwable) {
 		publish(throwable, ErrorMessageUtils.getAttributeAccessor(inputMessage, failedMessage));
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/core/MessageProducer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 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.
@@ -16,7 +16,8 @@
 
 package org.springframework.integration.core;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.messaging.MessageChannel;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java

@@ -19,12 +19,13 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.context.IntegrationProperties;
 import org.springframework.integration.support.channel.ChannelResolverUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.core.GenericMessagingTemplate;
@@ -43,6 +44,7 @@ public class MessagingTemplate extends GenericMessagingTemplate {
 
 	private final Lock lock = new ReentrantLock();
 
+	@SuppressWarnings("NullAway.Init")
 	private BeanFactory beanFactory;
 
 	private volatile boolean throwExceptionOnLateReplySet;
@@ -83,7 +85,7 @@ public void setThrowExceptionOnLateReply(boolean throwExceptionOnLateReply) {
 	 * backward compatibility.
 	 * @param channel the channel to set.
 	 */
-	public void setDefaultChannel(MessageChannel channel) {
+	public void setDefaultChannel(@Nullable MessageChannel channel) {
 		super.setDefaultDestination(channel);
 	}
 
@@ -108,6 +110,7 @@ public Message<?> sendAndReceive(MessageChannel destination, Message<?> requestM
 		return super.sendAndReceive(destination, requestMessage);
 	}
 
+	@Nullable
 	public Object receiveAndConvert(MessageChannel destination, long timeout) {
 		Message<?> message = doReceive(destination, timeout);
 		if (message != null) {
@@ -117,7 +120,7 @@ public Object receiveAndConvert(MessageChannel destination, long timeout) {
 			return null;
 		}
 	}
-
+	@Nullable
 	public Message<?> receive(MessageChannel destination, long timeout) {
 		return doReceive(destination, timeout);
 	}

spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java

@@ -1,4 +1,5 @@
 /**
  * Provides core classes.
  */
+@org.jspecify.annotations.NullMarked
 package org.springframework.integration.core;