More nullability changes in annotation package

Adding test dependency for junit-jupiter-params

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

Author: sobychacko

build.gradle

@@ -58,7 +58,7 @@ ext {
 	jacksonBomVersion = '2.18.3'
 	jaywayJsonPathVersion = '2.9.0'
 	junit4Version = '4.13.2'
-	junitJupiterVersion = '5.11.4'
+	junitJupiterVersion = '5.12.2'
 	kafkaVersion = '4.0.0'
 	kotlinCoroutinesVersion = '1.10.2'
 	log4jVersion = '2.24.3'
@@ -171,6 +171,7 @@ configure(javaProjects) { subproject ->
 	// dependencies that are common across all java projects
 	dependencies {
 		testImplementation 'org.junit.jupiter:junit-jupiter-api'
+		testImplementation 'org.junit.jupiter:junit-jupiter-params'
 		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 		testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 

spring-kafka/src/main/java/org/springframework/kafka/annotation/KafkaListenerAnnotationBeanPostProcessor.java

@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -190,8 +191,7 @@ public class KafkaListenerAnnotationBeanPostProcessor<K, V>
 
 	private final AtomicBoolean enhancerIsBuilt = new AtomicBoolean();
 
-	@SuppressWarnings("NullAway.Init")
-	private KafkaListenerEndpointRegistry endpointRegistry;
+	private @Nullable KafkaListenerEndpointRegistry endpointRegistry;
 
 	private String defaultContainerFactoryBeanName = DEFAULT_KAFKA_LISTENER_CONTAINER_FACTORY_BEAN_NAME;
 
@@ -207,8 +207,7 @@ public class KafkaListenerAnnotationBeanPostProcessor<K, V>
 
 	private Charset charset = StandardCharsets.UTF_8;
 
-	@SuppressWarnings("NullAway.Init")
-	private AnnotationEnhancer enhancer;
+	private @Nullable AnnotationEnhancer enhancer;
 
 	private @Nullable RetryTopicConfigurer retryTopicConfigurer;
 
@@ -327,18 +326,14 @@ public void afterSingletonsInstantiated() {
 
 		if (this.registrar.getEndpointRegistry() == null) {
 			if (this.endpointRegistry == null) {
-				Assert.state(this.beanFactory != null,
-						"BeanFactory must be set to find endpoint registry by bean name");
 				this.endpointRegistry = this.beanFactory.getBean(
 						KafkaListenerConfigUtils.KAFKA_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME,
 						KafkaListenerEndpointRegistry.class);
 			}
 			this.registrar.setEndpointRegistry(this.endpointRegistry);
 		}
 
-		if (this.defaultContainerFactoryBeanName != null) {
-			this.registrar.setContainerFactoryBeanName(this.defaultContainerFactoryBeanName);
-		}
+		this.registrar.setContainerFactoryBeanName(this.defaultContainerFactoryBeanName);
 
 		// Set the custom handler method factory once resolved by the configurer
 		MessageHandlerMethodFactory handlerMethodFactory = this.registrar.getMessageHandlerMethodFactory();
@@ -864,11 +859,9 @@ private TopicPartitionOffset[] resolveTopicPartitions(KafkaListener kafkaListene
 	private String[] resolveTopics(KafkaListener kafkaListener) {
 		String[] topics = kafkaListener.topics();
 		List<String> result = new ArrayList<>();
-		if (topics.length > 0) {
-			for (String topic1 : topics) {
-				Object topic = resolveExpression(topic1);
-				resolveAsString(topic, result);
-			}
+		for (String topic1 : topics) {
+			Object topic = resolveExpression(topic1);
+			resolveAsString(topic, result);
 		}
 		return result.toArray(new String[0]);
 	}
@@ -954,9 +947,9 @@ else if (initialOffsetValue instanceof Long lng) {
 
 	private boolean isRelative(Object topic, PartitionOffset partitionOffset) {
 		Object relativeToCurrentValue = resolveExpression(partitionOffset.relativeToCurrent());
-		Boolean relativeToCurrent;
+		boolean relativeToCurrent;
 		if (relativeToCurrentValue instanceof String str) {
-			relativeToCurrent = Boolean.valueOf(str);
+			relativeToCurrent = Boolean.parseBoolean(str);
 		}
 		else if (relativeToCurrentValue instanceof Boolean bool) {
 			relativeToCurrent = bool;
@@ -1046,8 +1039,7 @@ else if (resolvedValue instanceof Integer intgr) {
 		}
 	}
 
-	@SuppressWarnings("NullAway") // Overridden method does not define nullness
-	private TopicPartitionOffset.SeekPosition resloveTopicPartitionOffsetSeekPosition(@Nullable Object seekPosition) {
+	private TopicPartitionOffset.@Nullable SeekPosition resloveTopicPartitionOffsetSeekPosition(@Nullable Object seekPosition) {
 		TopicPartitionOffset.SeekPosition resloveTpoSp = null;
 		if (seekPosition instanceof String seekPositionName) {
 			String capitalLetterSeekPositionName = seekPositionName.trim().toUpperCase(Locale.ROOT);
@@ -1087,8 +1079,7 @@ else if (resolved != null) {
 		return null;
 	}
 
-	@SuppressWarnings("NullAway") // Dataflow analysis limitation
-	private byte[] resolveExpressionAsBytes(String value, String attribute) {
+	private byte @Nullable [] resolveExpressionAsBytes(String value, String attribute) {
 		Object resolved = resolveExpression(value);
 		if (resolved instanceof String str) {
 			if (StringUtils.hasText(str)) {
@@ -1277,7 +1268,7 @@ public String convert(byte[] source) {
 
 	static class ListenerScope implements Scope {
 
-		private final Map<String, @Nullable Object> listeners = new HashMap<>();
+		private final Map<String, Object> listeners = new HashMap<>();
 
 		ListenerScope() {
 		}
@@ -1290,16 +1281,15 @@ public void removeListener(String key) {
 			this.listeners.remove(key);
 		}
 
-		@SuppressWarnings("NullAway") // Overridden method does not define nullness
 		@Override
-		public @Nullable Object get(String name, ObjectFactory<?> objectFactory) {
+		public Object get(String name, ObjectFactory<?> objectFactory) {
+			Objects.requireNonNull(this.listeners.get(name), "No listeners registered for " + name);
 			return this.listeners.get(name);
 		}
 
-		@SuppressWarnings("NullAway") // Overridden method does not define nullness
 		@Override
-		public Object remove(String name) {
-			return null;
+		public @Nullable Object remove(String name) {
+			return this.listeners.remove(name);
 		}
 
 		@Override
@@ -1324,7 +1314,7 @@ public void registerDestructionCallback(String name, Runnable callback) {
 	 * @since 2.7.2
 	 *
 	 */
-	public interface AnnotationEnhancer extends BiFunction<Map<String, Object>, AnnotatedElement, Map<String, Object>> {
+	public interface AnnotationEnhancer extends BiFunction<Map<String, @Nullable Object>, AnnotatedElement, Map<String, Object>> {
 
 	}
 

spring-kafka/src/main/java/org/springframework/kafka/config/AbstractKafkaListenerEndpoint.java

@@ -426,8 +426,8 @@ public void setSplitIterables(boolean splitIterables) {
 	 * @param listenerInfo the info.
 	 * @since 2.8.4
 	 */
-	public void setListenerInfo(byte[] listenerInfo) {  // NOSONAR
-		this.listenerInfo = listenerInfo; // NOSONAR
+	public void setListenerInfo(byte @Nullable [] listenerInfo) {
+		this.listenerInfo = listenerInfo;
 	}
 
 	protected @Nullable BatchToRecordAdapter<K, V> getBatchToRecordAdapter() {