Refine contribution #1201

- Remove separate profile for jSpecify checks
- Update errorprone and nullaway versions
- Add jSpecify checks in test and test-autoconfigure modules
- Exclude o.s.shell.test.jediterm from jSpecify checks (as it's a shaded fork)
- Remove usage of org.springframework.lang.Nullable

Resolves #1184

Author: fmbenhassine

.github/workflows/ci-pr.yml

@@ -20,5 +20,5 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
-        run: ./mvnw --no-transfer-progress --batch-mode --update-snapshots verify -Pnullaway
+        run: ./mvnw --no-transfer-progress --batch-mode --update-snapshots verify
 

pom.xml

@@ -56,8 +56,8 @@
 		<commons-io.version>2.20.0</commons-io.version>
 		<slf4j.version>2.0.17</slf4j.version>
 		<jakarta.validation-api.version>3.1.1</jakarta.validation-api.version>
-		<errorprone.version>2.36.0</errorprone.version>
-		<nullaway.version>0.12.7</nullaway.version>
+		<errorprone.version>2.42.0</errorprone.version>
+		<nullaway.version>0.12.10</nullaway.version>
 		<jspecify.version>1.0.0</jspecify.version>
 
 		<!-- test dependencies -->
@@ -107,7 +107,27 @@
 					<release>${java.version}</release>
 					<compilerArgs>
 						<compilerArg>-parameters</compilerArg>
+						<compilerArg>
+							-XDcompilePolicy=simple
+							--should-stop=ifError=FLOW
+							-Xplugin:ErrorProne
+							-Xep:NullAway:ERROR
+							-XepOpt:NullAway:JSpecifyMode=true
+							-XepOpt:NullAway:OnlyNullMarked=true
+						</compilerArg>
 					</compilerArgs>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>com.google.errorprone</groupId>
+							<artifactId>error_prone_core</artifactId>
+							<version>${errorprone.version}</version>
+						</path>
+						<path>
+							<groupId>com.uber.nullaway</groupId>
+							<artifactId>nullaway</artifactId>
+							<version>${nullaway.version}</version>
+						</path>
+					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -231,59 +251,6 @@
 		</plugins>
 	</build>
 
-	<profiles>
-		<profile>
-			<id>nullaway</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-compiler-plugin</artifactId>
-						<configuration>
-							<showWarnings>true</showWarnings>
-
-						</configuration>
-						<executions>
-							<execution>
-								<id>default-compile</id>
-								<phase>none</phase>
-							</execution>
-							<execution>
-								<id>java-compile</id>
-								<phase>compile</phase>
-								<goals>
-									<goal>compile</goal>
-								</goals>
-								<configuration>
-									<annotationProcessorPaths>
-										<path>
-											<groupId>com.google.errorprone</groupId>
-											<artifactId>error_prone_core</artifactId>
-											<version>${errorprone.version}</version>
-										</path>
-										<path>
-											<groupId>com.uber.nullaway</groupId>
-											<artifactId>nullaway</artifactId>
-											<version>${nullaway.version}</version>
-										</path>
-									</annotationProcessorPaths>
-									<compilerArgs>
-										<arg>-XDcompilePolicy=simple</arg>
-										<arg>--should-stop=ifError=FLOW</arg>
-										<arg>-Xplugin:ErrorProne -XepDisableAllChecks -Xep:NullAway:ERROR
-											-XepOpt:NullAway:OnlyNullMarked=true
-											-XepOpt:NullAway:CustomContractAnnotations=org.springframework.lang.Contract
-										</arg>
-									</compilerArgs>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 	<repositories>
 		<repository>
 			<id>maven-central</id>

spring-shell-core/src/main/java/org/springframework/shell/DefaultShellApplicationRunner.java

@@ -18,10 +18,11 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.lang.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandlingException;
 import org.springframework.messaging.handler.annotation.Header;

spring-shell-core/src/main/java/org/springframework/shell/command/ArgumentHeaderMethodArgumentResolver.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.shell.command.parser;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Encapsulating {@code Directive} with its fields, {@code name} and

spring-shell-core/src/main/java/org/springframework/shell/command/parser/DirectiveResult.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.shell.samples.catalog.scenario;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.shell.tui.component.view.TerminalUI;
 import org.springframework.shell.tui.component.view.control.View;
 import org.springframework.shell.samples.catalog.Catalog;

spring-shell-samples/spring-shell-sample-catalog/src/main/java/org/springframework/shell/samples/catalog/scenario/Scenario.java

@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandlingException;
 import org.springframework.shell.support.AbstractArgumentMethodArgumentResolver;

spring-shell-standard/src/main/java/org/springframework/shell/standard/ShellOptionMethodArgumentResolver.java

@@ -23,7 +23,7 @@
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.aot.hint.TypeReference;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * {@link RuntimeHintsRegistrar} for Shell Standard Commands temlate model classes.

spring-shell-standard/src/main/java/org/springframework/shell/standard/commands/StandardCommandsModelsRuntimeHints.java

@@ -17,7 +17,7 @@
 
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * {@link RuntimeHintsRegistrar} for Shell Standard Commands resources.

spring-shell-standard/src/main/java/org/springframework/shell/standard/commands/StandardCommandsResourcesRuntimeHints.java

@@ -0,0 +1,4 @@
+@NullMarked
+package org.springframework.shell.test.autoconfigure;
+
+import org.jspecify.annotations.NullMarked;