Refine nullability checks with jSpecify

- Remove usage of nullability annotations from Spring Framework
- Remove JSR305 dependency

Author: fmbenhassine

pom.xml

@@ -80,9 +80,6 @@
 		<junit-jupiter.version>6.0.0</junit-jupiter.version>
 		<junit-platform-launcher.version>6.0.0</junit-platform-launcher.version>
 
-		<!-- provided dependencies -->
-		<jsr305.version>3.0.2</jsr305.version>
-
 		<!-- test dependencies -->
 		<micrometer-tracing.version>1.6.0-SNAPSHOT</micrometer-tracing.version>
 
@@ -183,7 +180,8 @@
 							-Xplugin:ErrorProne
 							<!-- Check JSpecify annotations -->
 							-Xep:NullAway:ERROR
-							-XepOpt:NullAway:OnlyNullMarked
+                            -XepOpt:NullAway:JSpecifyMode=true
+                            -XepOpt:NullAway:OnlyNullMarked
 							<!-- FIXME Remove once https://github.com/uber/NullAway/pull/1295 is released -->
 							-XepOpt:NullAway:CustomContractAnnotations=org.springframework.lang.Contract
 							-XepOpt:NullAway:SuppressionNameAliases=DataFlowIssue

spring-batch-core/pom.xml

@@ -400,14 +400,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-		<!-- provided dependencies -->
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>jsr305</artifactId>
-			<version>${jsr305.version}</version>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 
 </project>

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobLocator.java

@@ -19,7 +19,7 @@
 
 import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.launch.NoSuchJobException;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A runtime service locator interface for retrieving job configurations by

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java

@@ -35,7 +35,7 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java

@@ -61,7 +61,7 @@
 import org.springframework.batch.core.step.tasklet.TaskletStep;
 import org.springframework.batch.infrastructure.support.PropertiesConverter;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java

@@ -19,7 +19,7 @@
 import java.time.LocalDateTime;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Central class for batch metrics. It provides some utility methods like calculating
