Added documentation for the Single Step Batch Job Starter

This commit does two things:

1. Adds documentation to the reference documentation for the single step
batch job starter.
2. It standardizes the naming of the properties across the various
readers/writers the autoconfiguration provides.

Polished docs on merge

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

@@ -71,7 +71,7 @@ public class FlatFileItemReaderAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(prefix = "spring.batch.job.flatfilereader", name = "name")
+	@ConditionalOnProperty(prefix = "spring.batch.job.flatfileitemreader", name = "name")
 	public FlatFileItemReader<Map<String, Object>> itemReader() {
 		FlatFileItemReaderBuilder<Map<String, Object>> mapFlatFileItemReaderBuilder = new FlatFileItemReaderBuilder<Map<String, Object>>()
 				.name(this.properties.getName()).resource(this.properties.getResource())

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

@@ -31,7 +31,7 @@ import org.springframework.core.io.Resource;
  * @author Michael Minella
  * @since 2.3
  */
-@ConfigurationProperties(prefix = "spring.batch.job.flatfilereader")
+@ConfigurationProperties(prefix = "spring.batch.job.flatfileitemreader")
 public class FlatFileItemReaderProperties {
 
 	private boolean saveState = true;

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

@@ -66,7 +66,7 @@ public class FlatFileItemWriterAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(prefix = "spring.batch.job.flatfilewriter", name = "name")
+	@ConditionalOnProperty(prefix = "spring.batch.job.flatfileitemwriter", name = "name")
 	public FlatFileItemWriter<Map<String, Object>> itemWriter() {
 
 		if (this.properties.isDelimited() && this.properties.isFormatted()) {

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

@@ -28,7 +28,7 @@ import org.springframework.core.io.Resource;
  * @author Michael Minella
  * @since 2.3
  */
-@ConfigurationProperties(prefix = "spring.batch.job.flatfilewriter")
+@ConfigurationProperties(prefix = "spring.batch.job.flatfileitemwriter")
 public class FlatFileItemWriterProperties {
 
 	private Resource resource;

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

@@ -20,9 +20,9 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.database.ItemPreparedStatementSetter;
 import org.springframework.batch.item.database.ItemSqlParameterSourceProvider;
+import org.springframework.batch.item.database.JdbcBatchItemWriter;
 import org.springframework.batch.item.database.builder.JdbcBatchItemWriterBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -41,9 +41,9 @@ import org.springframework.context.annotation.Configuration;
  * @since 2.3
  */
 @Configuration
-@EnableConfigurationProperties(JdbcItemWriterProperties.class)
+@EnableConfigurationProperties(JdbcBatchItemWriterProperties.class)
 @AutoConfigureAfter(BatchAutoConfiguration.class)
-public class JdbcItemWriterAutoConfiguration {
+public class JdbcBatchItemWriterAutoConfiguration {
 
 	@Autowired(required = false)
 	private ItemPreparedStatementSetter itemPreparedStatementSetter;
@@ -51,20 +51,20 @@ public class JdbcItemWriterAutoConfiguration {
 	@Autowired(required = false)
 	private ItemSqlParameterSourceProvider itemSqlParameterSourceProvider;
 
-	private JdbcItemWriterProperties properties;
+	private JdbcBatchItemWriterProperties properties;
 
 	private DataSource dataSource;
 
-	public JdbcItemWriterAutoConfiguration(DataSource dataSource,
-			JdbcItemWriterProperties properties) {
+	public JdbcBatchItemWriterAutoConfiguration(DataSource dataSource,
+			JdbcBatchItemWriterProperties properties) {
 		this.dataSource = dataSource;
 		this.properties = properties;
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(prefix = "spring.batch.job.jdbcwriter", name = "name")
-	public ItemWriter<Map<String, Object>> itemWriter() {
+	@ConditionalOnProperty(prefix = "spring.batch.job.jdbcbatchitemwriter", name = "name")
+	public JdbcBatchItemWriter<Map<String, Object>> itemWriter() {
 
 		JdbcBatchItemWriterBuilder<Map<String, Object>> jdbcBatchItemWriterBuilder = new JdbcBatchItemWriterBuilder<Map<String, Object>>()
 				.dataSource(this.dataSource).sql(this.properties.getSql());

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

@@ -19,13 +19,13 @@ package org.springframework.cloud.task.batch.autoconfigure.jdbc;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * Properties to configure a {@code JdbcItemWriter}.
+ * Properties to configure a {@code JdbcBatchItemWriter}.
  *
  * @author Glenn Renfro
  * @since 2.3
  */
-@ConfigurationProperties(prefix = "spring.batch.job.jdbcwriter")
-public class JdbcItemWriterProperties {
+@ConfigurationProperties(prefix = "spring.batch.job.jdbcbatchitemwriter")
+public class JdbcBatchItemWriterProperties {
 
 	private String name;
 

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

@@ -43,7 +43,7 @@ import org.springframework.jdbc.core.RowMapper;
 @Configuration
 @EnableConfigurationProperties(JdbcCursorItemReaderProperties.class)
 @AutoConfigureAfter(BatchAutoConfiguration.class)
-@ConditionalOnProperty(prefix = "spring.batch.job.jdbccursorreader", name = "name")
+@ConditionalOnProperty(prefix = "spring.batch.job.jdbccursoritemreader", name = "name")
 public class JdbcCursorItemReaderAutoConfiguration {
 
 	private final JdbcCursorItemReaderProperties properties;

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

@@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Michael Minella
  * @since 2.3
  */
-@ConfigurationProperties(prefix = "spring.batch.job.jdbccursorreader")
+@ConfigurationProperties(prefix = "spring.batch.job.jdbccursoritemreader")
 public class JdbcCursorItemReaderProperties {
 
 	private boolean saveState = true;

spring-cloud-starter-single-step-batch-job/src/main/resources/META-INF/spring.factories

@@ -2,7 +2,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=org.springframewo
   org.springframework.cloud.task.batch.autoconfigure.RangeConverter,\
   org.springframework.cloud.task.batch.autoconfigure.SingleStepJobAutoConfiguration,\
   org.springframework.cloud.task.batch.autoconfigure.flatfile.FlatFileItemWriterAutoConfiguration, \
-  org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcItemWriterAutoConfiguration, \
+  org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcBatchItemWriterAutoConfiguration, \
   org.springframework.cloud.task.batch.autoconfigure.jdbc.JdbcCursorItemReaderAutoConfiguration, \
   org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemReaderAutoConfiguration, \
   org.springframework.cloud.task.batch.autoconfigure.rabbit.AmqpItemWriterAutoConfiguration, \

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

@@ -85,21 +85,21 @@ public class FlatFileItemReaderAutoConfigurationTests {
 								FlatFileItemReaderAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilereader.savestate=true",
-						"spring.batch.job.flatfilereader.name=fullDelimitedConfiguration",
-						"spring.batch.job.flatfilereader.maxItemCount=5",
-						"spring.batch.job.flatfilereader.currentItemCount=2",
-						"spring.batch.job.flatfilereader.comments=#,$",
-						"spring.batch.job.flatfilereader.resource=/testUTF16.csv",
-						"spring.batch.job.flatfilereader.strict=true",
-						"spring.batch.job.flatfilereader.encoding=UTF-16",
-						"spring.batch.job.flatfilereader.linesToSkip=1",
-						"spring.batch.job.flatfilereader.delimited=true",
-						"spring.batch.job.flatfilereader.delimiter=@",
-						"spring.batch.job.flatfilereader.quoteCharacter=%",
-						"spring.batch.job.flatfilereader.includedFields=1,3,5",
-						"spring.batch.job.flatfilereader.names=foo,bar,baz",
-						"spring.batch.job.flatfilereader.parsingStrict=false");
+						"spring.batch.job.flatfileitemreader.savestate=true",
+						"spring.batch.job.flatfileitemreader.name=fullDelimitedConfiguration",
+						"spring.batch.job.flatfileitemreader.maxItemCount=5",
+						"spring.batch.job.flatfileitemreader.currentItemCount=2",
+						"spring.batch.job.flatfileitemreader.comments=#,$",
+						"spring.batch.job.flatfileitemreader.resource=/testUTF16.csv",
+						"spring.batch.job.flatfileitemreader.strict=true",
+						"spring.batch.job.flatfileitemreader.encoding=UTF-16",
+						"spring.batch.job.flatfileitemreader.linesToSkip=1",
+						"spring.batch.job.flatfileitemreader.delimited=true",
+						"spring.batch.job.flatfileitemreader.delimiter=@",
+						"spring.batch.job.flatfileitemreader.quoteCharacter=%",
+						"spring.batch.job.flatfileitemreader.includedFields=1,3,5",
+						"spring.batch.job.flatfileitemreader.names=foo,bar,baz",
+						"spring.batch.job.flatfileitemreader.parsingStrict=false");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -142,15 +142,15 @@ public class FlatFileItemReaderAutoConfigurationTests {
 						FlatFileItemReaderAutoConfiguration.class, RangeConverter.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilereader.savestate=true",
-						"spring.batch.job.flatfilereader.name=fixedWidthConfiguration",
-						"spring.batch.job.flatfilereader.comments=#,$",
-						"spring.batch.job.flatfilereader.resource=/test.txt",
-						"spring.batch.job.flatfilereader.strict=true",
-						"spring.batch.job.flatfilereader.fixedLength=true",
-						"spring.batch.job.flatfilereader.ranges=3-4,7-8,11",
-						"spring.batch.job.flatfilereader.names=foo,bar,baz",
-						"spring.batch.job.flatfilereader.parsingStrict=false");
+						"spring.batch.job.flatfileitemreader.savestate=true",
+						"spring.batch.job.flatfileitemreader.name=fixedWidthConfiguration",
+						"spring.batch.job.flatfileitemreader.comments=#,$",
+						"spring.batch.job.flatfileitemreader.resource=/test.txt",
+						"spring.batch.job.flatfileitemreader.strict=true",
+						"spring.batch.job.flatfileitemreader.fixedLength=true",
+						"spring.batch.job.flatfileitemreader.ranges=3-4,7-8,11",
+						"spring.batch.job.flatfileitemreader.names=foo,bar,baz",
+						"spring.batch.job.flatfileitemreader.parsingStrict=false");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -202,9 +202,9 @@ public class FlatFileItemReaderAutoConfigurationTests {
 								FlatFileItemReaderAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilereader.name=fixedWidthConfiguration",
-						"spring.batch.job.flatfilereader.resource=/test.txt",
-						"spring.batch.job.flatfilereader.strict=true");
+						"spring.batch.job.flatfileitemreader.name=fixedWidthConfiguration",
+						"spring.batch.job.flatfileitemreader.resource=/test.txt",
+						"spring.batch.job.flatfileitemreader.strict=true");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -242,13 +242,13 @@ public class FlatFileItemReaderAutoConfigurationTests {
 						FlatFileItemReaderAutoConfiguration.class, RangeConverter.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilereader.name=fixedWidthConfiguration",
-						"spring.batch.job.flatfilereader.resource=/test.txt",
-						"spring.batch.job.flatfilereader.linesToSkip=2",
-						"spring.batch.job.flatfilereader.fixedLength=true",
-						"spring.batch.job.flatfilereader.ranges=3-4,7-8,11",
-						"spring.batch.job.flatfilereader.names=foo,bar,baz",
-						"spring.batch.job.flatfilereader.strict=true");
+						"spring.batch.job.flatfileitemreader.name=fixedWidthConfiguration",
+						"spring.batch.job.flatfileitemreader.resource=/test.txt",
+						"spring.batch.job.flatfileitemreader.linesToSkip=2",
+						"spring.batch.job.flatfileitemreader.fixedLength=true",
+						"spring.batch.job.flatfileitemreader.ranges=3-4,7-8,11",
+						"spring.batch.job.flatfileitemreader.names=foo,bar,baz",
+						"spring.batch.job.flatfileitemreader.strict=true");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -287,10 +287,10 @@ public class FlatFileItemReaderAutoConfigurationTests {
 						FlatFileItemReaderAutoConfiguration.class, RangeConverter.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilereader.name=fixedWidthConfiguration",
-						"spring.batch.job.flatfilereader.resource=/test.txt",
-						"spring.batch.job.flatfilereader.maxItemCount=1",
-						"spring.batch.job.flatfilereader.strict=true");
+						"spring.batch.job.flatfileitemreader.name=fixedWidthConfiguration",
+						"spring.batch.job.flatfileitemreader.resource=/test.txt",
+						"spring.batch.job.flatfileitemreader.maxItemCount=1",
+						"spring.batch.job.flatfileitemreader.strict=true");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);

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

@@ -144,19 +144,19 @@ public class FlatFileItemWriterAutoConfigurationTests {
 								FlatFileItemWriterAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilewriter.name=fooWriter",
+						"spring.batch.job.flatfileitemwriter.name=fooWriter",
 						String.format(
-								"spring.batch.job.flatfilewriter.resource=file://%s",
+								"spring.batch.job.flatfileitemwriter.resource=file://%s",
 								this.outputFile.getAbsolutePath()),
-						"spring.batch.job.flatfilewriter.encoding=UTF-16",
-						"spring.batch.job.flatfilewriter.saveState=false",
-						"spring.batch.job.flatfilewriter.shouldDeleteIfEmpty=true",
-						"spring.batch.job.flatfilewriter.delimited=true",
-						"spring.batch.job.flatfilewriter.names=item",
-						"spring.batch.job.flatfilewriter.append=true",
-						"spring.batch.job.flatfilewriter.forceSync=true",
-						"spring.batch.job.flatfilewriter.shouldDeleteIfExists=false",
-						"spring.batch.job.flatfilewriter.transactional=false");
+						"spring.batch.job.flatfileitemwriter.encoding=UTF-16",
+						"spring.batch.job.flatfileitemwriter.saveState=false",
+						"spring.batch.job.flatfileitemwriter.shouldDeleteIfEmpty=true",
+						"spring.batch.job.flatfileitemwriter.delimited=true",
+						"spring.batch.job.flatfileitemwriter.names=item",
+						"spring.batch.job.flatfileitemwriter.append=true",
+						"spring.batch.job.flatfileitemwriter.forceSync=true",
+						"spring.batch.job.flatfileitemwriter.shouldDeleteIfExists=false",
+						"spring.batch.job.flatfileitemwriter.transactional=false");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -200,16 +200,16 @@ public class FlatFileItemWriterAutoConfigurationTests {
 								FlatFileItemWriterAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=2",
-						"spring.batch.job.flatfilewriter.name=fooWriter",
+						"spring.batch.job.flatfileitemwriter.name=fooWriter",
 						String.format(
-								"spring.batch.job.flatfilewriter.resource=file://%s",
+								"spring.batch.job.flatfileitemwriter.resource=file://%s",
 								this.outputFile.getAbsolutePath()),
-						"spring.batch.job.flatfilewriter.encoding=UTF-8",
-						"spring.batch.job.flatfilewriter.formatted=true",
-						"spring.batch.job.flatfilewriter.names=item",
-						"spring.batch.job.flatfilewriter.format=item = %s",
-						"spring.batch.job.flatfilewriter.minimumLength=8",
-						"spring.batch.job.flatfilewriter.maximumLength=10");
+						"spring.batch.job.flatfileitemwriter.encoding=UTF-8",
+						"spring.batch.job.flatfileitemwriter.formatted=true",
+						"spring.batch.job.flatfileitemwriter.names=item",
+						"spring.batch.job.flatfileitemwriter.format=item = %s",
+						"spring.batch.job.flatfileitemwriter.minimumLength=8",
+						"spring.batch.job.flatfileitemwriter.maximumLength=10");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -243,14 +243,14 @@ public class FlatFileItemWriterAutoConfigurationTests {
 								FlatFileItemWriterAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilewriter.name=fooWriter",
+						"spring.batch.job.flatfileitemwriter.name=fooWriter",
 						String.format(
-								"spring.batch.job.flatfilewriter.resource=file://%s",
+								"spring.batch.job.flatfileitemwriter.resource=file://%s",
 								this.outputFile.getAbsolutePath()),
-						"spring.batch.job.flatfilewriter.encoding=UTF-8",
-						"spring.batch.job.flatfilewriter.formatted=true",
-						"spring.batch.job.flatfilewriter.names=item",
-						"spring.batch.job.flatfilewriter.format=item = %s");
+						"spring.batch.job.flatfileitemwriter.encoding=UTF-8",
+						"spring.batch.job.flatfileitemwriter.formatted=true",
+						"spring.batch.job.flatfileitemwriter.names=item",
+						"spring.batch.job.flatfileitemwriter.format=item = %s");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -284,12 +284,12 @@ public class FlatFileItemWriterAutoConfigurationTests {
 								FlatFileItemWriterAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilewriter.name=fooWriter",
+						"spring.batch.job.flatfileitemwriter.name=fooWriter",
 						String.format(
-								"spring.batch.job.flatfilewriter.resource=file://%s",
+								"spring.batch.job.flatfileitemwriter.resource=file://%s",
 								this.outputFile.getAbsolutePath()),
-						"spring.batch.job.flatfilewriter.encoding=UTF-8",
-						"spring.batch.job.flatfilewriter.delimited=true");
+						"spring.batch.job.flatfileitemwriter.encoding=UTF-8",
+						"spring.batch.job.flatfileitemwriter.delimited=true");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -323,11 +323,11 @@ public class FlatFileItemWriterAutoConfigurationTests {
 								FlatFileItemWriterAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilewriter.name=fooWriter",
+						"spring.batch.job.flatfileitemwriter.name=fooWriter",
 						String.format(
-								"spring.batch.job.flatfilewriter.resource=file://%s",
+								"spring.batch.job.flatfileitemwriter.resource=file://%s",
 								this.outputFile.getAbsolutePath()),
-						"spring.batch.job.flatfilewriter.encoding=UTF-8");
+						"spring.batch.job.flatfileitemwriter.encoding=UTF-8");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -361,13 +361,13 @@ public class FlatFileItemWriterAutoConfigurationTests {
 								FlatFileItemWriterAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.flatfilewriter.name=fooWriter",
+						"spring.batch.job.flatfileitemwriter.name=fooWriter",
 						String.format(
-								"spring.batch.job.flatfilewriter.resource=file://%s",
+								"spring.batch.job.flatfileitemwriter.resource=file://%s",
 								this.outputFile.getAbsolutePath()),
-						"spring.batch.job.flatfilewriter.encoding=UTF-8",
-						"spring.batch.job.flatfilewriter.delimited=true",
-						"spring.batch.job.flatfilewriter.names=item");
+						"spring.batch.job.flatfileitemwriter.encoding=UTF-8",
+						"spring.batch.job.flatfileitemwriter.delimited=true",
+						"spring.batch.job.flatfileitemwriter.names=item");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcBatchItemWriterAutoConfigurationTests.java

@@ -60,7 +60,7 @@ import org.springframework.util.SocketUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class JdbcItemWriterAutoConfigurationTests {
+public class JdbcBatchItemWriterAutoConfigurationTests {
 
 	private final static String DATASOURCE_URL;
 
@@ -99,13 +99,13 @@ public class JdbcItemWriterAutoConfigurationTests {
 	public void baseTest() {
 		ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
 				.withUserConfiguration(
-						JdbcItemWriterAutoConfigurationTests.DelimitedJobConfiguration.class,
+						JdbcBatchItemWriterAutoConfigurationTests.DelimitedJobConfiguration.class,
 						TaskLauncherConfiguration.class)
 				.withConfiguration(
 						AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
 								BatchAutoConfiguration.class,
 								SingleStepJobAutoConfiguration.class,
-								JdbcItemWriterAutoConfiguration.class));
+								JdbcBatchItemWriterAutoConfiguration.class));
 		applicationContextRunner = updatePropertiesForTest(applicationContextRunner);
 
 		runTest(applicationContextRunner);
@@ -115,14 +115,14 @@ public class JdbcItemWriterAutoConfigurationTests {
 	public void customSqlParameterSourceTest() {
 		ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
 				.withUserConfiguration(
-						JdbcItemWriterAutoConfigurationTests.DelimitedDifferentKeyNameJobConfiguration.class,
+						JdbcBatchItemWriterAutoConfigurationTests.DelimitedDifferentKeyNameJobConfiguration.class,
 						TaskLauncherConfiguration.class,
 						CustomSqlParameterSourceProviderConfiguration.class)
 				.withConfiguration(
 						AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
 								BatchAutoConfiguration.class,
 								SingleStepJobAutoConfiguration.class,
-								JdbcItemWriterAutoConfiguration.class));
+								JdbcBatchItemWriterAutoConfiguration.class));
 		applicationContextRunner = updatePropertiesForTest(applicationContextRunner);
 
 		runTest(applicationContextRunner);
@@ -132,14 +132,14 @@ public class JdbcItemWriterAutoConfigurationTests {
 	public void preparedStatementSetterTest() {
 		ApplicationContextRunner applicationContextRunner = new ApplicationContextRunner()
 				.withUserConfiguration(
-						JdbcItemWriterAutoConfigurationTests.DelimitedJobConfiguration.class,
+						JdbcBatchItemWriterAutoConfigurationTests.DelimitedJobConfiguration.class,
 						TaskLauncherConfiguration.class,
 						ItemPreparedStatementSetterConfiguration.class)
 				.withConfiguration(
 						AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
 								BatchAutoConfiguration.class,
 								SingleStepJobAutoConfiguration.class,
-								JdbcItemWriterAutoConfiguration.class));
+								JdbcBatchItemWriterAutoConfiguration.class));
 		applicationContextRunner = updatePropertiesForTest(applicationContextRunner);
 		runTest(applicationContextRunner);
 	}
@@ -148,8 +148,8 @@ public class JdbcItemWriterAutoConfigurationTests {
 			ApplicationContextRunner applicationContextRunner) {
 		return applicationContextRunner.withPropertyValues("spring.batch.job.jobName=job",
 				"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-				"spring.batch.job.jdbcwriter.name=fooWriter",
-				"spring.batch.job.jdbcwriter.sql=INSERT INTO item (item_name) VALUES (:item_name)");
+				"spring.batch.job.jdbcbatchitemwriter.name=fooWriter",
+				"spring.batch.job.jdbcbatchitemwriter.sql=INSERT INTO item (item_name) VALUES (:item_name)");
 	}
 
 	private void validateResultAndBean(ApplicationContext context) {

spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java

@@ -100,8 +100,8 @@ public class JdbcCursorItemReaderAutoConfigurationTests {
 								JdbcCursorItemReaderAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=integrationJob",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.jdbccursorreader.name=fooReader",
-						"spring.batch.job.jdbccursorreader.sql=select item_name from item");
+						"spring.batch.job.jdbccursoritemreader.name=fooReader",
+						"spring.batch.job.jdbccursoritemreader.sql=select item_name from item");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -138,8 +138,8 @@ public class JdbcCursorItemReaderAutoConfigurationTests {
 								JdbcCursorItemReaderAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=rowMapperJob",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.jdbccursorreader.name=fooReader",
-						"spring.batch.job.jdbccursorreader.sql=select * from item");
+						"spring.batch.job.jdbccursoritemreader.name=fooReader",
+						"spring.batch.job.jdbccursoritemreader.sql=select * from item");
 
 		applicationContextRunner.run((context) -> {
 			JobLauncher jobLauncher = context.getBean(JobLauncher.class);
@@ -176,18 +176,18 @@ public class JdbcCursorItemReaderAutoConfigurationTests {
 								JdbcCursorItemReaderAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=roseyJob",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.jdbccursorreader.saveState=false",
-						"spring.batch.job.jdbccursorreader.name=fooReader",
-						"spring.batch.job.jdbccursorreader.maxItemCount=15",
-						"spring.batch.job.jdbccursorreader.currentItemCount=2",
-						"spring.batch.job.jdbccursorreader.fetchSize=4",
-						"spring.batch.job.jdbccursorreader.maxRows=6",
-						"spring.batch.job.jdbccursorreader.queryTimeout=8",
-						"spring.batch.job.jdbccursorreader.ignoreWarnings=true",
-						"spring.batch.job.jdbccursorreader.verifyCursorPosition=true",
-						"spring.batch.job.jdbccursorreader.driverSupportsAbsolute=true",
-						"spring.batch.job.jdbccursorreader.useSharedExtendedConnection=true",
-						"spring.batch.job.jdbccursorreader.sql=select * from foo");
+						"spring.batch.job.jdbccursoritemreader.saveState=false",
+						"spring.batch.job.jdbccursoritemreader.name=fooReader",
+						"spring.batch.job.jdbccursoritemreader.maxItemCount=15",
+						"spring.batch.job.jdbccursoritemreader.currentItemCount=2",
+						"spring.batch.job.jdbccursoritemreader.fetchSize=4",
+						"spring.batch.job.jdbccursoritemreader.maxRows=6",
+						"spring.batch.job.jdbccursoritemreader.queryTimeout=8",
+						"spring.batch.job.jdbccursoritemreader.ignoreWarnings=true",
+						"spring.batch.job.jdbccursoritemreader.verifyCursorPosition=true",
+						"spring.batch.job.jdbccursoritemreader.driverSupportsAbsolute=true",
+						"spring.batch.job.jdbccursoritemreader.useSharedExtendedConnection=true",
+						"spring.batch.job.jdbccursoritemreader.sql=select * from foo");
 
 		applicationContextRunner.run((context) -> {
 
@@ -260,7 +260,7 @@ public class JdbcCursorItemReaderAutoConfigurationTests {
 								JdbcCursorItemReaderAutoConfiguration.class))
 				.withPropertyValues("spring.batch.job.jobName=job",
 						"spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5",
-						"spring.batch.job.jdbccursorreader.name=fooReader");
+						"spring.batch.job.jdbccursoritemreader.name=fooReader");
 
 		assertThatThrownBy(() -> {
 			runTest(applicationContextRunner);