Add nullability annotations to module/spring-boot-jms

See gh-46587

Author: mhalbritter

documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/howto/messaging/disabletransactedjmssession/MyJmsConfiguration.kt

@@ -28,7 +28,7 @@ import org.springframework.jms.config.DefaultJmsListenerContainerFactory
 class MyJmsConfiguration {
 
 	@Bean
-	fun jmsListenerContainerFactory(connectionFactory: ConnectionFactory?,
+	fun jmsListenerContainerFactory(connectionFactory: ConnectionFactory,
 			configurer: DefaultJmsListenerContainerFactoryConfigurer): DefaultJmsListenerContainerFactory {
 		val listenerFactory = DefaultJmsListenerContainerFactory()
 		configurer.configure(listenerFactory, ConnectionFactoryUnwrapper.unwrapCaching(connectionFactory))

module/spring-boot-jms/src/main/java/org/springframework/boot/jms/ConnectionFactoryUnwrapper.java

@@ -17,6 +17,7 @@
 package org.springframework.boot.jms;
 
 import jakarta.jms.ConnectionFactory;
+import org.jspecify.annotations.Nullable;
 import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
 
 import org.springframework.jms.connection.CachingConnectionFactory;
@@ -57,15 +58,16 @@ public static ConnectionFactory unwrapCaching(ConnectionFactory connectionFactor
 	 * @param connectionFactory a connection factory
 	 * @return the native connection factory that it wraps, if any
 	 */
-	public static ConnectionFactory unwrap(ConnectionFactory connectionFactory) {
+	public static @Nullable ConnectionFactory unwrap(@Nullable ConnectionFactory connectionFactory) {
 		if (connectionFactory instanceof CachingConnectionFactory cachingConnectionFactory) {
 			return unwrap(cachingConnectionFactory.getTargetConnectionFactory());
 		}
 		ConnectionFactory unwrapedConnectionFactory = unwrapFromJmsPoolConnectionFactory(connectionFactory);
 		return (unwrapedConnectionFactory != null) ? unwrap(unwrapedConnectionFactory) : connectionFactory;
 	}
 
-	private static ConnectionFactory unwrapFromJmsPoolConnectionFactory(ConnectionFactory connectionFactory) {
+	private static @Nullable ConnectionFactory unwrapFromJmsPoolConnectionFactory(
+			@Nullable ConnectionFactory connectionFactory) {
 		try {
 			if (connectionFactory instanceof JmsPoolConnectionFactory jmsPoolConnectionFactory) {
 				return (ConnectionFactory) jmsPoolConnectionFactory.getConnectionFactory();

module/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/DefaultJmsListenerContainerFactoryConfigurer.java

@@ -21,6 +21,7 @@
 import io.micrometer.observation.ObservationRegistry;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.ExceptionListener;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.boot.jms.autoconfigure.JmsProperties.Listener.Session;
@@ -46,24 +47,24 @@
  */
 public final class DefaultJmsListenerContainerFactoryConfigurer {
 
-	private DestinationResolver destinationResolver;
+	private @Nullable DestinationResolver destinationResolver;
 
-	private MessageConverter messageConverter;
+	private @Nullable MessageConverter messageConverter;
 
-	private ExceptionListener exceptionListener;
+	private @Nullable ExceptionListener exceptionListener;
 
-	private JtaTransactionManager transactionManager;
+	private @Nullable JtaTransactionManager transactionManager;
 
-	private JmsProperties jmsProperties;
+	private @Nullable JmsProperties jmsProperties;
 
-	private ObservationRegistry observationRegistry;
+	private @Nullable ObservationRegistry observationRegistry;
 
 	/**
 	 * Set the {@link DestinationResolver} to use or {@code null} if no destination
 	 * resolver should be associated with the factory by default.
 	 * @param destinationResolver the {@link DestinationResolver}
 	 */
-	void setDestinationResolver(DestinationResolver destinationResolver) {
+	void setDestinationResolver(@Nullable DestinationResolver destinationResolver) {
 		this.destinationResolver = destinationResolver;
 	}
 
@@ -72,7 +73,7 @@ void setDestinationResolver(DestinationResolver destinationResolver) {
 	 * converter should be used.
 	 * @param messageConverter the {@link MessageConverter}
 	 */
-	void setMessageConverter(MessageConverter messageConverter) {
+	void setMessageConverter(@Nullable MessageConverter messageConverter) {
 		this.messageConverter = messageConverter;
 	}
 
@@ -81,7 +82,7 @@ void setMessageConverter(MessageConverter messageConverter) {
 	 * should be associated by default.
 	 * @param exceptionListener the {@link ExceptionListener}
 	 */
-	void setExceptionListener(ExceptionListener exceptionListener) {
+	void setExceptionListener(@Nullable ExceptionListener exceptionListener) {
 		this.exceptionListener = exceptionListener;
 	}
 
@@ -90,23 +91,23 @@ void setExceptionListener(ExceptionListener exceptionListener) {
 	 * should not be used.
 	 * @param transactionManager the {@link JtaTransactionManager}
 	 */
-	void setTransactionManager(JtaTransactionManager transactionManager) {
+	void setTransactionManager(@Nullable JtaTransactionManager transactionManager) {
 		this.transactionManager = transactionManager;
 	}
 
 	/**
 	 * Set the {@link JmsProperties} to use.
 	 * @param jmsProperties the {@link JmsProperties}
 	 */
-	void setJmsProperties(JmsProperties jmsProperties) {
+	void setJmsProperties(@Nullable JmsProperties jmsProperties) {
 		this.jmsProperties = jmsProperties;
 	}
 
 	/**
 	 * Set the {@link ObservationRegistry} to use.
 	 * @param observationRegistry the {@link ObservationRegistry}
 	 */
-	void setObservationRegistry(ObservationRegistry observationRegistry) {
+	void setObservationRegistry(@Nullable ObservationRegistry observationRegistry) {
 		this.observationRegistry = observationRegistry;
 	}
 
@@ -119,6 +120,7 @@ void setObservationRegistry(ObservationRegistry observationRegistry) {
 	public void configure(DefaultJmsListenerContainerFactory factory, ConnectionFactory connectionFactory) {
 		Assert.notNull(factory, "'factory' must not be null");
 		Assert.notNull(connectionFactory, "'connectionFactory' must not be null");
+		Assert.state(this.jmsProperties != null, "'jmsProperties' must not be null");
 		JmsProperties.Listener listenerProperties = this.jmsProperties.getListener();
 		Session sessionProperties = listenerProperties.getSession();
 		factory.setConnectionFactory(connectionFactory);

module/spring-boot-jms/src/main/java/org/springframework/boot/jms/autoconfigure/JmsAutoConfiguration.java

@@ -20,6 +20,7 @@
 
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.Message;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.RuntimeHints;
@@ -56,7 +57,7 @@ public final class JmsAutoConfiguration {
 	static class JmsRuntimeHints implements RuntimeHintsRegistrar {
 
 		@Override
-		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+		public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
 			hints.reflection()
 				.registerType(TypeReference.of(AcknowledgeMode.class), (type) -> type.withMethod("of",
 						List.of(TypeReference.of(String.class)), ExecutableMode.INVOKE));