@@ -53,8 +53,7 @@ private BatchMetrics() {
 	 * @param endTime the end time
 	 * @return the duration between start time and end time
 	 */
-	@Nullable
-	public static Duration calculateDuration(@Nullable LocalDateTime startTime, @Nullable LocalDateTime endTime) {
+	@Nullable public static Duration calculateDuration(@Nullable LocalDateTime startTime, @Nullable LocalDateTime endTime) {
 		if (startTime == null || endTime == null) {
 			return null;
 		}

spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java

@@ -24,7 +24,7 @@
 import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.repository.explore.JobExplorer;
 import org.springframework.batch.infrastructure.item.ExecutionContext;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import java.util.Collections;
 import java.util.List;
@@ -102,8 +102,7 @@ default List<JobInstance> findJobInstances(String jobName) {
 	 * @param jobInstanceId The ID for the {@link JobInstance} to obtain.
 	 * @return the {@code JobInstance} that has this ID, or {@code null} if not found.
 	 */
-	@Nullable
-	default JobInstance getJobInstance(long jobInstanceId) {
+	@Nullable default JobInstance getJobInstance(long jobInstanceId) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -114,8 +113,7 @@ default JobInstance getJobInstance(long jobInstanceId) {
 	 *
 	 * @since 4.2
 	 */
-	@Nullable
-	default JobInstance getLastJobInstance(String jobName) {
+	@Nullable default JobInstance getLastJobInstance(String jobName) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -127,8 +125,7 @@ default JobInstance getLastJobInstance(String jobName) {
 	 *
 	 * @since 5.0
 	 */
-	@Nullable
-	default JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
+	@Nullable default JobInstance getJobInstance(String jobName, JobParameters jobParameters) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -159,8 +156,7 @@ default long getJobInstanceCount(String jobName) throws NoSuchJobException {
 	 * @param executionId The job execution ID.
 	 * @return the {@link JobExecution} that has this ID or {@code null} if not found.
 	 */
-	@Nullable
-	default JobExecution getJobExecution(long executionId) {
+	@Nullable default JobExecution getJobExecution(long executionId) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -186,8 +182,7 @@ default List<JobExecution> getJobExecutions(JobInstance jobInstance) {
 	 *
 	 * @since 4.2
 	 */
-	@Nullable
-	default JobExecution getLastJobExecution(JobInstance jobInstance) {
+	@Nullable default JobExecution getLastJobExecution(JobInstance jobInstance) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -196,8 +191,7 @@ default JobExecution getLastJobExecution(JobInstance jobInstance) {
 	 * @param jobParameters parameters identifying the {@link JobInstance}
 	 * @return the last execution of job if exists, null otherwise
 	 */
-	@Nullable
-	default JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) {
+	@Nullable default JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -231,8 +225,7 @@ default Set<JobExecution> findRunningJobExecutions(String jobName) {
 	 * @deprecated since 6.0 in favor of {@link #getStepExecution(long)}
 	 */
 	@Deprecated(since = "6.0", forRemoval = true)
-	@Nullable
-	default StepExecution getStepExecution(long jobExecutionId, long stepExecutionId) {
+	@Nullable default StepExecution getStepExecution(long jobExecutionId, long stepExecutionId) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -244,8 +237,7 @@ default StepExecution getStepExecution(long jobExecutionId, long stepExecutionId
 	 * @return the {@link StepExecution} that has this ID or {@code null} if not found.
 	 * @since 6.0
 	 */
-	@Nullable
-	default StepExecution getStepExecution(long stepExecutionId) {
+	@Nullable default StepExecution getStepExecution(long stepExecutionId) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -254,8 +246,7 @@ default StepExecution getStepExecution(long stepExecutionId) {
 	 * @param stepName the name of the step execution that might have run.
 	 * @return the last execution of step for the given job instance.
 	 */
-	@Nullable
-	default StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
+	@Nullable default StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
 		throw new UnsupportedOperationException();
 	}
 

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobExecutionDao.java

@@ -22,7 +22,7 @@
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.JobInstance;
 import org.springframework.batch.core.job.parameters.JobParameters;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Data Access Object for job executions.
@@ -70,8 +70,7 @@ default JobExecution createJobExecution(JobInstance jobInstance, JobParameters j
 	 * @return the last {@link JobExecution} to execute for this instance or {@code null}
 	 * if no job execution is found for the given job instance.
 	 */
-	@Nullable
-	JobExecution getLastJobExecution(JobInstance jobInstance);
+	@Nullable JobExecution getLastJobExecution(JobInstance jobInstance);
 
 	/**
 	 * @param jobName {@link String} containing the name of the job.
@@ -84,8 +83,7 @@ default JobExecution createJobExecution(JobInstance jobInstance, JobParameters j
 	 * @param executionId {@link Long} containing the id of the execution.
 	 * @return the {@link JobExecution} for given identifier.
 	 */
-	@Nullable
-	JobExecution getJobExecution(long executionId);
+	@Nullable JobExecution getJobExecution(long executionId);
 
 	/**
 	 * Because it may be possible that the status of a JobExecution is updated while

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java

@@ -22,7 +22,7 @@
 import org.springframework.batch.core.job.JobInstance;
 import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.batch.core.launch.NoSuchJobException;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Data Access Object for job instances.
@@ -57,16 +57,14 @@ public interface JobInstanceDao {
 	 * @return {@link JobInstance} object matching the job name and {@link JobParameters}
 	 * or {@code null}
 	 */
-	@Nullable
-	JobInstance getJobInstance(String jobName, JobParameters jobParameters);
+	@Nullable JobInstance getJobInstance(String jobName, JobParameters jobParameters);
 
 	/**
 	 * Fetch the job instance with the provided identifier.
 	 * @param instanceId the job identifier
 	 * @return the job instance with this identifier or {@code null} if it doesn't exist
 	 */
-	@Nullable
-	JobInstance getJobInstance(long instanceId);
+	@Nullable JobInstance getJobInstance(long instanceId);
 
 	/**
 	 * Fetch the JobInstance for the provided JobExecution.
@@ -109,8 +107,7 @@ default List<JobInstance> getJobInstances(String jobName) {
 	 *
 	 * @since 4.2
 	 */
-	@Nullable
-	default JobInstance getLastJobInstance(String jobName) {
+	@Nullable default JobInstance getLastJobInstance(String jobName) {
 		throw new UnsupportedOperationException();
 	}
 

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java

@@ -22,7 +22,7 @@
 import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.job.JobInstance;
 import org.springframework.batch.core.step.StepExecution;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 public interface StepExecutionDao {
 
@@ -55,8 +55,7 @@ default StepExecution createStepExecution(String stepName, JobExecution jobExecu
 	 * @return a {@link StepExecution}
 	 * @since 6.0
 	 */
-	@Nullable
-	StepExecution getStepExecution(long stepExecutionId);
+	@Nullable StepExecution getStepExecution(long stepExecutionId);
 
 	/**
 	 * Retrieve a {@link StepExecution} from its id.
@@ -76,8 +75,7 @@ default StepExecution createStepExecution(String stepName, JobExecution jobExecu
 	 * @param stepName the name of the step
 	 * @return a {@link StepExecution}
 	 */
-	@Nullable
-	default StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
+	@Nullable default StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) {
 		throw new UnsupportedOperationException();
 	}