Revert "Add JSpecify nullability annotations to Spring Cloud Task"

This reverts commit 7532ed8.

Author: cppwfs

.mvn/jvm.config

@@ -1,11 +1 @@
 -Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom
---add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
---add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
---add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED

.mvn/maven.config

@@ -1,3 +1,2 @@
 -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
--Djspecify.enabled=true
 -P spring

spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/RangeConverter.java

@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.task.batch.autoconfigure;
 
-import org.jspecify.annotations.Nullable;
-
 import org.springframework.batch.infrastructure.item.file.transform.Range;
 import org.springframework.core.convert.converter.Converter;
 
@@ -33,7 +31,7 @@
 public class RangeConverter implements Converter<String, Range> {
 
 	@Override
-	public @Nullable Range convert(String source) {
+	public Range convert(String source) {
 		if (source == null) {
 			return null;
 		}

spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java

@@ -22,7 +22,8 @@
 import org.springframework.batch.core.job.builder.JobBuilder;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.Step;
-import org.springframework.batch.core.step.builder.ChunkOrientedStepBuilder;
+import org.springframework.batch.core.step.builder.SimpleStepBuilder;
+import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.batch.infrastructure.item.ItemProcessor;
 import org.springframework.batch.infrastructure.item.ItemReader;
 import org.springframework.batch.infrastructure.item.ItemWriter;
@@ -77,16 +78,16 @@ private void validateProperties(SingleStepJobProperties properties) {
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = "spring.batch.job", name = "job-name")
 	public Job job(ItemReader<Map<String, Object>> itemReader, ItemWriter<Map<String, Object>> itemWriter) {
-		Assert.state(properties.getStepName() != null, "A step name is required");
-		Assert.state(properties.getChunkSize() != null, "A chunkSize is required");
-		var chunkOrientedStepBuilder = new ChunkOrientedStepBuilder(properties.getStepName(), this.jobRepository,
-				this.properties.getChunkSize())
-			.transactionManager(this.transactionManager)
+
+		SimpleStepBuilder<Map<String, Object>, Map<String, Object>> stepBuilder = new StepBuilder(
+				this.properties.getStepName(), this.jobRepository)
+			.<Map<String, Object>, Map<String, Object>>chunk(this.properties.getChunkSize(), this.transactionManager)
 			.reader(itemReader);
-		chunkOrientedStepBuilder.processor(this.itemProcessor);
-		Step step = chunkOrientedStepBuilder.writer(itemWriter).build();
 
-		Assert.state(this.properties.getJobName() != null, "A job name is required");
+		stepBuilder.processor(this.itemProcessor);
+
+		Step step = stepBuilder.writer(itemWriter).build();
+
 		return new JobBuilder(this.properties.getJobName(), this.jobRepository).start(step).build();
 	}
 

spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobProperties.java

@@ -16,8 +16,6 @@
 
 package org.springframework.cloud.task.batch.autoconfigure;
 
-import org.jspecify.annotations.Nullable;
-
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
@@ -32,63 +30,63 @@ public class SingleStepJobProperties {
 	/**
 	 * Name of the step in the single step job.
 	 */
-	private @Nullable String stepName;
+	private String stepName;
 
 	/**
 	 * The number of items to process per transaction or chunk.
 	 */
-	private @Nullable Integer chunkSize;
+	private Integer chunkSize;
 
 	/**
 	 * The name of the job.
 	 */
-	private @Nullable String jobName;
+	private String jobName;
 
 	/**
 	 * Name of the step in the single step job.
 	 * @return name
 	 */
-	public @Nullable String getStepName() {
+	public String getStepName() {
 		return stepName;
 	}
 
 	/**
 	 * Set the name of the step.
 	 * @param stepName name
 	 */
-	public void setStepName(@Nullable String stepName) {
+	public void setStepName(String stepName) {
 		this.stepName = stepName;
 	}
 
 	/**
 	 * The number of items to process per transaction/chunk.
 	 * @return number of items
 	 */
-	public @Nullable Integer getChunkSize() {
+	public Integer getChunkSize() {
 		return chunkSize;
 	}
 
 	/**
 	 * Set the number of items within a transaction/chunk.
 	 * @param chunkSize number of items
 	 */
-	public void setChunkSize(@Nullable Integer chunkSize) {
+	public void setChunkSize(Integer chunkSize) {
 		this.chunkSize = chunkSize;
 	}
 
 	/**
 	 * The name of the job.
 	 * @return name
 	 */
-	public @Nullable String getJobName() {
+	public String getJobName() {
 		return jobName;
 	}
 
 	/**
 	 * Set the name of the job.
 	 * @param jobName name
 	 */
-	public void setJobName(@Nullable String jobName) {
+	public void setJobName(String jobName) {
 		this.jobName = jobName;
 	}
 

spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java

@@ -42,7 +42,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.task.batch.autoconfigure.RangeConverter;
 import org.springframework.context.annotation.Bean;
-import org.springframework.util.Assert;
 
 /**
  * Autconfiguration for a {@code FlatFileItemReader}.
@@ -72,8 +71,6 @@ public FlatFileItemReader<Map<String, Object>> itemReader(@Autowired(required =
 			@Autowired(required = false) LineMapper<Map<String, Object>> lineMapper,
 			@Autowired(required = false) LineCallbackHandler skippedLinesCallback,
 			@Autowired(required = false) RecordSeparatorPolicy recordSeparatorPolicy) {
-		Assert.state(this.properties.getName() != null, "A name is required");
-		Assert.state(this.properties.getResource() != null, "A resource is required");
 		FlatFileItemReaderBuilder<Map<String, Object>> mapFlatFileItemReaderBuilder = new FlatFileItemReaderBuilder<Map<String, Object>>()
 			.name(this.properties.getName())
 			.resource(this.properties.getResource())
@@ -93,7 +90,6 @@ public FlatFileItemReader<Map<String, Object>> itemReader(@Autowired(required =
 		mapFlatFileItemReaderBuilder.skippedLinesCallback(skippedLinesCallback);
 
 		if (this.properties.isDelimited()) {
-			Assert.state(this.properties.getNames() != null, "Names are required");
 			mapFlatFileItemReaderBuilder.delimited()
 				.quoteCharacter(this.properties.getQuoteCharacter())
 				.delimiter(this.properties.getDelimiter())
@@ -103,14 +99,9 @@ public FlatFileItemReader<Map<String, Object>> itemReader(@Autowired(required =
 				.fieldSetMapper(new MapFieldSetMapper());
 		}
 		else if (this.properties.isFixedLength()) {
-			Assert.state(this.properties.getNames() != null, "Names are required");
 			RangeConverter rangeConverter = new RangeConverter();
 			List<Range> ranges = new ArrayList<>();
-			this.properties.getRanges().forEach(range -> {
-				Range result = rangeConverter.convert(range);
-				Assert.state(result != null, "Range String could not converted to non-null range");
-				ranges.add(result);
-			});
+			this.properties.getRanges().forEach(range -> ranges.add(rangeConverter.convert(range)));
 			mapFlatFileItemReaderBuilder.fixedLength()
 				.columns(ranges.toArray(new Range[0]))
 				.names(this.properties.getNames())

spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderProperties.java

@@ -19,8 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jspecify.annotations.Nullable;
-
 import org.springframework.batch.infrastructure.item.file.FlatFileItemReader;
 import org.springframework.batch.infrastructure.item.file.transform.DelimitedLineTokenizer;
 import org.springframework.batch.infrastructure.item.file.transform.Range;
@@ -46,7 +44,7 @@ public class FlatFileItemReaderProperties {
 	 * {@link org.springframework.batch.infrastructure.item.ExecutionContext}. Required if
 	 * {@link #setSaveState} is set to {@code true}.
 	 */
-	private @Nullable String name;
+	private String name;
 
 	/**
 	 * Configure the maximum number of items to be read.
@@ -66,7 +64,7 @@ public class FlatFileItemReaderProperties {
 	/**
 	 * The {@link Resource} to be used as input.
 	 */
-	private @Nullable Resource resource;
+	private Resource resource;
 
 	/**
 	 * Configure whether the reader should be in strict mode (require the input
@@ -120,7 +118,7 @@ public class FlatFileItemReaderProperties {
 	/**
 	 * The names of the fields to be parsed from the file.
 	 */
-	private String @Nullable [] names;
+	private String[] names;
 
 	/**
 	 * Indicates whether the number of tokens must match the number of configured fields.
@@ -152,7 +150,7 @@ public void setSaveState(boolean saveState) {
 	 * keys.
 	 * @return the name
 	 */
-	public @Nullable String getName() {
+	public String getName() {
 		return this.name;
 	}
 
@@ -163,7 +161,7 @@ public void setSaveState(boolean saveState) {
 	 * @param name name of the reader instance
 	 * @see org.springframework.batch.infrastructure.item.ItemStreamSupport#setName(String)
 	 */
-	public void setName(@Nullable String name) {
+	public void setName(String name) {
 		this.name = name;
 	}
 
@@ -221,7 +219,7 @@ public void setComments(List<String> comments) {
 	 * The input file for the {@code FlatFileItemReader}.
 	 * @return a Resource
 	 */
-	public @Nullable Resource getResource() {
+	public Resource getResource() {
 		return this.resource;
 	}
 
@@ -230,7 +228,7 @@ public void setComments(List<String> comments) {
 	 * @param resource the input to the reader.
 	 * @see FlatFileItemReader#setResource(Resource)
 	 */
-	public void setResource(@Nullable Resource resource) {
+	public void setResource(Resource resource) {
 		this.resource = resource;
 	}
 
@@ -393,15 +391,15 @@ public void setRanges(List<String> ranges) {
 	 * Names of each column.
 	 * @return names
 	 */
-	public String @Nullable [] getNames() {
+	public String[] getNames() {
 		return this.names;
 	}
 
 	/**
 	 * The names of the fields to be parsed from the file.
 	 * @param names names of fields
 	 */
-	public void setNames(String @Nullable [] names) {
+	public void setNames(String[] names) {
 		this.names = names;
 	}
 

spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java

@@ -35,7 +35,6 @@
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.io.WritableResource;
-import org.springframework.util.Assert;
 
 /**
  * Autoconfiguration for a {@code FlatFileItemWriter}.
@@ -48,7 +47,7 @@
 @AutoConfigureAfter(BatchAutoConfiguration.class)
 public class FlatFileItemWriterAutoConfiguration {
 
-	private final FlatFileItemWriterProperties properties;
+	private FlatFileItemWriterProperties properties;
 
 	@Autowired(required = false)
 	private LineAggregator<Map<String, Object>> lineAggregator;
@@ -79,8 +78,7 @@ else if ((this.properties.isFormatted() || this.properties.isDelimited()) && thi
 			throw new IllegalStateException(
 					"A LineAggregator must be configured if the " + "output is not formatted or delimited");
 		}
-		Assert.state(this.properties.getName() != null, "name must not be null");
-		Assert.state(this.properties.getResource() != null, "resource must not be null");
+
 		FlatFileItemWriterBuilder<Map<String, Object>> builder = new FlatFileItemWriterBuilder<Map<String, Object>>()
 			.name(this.properties.getName())
 			.resource((WritableResource) this.properties.getResource())
@@ -103,13 +101,10 @@ else if ((this.properties.isFormatted() || this.properties.isDelimited()) && thi
 				delimitedBuilder.fieldExtractor(this.fieldExtractor);
 			}
 			else {
-				Assert.state(this.properties.getNames() != null, "names must not be null");
 				delimitedBuilder.fieldExtractor(new MapFieldExtractor(this.properties.getNames()));
 			}
 		}
 		else if (this.properties.isFormatted()) {
-			Assert.state(this.properties.getFormat() != null, "format must not be null");
-
 			FlatFileItemWriterBuilder.FormattedBuilder<Map<String, Object>> formattedBuilder = builder.formatted()
 				.format(this.properties.getFormat())
 				.locale(this.properties.getLocale())
@@ -120,7 +115,6 @@ else if (this.properties.isFormatted()) {
 				formattedBuilder.fieldExtractor(this.fieldExtractor);
 			}
 			else {
-				Assert.state(this.properties.getNames() != null, "names must not be null");
 				formattedBuilder.fieldExtractor(new MapFieldExtractor(this.properties.getNames()));
 			}
 		}
@@ -137,7 +131,7 @@ else if (this.lineAggregator != null) {
 	 */
 	public static class MapFieldExtractor implements FieldExtractor<Map<String, Object>> {
 
-		private final String[] names;
+		private String[] names;
 
 		public MapFieldExtractor(String[] names) {
 			this.names = names;