From d9e1f941f5d43a2d4731ffecf6845c774146f45b Mon Sep 17 00:00:00 2001 From: Manu Sridharan Date: Wed, 27 May 2026 10:03:56 -0700 Subject: [PATCH] Update to NullAway 0.13.6. Add missing nullness annotation in org.springframework.web.util.UriComponents.VarArgsTemplateVariables to fix new warning. Signed-off-by: Manu Sridharan --- gradle/spring-module.gradle | 2 ++ .../main/java/org/springframework/web/util/UriComponents.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle/spring-module.gradle b/gradle/spring-module.gradle index 09755cdac4a0..7d2f8c899453 100644 --- a/gradle/spring-module.gradle +++ b/gradle/spring-module.gradle @@ -115,6 +115,8 @@ publishing { } } +nullability { nullAwayVersion = "0.13.6" } + // Disable publication of test fixture artifacts. components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() } components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() } diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java index 373215c584e7..732f26a79cf7 100644 --- a/spring-web/src/main/java/org/springframework/web/util/UriComponents.java +++ b/spring-web/src/main/java/org/springframework/web/util/UriComponents.java @@ -345,7 +345,7 @@ public MapTemplateVariables(Map uriVariables */ private static class VarArgsTemplateVariables implements UriTemplateVariables { - private final Iterator valueIterator; + private final Iterator<@Nullable Object> valueIterator; public VarArgsTemplateVariables(@Nullable Object... uriVariableValues) { this.valueIterator = Arrays.asList(uriVariableValues).iterator();