Skip to content

Commit 7e4c029

Browse files
authored
GH-3979: Revise Nullability for ctors in MessagingMessageListenerAdapter & sub-classes
Fixes: #3979 Signed-off-by: Jiandong Ma <[email protected]>
1 parent 3d9f0e3 commit 7e4c029

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/BatchMessagingMessageListenerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public class BatchMessagingMessageListenerAdapter<K, V> extends MessagingMessage
6969
* @param bean the listener bean.
7070
* @param method the listener method.
7171
*/
72-
public BatchMessagingMessageListenerAdapter(Object bean, Method method) {
72+
public BatchMessagingMessageListenerAdapter(@Nullable Object bean, @Nullable Method method) {
7373
this(bean, method, null);
7474
}
7575

@@ -79,7 +79,7 @@ public BatchMessagingMessageListenerAdapter(Object bean, Method method) {
7979
* @param method the listener method.
8080
* @param errorHandler the error handler.
8181
*/
82-
public BatchMessagingMessageListenerAdapter(Object bean, Method method,
82+
public BatchMessagingMessageListenerAdapter(@Nullable Object bean, @Nullable Method method,
8383
@Nullable KafkaListenerErrorHandler errorHandler) {
8484

8585
super(bean, method, errorHandler);

spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/MessagingMessageListenerAdapter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public abstract class MessagingMessageListenerAdapter<K, V> implements ConsumerS
111111
private static final boolean monoPresent =
112112
ClassUtils.isPresent("reactor.core.publisher.Mono", MessageListener.class.getClassLoader());
113113

114-
private final Object bean;
114+
private final @Nullable Object bean;
115115

116116
protected final LogAccessor logger = new LogAccessor(LogFactory.getLog(getClass())); //NOSONAR
117117

@@ -166,7 +166,7 @@ public abstract class MessagingMessageListenerAdapter<K, V> implements ConsumerS
166166
* @param bean the bean.
167167
* @param method the method.
168168
*/
169-
protected MessagingMessageListenerAdapter(Object bean, Method method) {
169+
protected MessagingMessageListenerAdapter(@Nullable Object bean, @Nullable Method method) {
170170
this(bean, method, null);
171171
}
172172

@@ -177,7 +177,8 @@ protected MessagingMessageListenerAdapter(Object bean, Method method) {
177177
* @param errorHandler the kafka listener error handler.
178178
*/
179179
@SuppressWarnings("this-escape")
180-
protected MessagingMessageListenerAdapter(Object bean, Method method, @Nullable KafkaListenerErrorHandler errorHandler) {
180+
protected MessagingMessageListenerAdapter(@Nullable Object bean, @Nullable Method method,
181+
@Nullable KafkaListenerErrorHandler errorHandler) {
181182
this.bean = bean;
182183
this.inferredType = determineInferredType(method); // NOSONAR = intentionally not final
183184
this.errorHandler = errorHandler;

spring-kafka/src/main/java/org/springframework/kafka/listener/adapter/RecordMessagingMessageListenerAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
public class RecordMessagingMessageListenerAdapter<K, V> extends MessagingMessageListenerAdapter<K, V>
5151
implements AcknowledgingConsumerAwareMessageListener<K, V> {
5252

53-
public RecordMessagingMessageListenerAdapter(Object bean, Method method) {
53+
public RecordMessagingMessageListenerAdapter(@Nullable Object bean, @Nullable Method method) {
5454
this(bean, method, null);
5555
}
5656

57-
public RecordMessagingMessageListenerAdapter(Object bean, Method method,
57+
public RecordMessagingMessageListenerAdapter(@Nullable Object bean, @Nullable Method method,
5858
@Nullable KafkaListenerErrorHandler errorHandler) {
5959

6060
super(bean, method, errorHandler);

0 commit comments

Comments
 (0)