GH-1352: Add package-info with NonNullApi Annot.

Author: garyrussell

Diff for: spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/config/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Provides classes for stream listener configuration.
+ */
+@org.springframework.lang.NonNullApi
+package org.springframework.rabbit.stream.config;

Diff for: spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/listener/adapter/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Provides classes for stream listener adapters.
+ */
+@org.springframework.lang.NonNullApi
+package org.springframework.rabbit.stream.listener.adapter;

Diff for: spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/listener/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Provides classes for stream listeners.
+ */
+@org.springframework.lang.NonNullApi
+package org.springframework.rabbit.stream.listener;

Diff for: spring-rabbit-stream/src/main/java/org/springframework/rabbit/stream/support/converter/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Provides classes for message conversion.
+ */
+@org.springframework.lang.NonNullApi
+package org.springframework.rabbit.stream.support.converter;

Diff for: spring-rabbit/src/main/java/org/springframework/amqp/rabbit/config/AbstractRabbitListenerContainerFactory.java

@@ -30,7 +30,6 @@
 import org.springframework.amqp.rabbit.batch.BatchingStrategy;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer;
-import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.listener.RabbitListenerEndpoint;
 import org.springframework.amqp.support.ConsumerTagStrategy;
 import org.springframework.amqp.support.converter.MessageConverter;
@@ -48,7 +47,8 @@
 import org.springframework.util.backoff.FixedBackOff;
 
 /**
- * Base {@link RabbitListenerContainerFactory} for Spring's base container implementation.
+ * {@link org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory}
+ * for Spring's base container implementation.
  * @param <C> the container type.
  *
  * @author Stephane Nicoll

Diff for: spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/AbstractMessageListenerContainer.java

@@ -456,6 +456,7 @@ protected void checkMessageListener(Object listener) {
 	}
 
 	@Override
+	@Nullable
 	public Object getMessageListener() {
 		return this.messageListener;
 	}
@@ -693,6 +694,7 @@ public String getListenerId() {
 		return this.listenerId != null ? this.listenerId : this.beanName;
 	}
 
+	@Override
 	public void setListenerId(String listenerId) {
 		this.listenerId = listenerId;
 	}

Diff for: spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java

@@ -564,8 +564,9 @@ protected void doStart() {
 	}
 
 	private void checkListenerContainerAware() {
-		if (getMessageListener() instanceof ListenerContainerAware) {
-			Collection<String> expectedQueueNames = ((ListenerContainerAware) getMessageListener()).expectedQueueNames();
+		Object messageListener = getMessageListener();
+		if (messageListener instanceof ListenerContainerAware) {
+			Collection<String> expectedQueueNames = ((ListenerContainerAware) messageListener).expectedQueueNames();
 			if (expectedQueueNames != null) {
 				String[] queueNames = getQueueNames();
 				Assert.state(expectedQueueNames.size() == queueNames.length,