From 634dcb99833a08b9c15bbbd5c1b0f11e88885231 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 10:02:33 +0000
Subject: [PATCH 1/2] Bump io.spring.nullability in the
 development-dependencies group

Bumps the development-dependencies group with 1 update: [io.spring.nullability](https://github.com/spring-gradle-plugins/nullability-plugin).


Updates `io.spring.nullability` from 0.0.5 to 0.0.6
- [Release notes](https://github.com/spring-gradle-plugins/nullability-plugin/releases)
- [Commits](https://github.com/spring-gradle-plugins/nullability-plugin/compare/v0.0.5...v0.0.6)

---
updated-dependencies:
- dependency-name: io.spring.nullability
  dependency-version: 0.0.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: development-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 06e9b24f40..b83573f9c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.11'
 	id 'io.spring.dependency-management' version '1.1.7' apply false
 	id 'io.freefair.aggregate-javadoc' version '8.11'
-	id 'io.spring.nullability' version '0.0.5' apply false
+	id 'io.spring.nullability' version '0.0.6' apply false
 }
 
 apply plugin: 'io.spring.nohttp'

From 947e5869d4b7d61461d3b2c7cbd8fd553e9a7a3f Mon Sep 17 00:00:00 2001
From: Soby Chacko <soby.chacko@broadcom.com>
Date: Mon, 20 Oct 2025 12:23:22 -0400
Subject: [PATCH 2/2] Fix NullAway errors for array element type annotations

Change array field and getter annotations from @Nullable element types
to non-nullable element types to match constructor expectations.

Arrays can still be null (reference nullable), but elements within
those arrays must be non-null, consistent with varargs constructors
that don't accept nullable elements.

Signed-off-by: Soby Chacko <soby.chacko@broadcom.com>
---
 .../kafka/listener/AbstractMessageListenerContainer.java    | 4 ++--
 .../AbstractShareKafkaMessageListenerContainer.java         | 4 ++--
 .../springframework/kafka/listener/ConsumerProperties.java  | 6 ++----
 .../retrytopic/ListenerContainerFactoryConfigurer.java      | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java
index 66bf4bc67b..67549bd5c0 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractMessageListenerContainer.java
@@ -157,7 +157,7 @@ protected AbstractMessageListenerContainer(@Nullable ConsumerFactory<? super K,
 		Assert.notNull(containerProperties, "'containerProperties' cannot be null");
 		Assert.notNull(consumerFactory, "'consumerFactory' cannot be null");
 		this.consumerFactory = (ConsumerFactory<K, V>) consumerFactory;
-		@Nullable String @Nullable [] topics = containerProperties.getTopics();
+		String @Nullable [] topics = containerProperties.getTopics();
 		if (topics != null) {
 			this.containerProperties = new ContainerProperties(topics);
 		}
@@ -167,7 +167,7 @@ protected AbstractMessageListenerContainer(@Nullable ConsumerFactory<? super K,
 				this.containerProperties = new ContainerProperties(topicPattern);
 			}
 			else {
-				@Nullable TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
+				TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
 				if (topicPartitions != null) {
 					this.containerProperties = new ContainerProperties(topicPartitions);
 				}
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractShareKafkaMessageListenerContainer.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractShareKafkaMessageListenerContainer.java
index 68c920f753..12700efbc1 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractShareKafkaMessageListenerContainer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/AbstractShareKafkaMessageListenerContainer.java
@@ -94,7 +94,7 @@ protected AbstractShareKafkaMessageListenerContainer(ShareConsumerFactory<? supe
 		Assert.notNull(containerProperties, "'containerProperties' cannot be null");
 		Assert.notNull(shareConsumerFactory, "'shareConsumerFactory' cannot be null");
 		this.shareConsumerFactory = (ShareConsumerFactory<K, V>) shareConsumerFactory;
-		@Nullable String @Nullable [] topics = containerProperties.getTopics();
+		String @Nullable [] topics = containerProperties.getTopics();
 		if (topics != null) {
 			this.containerProperties = new ContainerProperties(topics);
 		}
@@ -104,7 +104,7 @@ protected AbstractShareKafkaMessageListenerContainer(ShareConsumerFactory<? supe
 				this.containerProperties = new ContainerProperties(topicPattern);
 			}
 			else {
-				@Nullable TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
+				TopicPartitionOffset @Nullable [] topicPartitions = containerProperties.getTopicPartitions();
 				if (topicPartitions != null) {
 					this.containerProperties = new ContainerProperties(topicPartitions);
 				}
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/listener/ConsumerProperties.java b/spring-kafka/src/main/java/org/springframework/kafka/listener/ConsumerProperties.java
index d0680d0089..402c52973b 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/listener/ConsumerProperties.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/listener/ConsumerProperties.java
@@ -52,7 +52,7 @@ public class ConsumerProperties {
 	/**
 	 * Topic names.
 	 */
-	private final @Nullable String @Nullable [] topics;
+	private final String @Nullable [] topics;
 
 	/**
 	 * Topic pattern.
@@ -62,7 +62,7 @@ public class ConsumerProperties {
 	/**
 	 * Topics/partitions/initial offsets.
 	 */
-	private final @Nullable TopicPartitionOffset @Nullable [] topicPartitions;
+	private final TopicPartitionOffset @Nullable [] topicPartitions;
 
 	/**
 	 * The max time to block in the consumer waiting for records.
@@ -160,7 +160,6 @@ public ConsumerProperties(TopicPartitionOffset... topicPartitions) {
 	 * Return the configured topics.
 	 * @return the topics.
 	 */
-	@Nullable
 	public String @Nullable [] getTopics() {
 		return this.topics != null
 				? Arrays.copyOf(this.topics, this.topics.length)
@@ -181,7 +180,6 @@ public Pattern getTopicPattern() {
 	 * @return the topics/partitions.
 	 * @since 2.5
 	 */
-	@Nullable
 	public TopicPartitionOffset @Nullable [] getTopicPartitions() {
 		return this.topicPartitions != null
 				? Arrays.copyOf(this.topicPartitions, this.topicPartitions.length)
diff --git a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/ListenerContainerFactoryConfigurer.java b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/ListenerContainerFactoryConfigurer.java
index 5a5e9321af..d486d80cce 100644
--- a/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/ListenerContainerFactoryConfigurer.java
+++ b/spring-kafka/src/main/java/org/springframework/kafka/retrytopic/ListenerContainerFactoryConfigurer.java
@@ -62,7 +62,7 @@ public class ListenerContainerFactoryConfigurer {
 	@Nullable
 	private BackOff providedBlockingBackOff;
 
-	private @Nullable Class<? extends Exception> @Nullable [] blockingExceptionTypes;
+	private Class<? extends Exception> @Nullable [] blockingExceptionTypes;
 
 	private boolean retainStandardFatal;