Update jspecify nullability in test classes

Signed-off-by: Soby Chacko <[email protected]>

Author: sobychacko

spring-kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 the original author or authors.
+ * Copyright 2016-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.
@@ -63,6 +63,8 @@
 import org.apache.kafka.common.errors.TopicExistsException;
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aop.framework.ProxyFactory;
@@ -134,8 +136,6 @@
 import org.springframework.kafka.test.EmbeddedKafkaKraftBroker;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.converter.AbstractMessageConverter;
@@ -1877,8 +1877,7 @@ protected Object convertFromInternal(Message<?> message, Class<?> targetClass,
 				}
 
 				@Override
-				@Nullable
-				protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
+				protected @Nullable Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
 						@Nullable Object conversionHint) {
 
 					return payload instanceof Foo ? ((Foo) payload).getBar() : null;

spring-kafka/src/test/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainerMockTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-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.
@@ -43,6 +43,7 @@
 import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.errors.GroupAuthorizationException;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -58,7 +59,6 @@
 import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 import org.springframework.kafka.transaction.KafkaAwareTransactionManager;
-import org.springframework.lang.Nullable;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
@@ -686,8 +686,7 @@ void testIntercept(boolean beforeTx, @Nullable AssignmentCommitOption option, bo
 		container.setRecordInterceptor(new RecordInterceptor() {
 
 			@Override
-			@Nullable
-			public ConsumerRecord intercept(ConsumerRecord rec, Consumer consumer) {
+			public @Nullable ConsumerRecord intercept(ConsumerRecord rec, Consumer consumer) {
 				order.add("interceptor");
 				latch.countDown();
 				return rec;
@@ -709,8 +708,7 @@ public void failure(ConsumerRecord record, Exception exception, Consumer consume
 		container.setBatchInterceptor(new BatchInterceptor() {
 
 			@Override
-			@Nullable
-			public ConsumerRecords intercept(ConsumerRecords recs, Consumer consumer) {
+			public @Nullable ConsumerRecords intercept(ConsumerRecords recs, Consumer consumer) {
 				order.add("interceptor");
 				latch.countDown();
 				return new ConsumerRecords(Collections.singletonMap(tp0, Collections.singletonList(record1)));

spring-kafka/src/test/java/org/springframework/kafka/listener/ConcurrentMessageListenerContainerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 the original author or authors.
+ * Copyright 2016-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.
@@ -42,6 +42,7 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.common.TopicPartition;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.mockito.invocation.InvocationOnMock;
@@ -63,7 +64,6 @@
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.utils.ContainerTestUtils;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.lang.Nullable;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

spring-kafka/src/test/java/org/springframework/kafka/listener/KafkaMessageListenerContainerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 the original author or authors.
+ * Copyright 2016-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.
@@ -64,6 +64,8 @@
 import org.apache.kafka.common.errors.WakeupException;
 import org.apache.kafka.common.serialization.IntegerDeserializer;
 import org.assertj.core.api.InstanceOfAssertFactories;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -109,8 +111,6 @@
 import org.springframework.kafka.test.utils.ContainerTestUtils;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
 import org.springframework.kafka.transaction.KafkaAwareTransactionManager;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.util.backoff.FixedBackOff;
 
@@ -3845,8 +3845,7 @@ public void onMessage(ConsumerRecord<Integer, String> data) {
 		RecordInterceptor<Integer, String> recordInterceptor = spy(new RecordInterceptor<Integer, String>() {
 
 			@Override
-			@NonNull
-			public ConsumerRecord<Integer, String> intercept(ConsumerRecord<Integer, String> record,
+			public @NonNull ConsumerRecord<Integer, String> intercept(ConsumerRecord<Integer, String> record,
 					Consumer<Integer, String> consumer) {
 
 				return record;
@@ -3934,8 +3933,7 @@ public void testInvokeRecordInterceptorAllSkipped(AckMode ackMode, boolean early
 		RecordInterceptor<Integer, String> recordInterceptor = spy(new RecordInterceptor<Integer, String>() {
 
 			@Override
-			@Nullable
-			public ConsumerRecord<Integer, String> intercept(ConsumerRecord<Integer, String> record,
+			public @Nullable ConsumerRecord<Integer, String> intercept(ConsumerRecord<Integer, String> record,
 					Consumer<Integer, String> consumer) {
 
 				return null;
@@ -4024,8 +4022,7 @@ public void testInvokeBatchInterceptorAllSkipped(boolean early) throws Exception
 		BatchInterceptor<Integer, String> interceptor = spy(new BatchInterceptor<Integer, String>() {
 
 			@Override
-			@Nullable
-			public ConsumerRecords<Integer, String> intercept(ConsumerRecords<Integer, String> records,
+			public @Nullable ConsumerRecords<Integer, String> intercept(ConsumerRecords<Integer, String> records,
 					Consumer<Integer, String> consumer) {
 
 				return null;
@@ -4090,8 +4087,7 @@ public void onMessage(ConsumerRecord<Integer, String> data) {
 		RecordInterceptor<Integer, String> recordInterceptor = spy(new RecordInterceptor<Integer, String>() {
 
 			@Override
-			@NonNull
-			public ConsumerRecord<Integer, String> intercept(ConsumerRecord<Integer, String> record,
+			public @NonNull ConsumerRecord<Integer, String> intercept(ConsumerRecord<Integer, String> record,
 					Consumer<Integer, String> consumer) {
 
 				return record;

spring-kafka/src/test/java/org/springframework/kafka/listener/ManualNackRecordTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 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.
@@ -39,6 +39,7 @@
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.header.internals.RecordHeaders;
 import org.apache.kafka.common.record.TimestampType;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 
@@ -53,7 +54,6 @@
 import org.springframework.kafka.listener.ContainerProperties.AckMode;
 import org.springframework.kafka.support.Acknowledgment;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
@@ -248,9 +248,8 @@ public ConcurrentKafkaListenerContainerFactory kafkaListenerContainerFactory() {
 			factory.setRecordInterceptor(new RecordInterceptor() {
 
 				@Override
-				@Nullable
 				@SuppressWarnings("rawtypes")
-				public ConsumerRecord intercept(ConsumerRecord record, Consumer consumer) {
+				public @Nullable ConsumerRecord intercept(ConsumerRecord record, Consumer consumer) {
 					return new ConsumerRecord(record.topic(), record.partition(), record.offset(), 0L,
 							TimestampType.NO_TIMESTAMP_TYPE, 0, 0, record.key(), record.value(), record.headers(),
 							Optional.empty());

spring-kafka/src/test/java/org/springframework/kafka/listener/SeekToCurrentRecovererTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2024 the original author or authors.
+ * Copyright 2018-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.
@@ -36,6 +36,7 @@
 import org.apache.kafka.common.TopicPartition;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.kafka.common.serialization.Serializer;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -51,7 +52,6 @@
 import org.springframework.kafka.test.condition.EmbeddedKafkaCondition;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.backoff.FixedBackOff;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-kafka/src/test/java/org/springframework/kafka/support/converter/MessagingMessageConverterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2024 the original author or authors.
+ * Copyright 2019-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.
@@ -26,10 +26,10 @@
 import org.apache.kafka.common.header.Headers;
 import org.apache.kafka.common.header.internals.RecordHeader;
 import org.apache.kafka.common.header.internals.RecordHeaders;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.kafka.support.KafkaHeaders;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.converter.AbstractMessageConverter;
@@ -183,16 +183,14 @@ protected boolean supports(Class<?> clazz) {
 		}
 
 		@Override
-		@Nullable
-		protected Object convertFromInternal(Message<?> message, Class<?> targetClass,
+		protected @Nullable Object convertFromInternal(Message<?> message, Class<?> targetClass,
 				@Nullable Object conversionHint) {
 
 			return new Foo("bar");
 		}
 
 		@Override
-		@Nullable
-		protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
+		protected @Nullable Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
 				@Nullable Object conversionHint) {
 
 			return "foo".getBytes();
@@ -207,16 +205,14 @@ static class BarConverter extends FooConverter {
 		}
 
 		@Override
-		@Nullable
-		protected Object convertFromInternal(Message<?> message, Class<?> targetClass,
+		protected @Nullable Object convertFromInternal(Message<?> message, Class<?> targetClass,
 				@Nullable Object conversionHint) {
 
 			return new Bar("bar");
 		}
 
 		@Override
-		@Nullable
-		protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
+		protected @Nullable Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
 				@Nullable Object conversionHint) {
 
 			return "bar".getBytes();

spring-kafka/src/test/java/org/springframework/kafka/support/micrometer/ObservationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 the original author or authors.
+ * Copyright 2022-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.
@@ -56,6 +56,7 @@
 import org.apache.kafka.common.errors.InvalidTopicException;
 import org.apache.kafka.common.header.Header;
 import org.apache.kafka.common.header.Headers;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
@@ -82,7 +83,6 @@
 import org.springframework.kafka.test.EmbeddedKafkaBroker;
 import org.springframework.kafka.test.context.EmbeddedKafka;
 import org.springframework.kafka.test.utils.KafkaTestUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.util.StringUtils;