Skip to content

Commit 3f5a793

fmbenhassine fmbenhassine

committed

Refine jSpecify nullability checks

Issue #4673

1 parent 4fd9541 commit 3f5a793Copy full SHA for 3f5a793

File tree

28 files changed

+96

-68

lines changed

spring-batch-core/src/main/java/org/springframework/batch/core
- configuration/support
  - DefaultBatchConfiguration.java
  - MapJobRegistry.java
- job
- launch/support
  - JobOperatorFactoryBean.java
  - TaskExecutorJobOperator.java
- listener
  - ExecutionContextPromotionListener.java
- partition
  - PartitionStep.java
  - support
    - TaskExecutorPartitionHandler.java
- scope
- step

28 files changed

+96

-68

lines changed

`‎spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`package org.springframework.batch.core.configuration.support;`
`17`	`17`
`18`	`18`	`import io.micrometer.observation.ObservationRegistry;`
`19`		`-import org.jspecify.annotations.NullUnmarked;`
`20`	`19`
`21`	`20`	`import org.springframework.batch.core.configuration.DuplicateJobException;`
`22`	`21`	`import org.springframework.batch.core.configuration.annotation.BatchObservabilityBeanPostProcessor;`
`@@ -79,9 +78,9 @@`
`79`	`78`	`*/`
`80`	`79`	`@Configuration(proxyBeanMethods = false)`
`81`	`80`	`@Import({ ScopeConfiguration.class, BatchObservabilityBeanPostProcessor.class })`
`82`		`-@NullUnmarked`
`83`	`81`	`public class DefaultBatchConfiguration implements ApplicationContextAware {`
`84`	`82`
	`83`	`+ @SuppressWarnings("NullAway.Init")`
`85`	`84`	`protected ApplicationContext applicationContext;`
`86`	`85`
`87`	`86`	`@Override`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java‎`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`import org.apache.commons.logging.Log;`
`25`	`25`	`import org.apache.commons.logging.LogFactory;`
`26`		`-import org.jspecify.annotations.NullUnmarked;`
	`26`	`+import org.jspecify.annotations.Nullable;`
`27`	`27`
`28`	`28`	`import org.springframework.batch.core.job.Job;`
`29`	`29`	`import org.springframework.batch.core.configuration.DuplicateJobException;`
`@@ -43,7 +43,6 @@`
`43`	`43`	`* @author Robert Fischer`
`44`	`44`	`* @author Mahmoud Ben Hassine`
`45`	`45`	`*/`
`46`		`-@NullUnmarked // FIXME how to fix nullability checks for the applicationContext field?`
`47`	`46`	`public class MapJobRegistry implements JobRegistry, SmartInitializingSingleton, ApplicationContextAware {`
`48`	`47`
`49`	`48`	`protected final Log logger = LogFactory.getLog(getClass());`
`@@ -53,6 +52,7 @@ public class MapJobRegistry implements JobRegistry, SmartInitializingSingleton,`
`53`	`52`	`*/`
`54`	`53`	`private final ConcurrentMap<String, Job> map = new ConcurrentHashMap<>();`
`55`	`54`
	`55`	`+ @SuppressWarnings("NullAway.Init")`
`56`	`56`	`private ApplicationContext applicationContext;`
`57`	`57`
`58`	`58`	`@Override`
`@@ -83,6 +83,7 @@ public void unregister(String name) {`
`83`	`83`	`this.map.remove(name);`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ @Nullable`
`86`	`87`	`@Override`
`87`	`88`	`public Job getJob(String name) {`
`88`	`89`	`return this.map.get(name);`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@`
`60`	`60`	`* @author Dave Syer`
`61`	`61`	`* @author Mahmoud Ben Hassine`
`62`	`62`	`*/`
`63`		`-@NullUnmarked // FIXME to remove once default constructors are removed`
	`63`	`+@NullUnmarked // FIXME to remove once default constructors (required by the batch XML`
	`64`	`+ // namespace) are removed`
`64`	`65`	`public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, InitializingBean {`
`65`	`66`
`66`	`67`	`protected static final Log logger = LogFactory.getLog(AbstractJob.class);`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@`
`40`	`40`	`* @author Michael Minella`
`41`	`41`	`* @author Mahmoud Ben Hassine`
`42`	`42`	`*/`
`43`		`-@NullUnmarked // FIXME to remove once default constructors are removed`
	`43`	`+@NullUnmarked // FIXME to remove once default constructors (required by the batch XML`
	`44`	`+ // namespace) are removed`
`44`	`45`	`public class SimpleJob extends AbstractJob {`
`45`	`46`
`46`	`47`	`private final List<Step> steps = new ArrayList<>();`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowJobBuilder.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@`
`32`	`32`	`* @author Mahmoud Ben Hassine`
`33`	`33`	`* @since 2.2`
`34`	`34`	`*/`
`35`		`-@NullUnmarked // FIXME to remove once default constructors are removed`
	`35`	`+@NullUnmarked // FIXME to remove once default constructors (required by the batch XML`
	`36`	`+ // namespace) are removed`
`36`	`37`	`public class FlowJobBuilder extends JobBuilderHelper<FlowJobBuilder> {`
`37`	`38`
`38`	`39`	`private Flow flow;`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@`
`46`	`46`	`* @author Taeik Lim`
`47`	`47`	`* @since 2.2`
`48`	`48`	`*/`
`49`		`-@NullUnmarked // FIXME to remove once default constructors are removed`
	`49`	`+@NullUnmarked // FIXME to remove once default constructors (required by the batch XML`
	`50`	`+ // namespace) are removed`
`50`	`51`	`public abstract class JobBuilderHelper<B extends JobBuilderHelper<B>> {`
`51`	`52`
`52`	`53`	`protected final Log logger = LogFactory.getLog(getClass());`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/SimpleJobBuilder.java‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@`
`33`	`33`	`* @since 2.2`
`34`	`34`	`*`
`35`	`35`	`*/`
`36`		`-@NullUnmarked // FIXME to remove once default constructors are removed`
	`36`	`+@NullUnmarked // FIXME to remove once default constructors (required by the batch XML`
	`37`	`+ // namespace) are removed`
`37`	`38`	`public class SimpleJobBuilder extends JobBuilderHelper<SimpleJobBuilder> {`
`38`	`39`
`39`	`40`	`private final List<Step> steps = new ArrayList<>();`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobOperatorFactoryBean.java‎`

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`import io.micrometer.observation.ObservationRegistry;`
`21`	`21`	`import org.apache.commons.logging.Log;`
`22`	`22`	`import org.apache.commons.logging.LogFactory;`
`23`		`-import org.jspecify.annotations.NullUnmarked;`
	`23`	`+import org.jspecify.annotations.Nullable;`
`24`	`24`
`25`	`25`	`import org.springframework.aop.framework.ProxyFactory;`
`26`	`26`	`import org.springframework.batch.core.configuration.BatchConfigurationException;`
`@@ -58,26 +58,29 @@`
`58`	`58`	`* @author Mahmoud Ben Hassine`
`59`	`59`	`* @since 5.0`
`60`	`60`	`*/`
`61`		`-@NullUnmarked`
`62`	`61`	`public class JobOperatorFactoryBean implements FactoryBean<JobOperator>, ApplicationContextAware, InitializingBean {`
`63`	`62`
`64`	`63`	`protected static final Log logger = LogFactory.getLog(JobOperatorFactoryBean.class);`
`65`	`64`
	`65`	`+ @SuppressWarnings("NullAway.Init")`
`66`	`66`	`private ApplicationContext applicationContext;`
`67`	`67`
`68`		`- private PlatformTransactionManager transactionManager;`
	`68`	`+ private @NullablePlatformTransactionManager transactionManager;`
`69`	`69`
`70`		`- private TransactionAttributeSource transactionAttributeSource;`
	`70`	`+ private @NullableTransactionAttributeSource transactionAttributeSource;`
`71`	`71`
	`72`	`+ @SuppressWarnings("NullAway.Init")`
`72`	`73`	`private JobRegistry jobRegistry;`
`73`	`74`
	`75`	`+ @SuppressWarnings("NullAway.Init")`
`74`	`76`	`private JobRepository jobRepository;`
`75`	`77`
`76`	`78`	`private JobParametersConverter jobParametersConverter = new DefaultJobParametersConverter();`
`77`	`79`
	`80`	`+ @SuppressWarnings("NullAway.Init")`
`78`	`81`	`private TaskExecutor taskExecutor;`
`79`	`82`
`80`		`- private ObservationRegistry observationRegistry;`
	`83`	`+ private @NullableObservationRegistry observationRegistry;`
`81`	`84`
`82`	`85`	`private final ProxyFactory proxyFactory = new ProxyFactory();`
`83`	`86`
`@@ -192,6 +195,7 @@ public boolean isSingleton() {`
`192`	`195`	`return true;`
`193`	`196`	`}`
`194`	`197`
	`198`	`+ @SuppressWarnings("DataFlowIssue")`
`195`	`199`	`@Override`
`196`	`200`	`public JobOperator getObject() throws Exception {`
`197`	`201`	`TransactionInterceptor advice = new TransactionInterceptor((TransactionManager) this.transactionManager,`
`@@ -203,7 +207,7 @@ public JobOperator getObject() throws Exception {`
`203`	`207`	`return (JobOperator) this.proxyFactory.getProxy(getClass().getClassLoader());`
`204`	`208`	`}`
`205`	`209`
`206`		`- @SuppressWarnings("removal")`
	`210`	`+ @SuppressWarnings({ "removal" })`
`207`	`211`	`private TaskExecutorJobOperator getTarget() throws Exception {`
`208`	`212`	`TaskExecutorJobOperator taskExecutorJobOperator = new TaskExecutorJobOperator();`
`209`	`213`	`taskExecutorJobOperator.setJobRegistry(this.jobRegistry);`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobOperator.java‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`import io.micrometer.observation.ObservationRegistry;`
`20`	`20`	`import org.apache.commons.logging.Log;`
`21`	`21`	`import org.apache.commons.logging.LogFactory;`
`22`		`-import org.jspecify.annotations.NullUnmarked;`
	`22`	`+import org.jspecify.annotations.Nullable;`
`23`	`23`
`24`	`24`	`import org.springframework.batch.core.configuration.JobRegistry;`
`25`	`25`	`import org.springframework.batch.core.job.Job;`
`@@ -60,12 +60,11 @@`
`60`	`60`	`* @since 6.0`
`61`	`61`	`*/`
`62`	`62`	`@SuppressWarnings("removal")`
`63`		`-@NullUnmarked`
`64`	`63`	`public class TaskExecutorJobOperator extends SimpleJobOperator {`
`65`	`64`
`66`	`65`	`private static final Log logger = LogFactory.getLog(TaskExecutorJobOperator.class.getName());`
`67`	`66`
`68`		`- protected ObservationRegistry observationRegistry;`
	`67`	`+ protected @NullableObservationRegistry observationRegistry;`
`69`	`68`
`70`	`69`	`@Override`
`71`	`70`	`public void afterPropertiesSet() throws Exception {`

`‎spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java‎`

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.springframework.batch.core.listener;`
`17`	`17`
`18`		`-import org.jspecify.annotations.NullUnmarked;`
	`18`	`+import org.jspecify.annotations.Nullable;`
`19`	`19`
`20`	`20`	`import org.springframework.batch.core.ExitStatus;`
`21`	`21`	`import org.springframework.batch.core.job.Job;`
`@@ -42,17 +42,19 @@`
`42`	`42`	`* @author Mahmoud Ben Hassine`
`43`	`43`	`* @since 2.0`
`44`	`44`	`*/`
`45`		`-@NullUnmarked`
`46`	`45`	`public class ExecutionContextPromotionListener implements StepExecutionListener, InitializingBean {`
`47`	`46`
`48`		`- private String[] keys = null;`
	`47`	`+ private String@Nullable[] keys = null;`
`49`	`48`
`50`	`49`	`private String[] statuses = new String[] { ExitStatus.COMPLETED.getExitCode() };`
`51`	`50`
`52`	`51`	`private boolean strict = false;`
`53`	`52`
`54`	`53`	`@Override`
`55`	`54`	`public ExitStatus afterStep(StepExecution stepExecution) {`
	`55`	`+ if (this.keys == null) {`
	`56`	`+ return stepExecution.getExitStatus();`
	`57`	`+ }`
`56`	`58`	`ExecutionContext stepContext = stepExecution.getExecutionContext();`
`57`	`59`	`ExecutionContext jobContext = stepExecution.getJobExecution().getExecutionContext();`
`58`	`60`	`String exitCode = stepExecution.getExitStatus().getExitCode();`
`@@ -73,7 +75,7 @@ public ExitStatus afterStep(StepExecution stepExecution) {`
`73`	`75`	`}`
`74`	`76`	`}`
`75`	`77`
`76`		`- return null;`
	`78`	`+ return stepExecution.getExitStatus();`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`@Override`

0 commit comments

Comments

(0)