From 11a03c9d26d60683776f4144d7ca09e50e1c313e Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Sun, 3 Aug 2025 18:46:28 +0700 Subject: [PATCH 1/2] GH-10083: Apply Nullability to groovy module Signed-off-by: Tran Ngoc Nhan --- .../groovy/GroovyScriptExecutingMessageProcessor.java | 4 +++- .../VariableBindingGroovyObjectCustomizerDecorator.java | 5 +++-- .../integration/groovy/config/package-info.java | 1 + .../org/springframework/integration/groovy/package-info.java | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java index b0397a51a30..3c8dc30b0b5 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java @@ -32,6 +32,7 @@ import groovy.transform.CompileStatic; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer; +import org.jspecify.annotations.Nullable; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.BeanFactory; @@ -75,8 +76,9 @@ public class GroovyScriptExecutingMessageProcessor extends AbstractScriptExecuti private boolean compileStatic; - private CompilerConfiguration compilerConfiguration; + private @Nullable CompilerConfiguration compilerConfiguration; + @SuppressWarnings("NullAway.Init") private volatile Class scriptClass; /** diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java index 3c78d3494e5..2dbe2130025 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/VariableBindingGroovyObjectCustomizerDecorator.java @@ -21,6 +21,7 @@ import groovy.lang.Binding; import groovy.lang.GroovyObject; import groovy.lang.Script; +import org.jspecify.annotations.Nullable; import org.springframework.scripting.groovy.GroovyObjectCustomizer; import org.springframework.util.Assert; @@ -33,9 +34,9 @@ */ class VariableBindingGroovyObjectCustomizerDecorator implements GroovyObjectCustomizer { - private volatile Map variables; + private volatile @Nullable Map variables; - private volatile GroovyObjectCustomizer customizer; + private volatile @Nullable GroovyObjectCustomizer customizer; public void setVariables(Map variables) { this.variables = variables; diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java index 8961059b27c..f5b6278bc40 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java @@ -1,4 +1,5 @@ /** * Provides classes for configuration - parsers, namespace handlers, factory beans. */ +@org.jspecify.annotations.NullMarked package org.springframework.integration.groovy.config; diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java index 0fb3e3b5012..33a7c5dfe6b 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java @@ -1,4 +1,5 @@ /** * Base package for Groovy support. */ +@org.jspecify.annotations.NullMarked package org.springframework.integration.groovy; From 513848e8477a16cbbe0c3170a050522a5ed3afe0 Mon Sep 17 00:00:00 2001 From: Tran Ngoc Nhan Date: Mon, 4 Aug 2025 21:57:07 +0700 Subject: [PATCH 2/2] Apply Nullability to groovy dsl package Signed-off-by: Tran Ngoc Nhan --- .../springframework/integration/groovy/dsl/package-info.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-integration-groovy/src/main/groovy/org/springframework/integration/groovy/dsl/package-info.groovy b/spring-integration-groovy/src/main/groovy/org/springframework/integration/groovy/dsl/package-info.groovy index df20b89dcd4..44dbc6a2901 100644 --- a/spring-integration-groovy/src/main/groovy/org/springframework/integration/groovy/dsl/package-info.groovy +++ b/spring-integration-groovy/src/main/groovy/org/springframework/integration/groovy/dsl/package-info.groovy @@ -1,4 +1,5 @@ /** * Provides Spring Integration Groovy DSL. */ +@org.jspecify.annotations.NullMarked package org.springframework.integration.groovy.dsl