Updated generics on single step batch job starter

This commit updates the generics for the domain object used in the
single step batch job starter from a 'Map<Object, Object>' to a
'Map<String, Object>'. This better reflects what is actually used.

Author: mminella

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

@@ -55,7 +55,7 @@ public class SingleStepJobAutoConfiguration {
 	private SingleStepJobProperties properties;
 
 	@Autowired(required = false)
-	private ItemProcessor<Map<Object, Object>, Map<Object, Object>> itemProcessor;
+	private ItemProcessor<Map<String, Object>, Map<String, Object>> itemProcessor;
 
 	public SingleStepJobAutoConfiguration(JobBuilderFactory jobBuilderFactory,
 			StepBuilderFactory stepBuilderFactory, SingleStepJobProperties properties,
@@ -79,12 +79,12 @@ private void validateProperties(SingleStepJobProperties properties) {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = "spring.batch.job", name = "jobName")
-	public Job job(ItemReader<Map<Object, Object>> itemReader,
-			ItemWriter<Map<Object, Object>> itemWriter) {
+	public Job job(ItemReader<Map<String, Object>> itemReader,
+			ItemWriter<Map<String, Object>> itemWriter) {
 
-		SimpleStepBuilder<Map<Object, Object>, Map<Object, Object>> stepBuilder = this.stepBuilderFactory
+		SimpleStepBuilder<Map<String, Object>, Map<String, Object>> stepBuilder = this.stepBuilderFactory
 				.get(this.properties.getStepName())
-				.<Map<Object, Object>, Map<Object, Object>>chunk(
+				.<Map<String, Object>, Map<String, Object>>chunk(
 						this.properties.getChunkSize())
 				.reader(itemReader);
 

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

@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.task.batch.autoconfigure.flatfile;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.springframework.batch.item.file.FlatFileItemReader;
@@ -53,10 +54,10 @@ public class FlatFileItemReaderAutoConfiguration {
 	private LineTokenizer lineTokenizer;
 
 	@Autowired(required = false)
-	private FieldSetMapper<Map<Object, Object>> fieldSetMapper;
+	private FieldSetMapper<Map<String, Object>> fieldSetMapper;
 
 	@Autowired(required = false)
-	private LineMapper<Map<Object, Object>> lineMapper;
+	private LineMapper<Map<String, Object>> lineMapper;
 
 	@Autowired(required = false)
 	private LineCallbackHandler skippedLinesCallback;
@@ -71,8 +72,8 @@ public FlatFileItemReaderAutoConfiguration(FlatFileItemReaderProperties properti
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = "spring.batch.job.flatfilereader", name = "name")
-	public FlatFileItemReader<Map<Object, Object>> itemReader() {
-		FlatFileItemReaderBuilder<Map<Object, Object>> mapFlatFileItemReaderBuilder = new FlatFileItemReaderBuilder<Map<Object, Object>>()
+	public FlatFileItemReader<Map<String, Object>> itemReader() {
+		FlatFileItemReaderBuilder<Map<String, Object>> mapFlatFileItemReaderBuilder = new FlatFileItemReaderBuilder<Map<String, Object>>()
 				.name(this.properties.getName()).resource(this.properties.getResource())
 				.saveState(this.properties.isSaveState())
 				.maxItemCount(this.properties.getMaxItemCount())
@@ -127,13 +128,13 @@ else if (this.properties.isFixedLength()) {
 
 	/**
 	 * A {@link FieldSetMapper} that takes a {@code FieldSet} and returns the
-	 * {@code Map<Object, Object>} of its contents.
+	 * {@code Map<String, Object>} of its contents.
 	 */
-	public static class MapFieldSetMapper implements FieldSetMapper<Map<Object, Object>> {
+	public static class MapFieldSetMapper implements FieldSetMapper<Map<String, Object>> {
 
 		@Override
-		public Map<Object, Object> mapFieldSet(FieldSet fieldSet) {
-			return fieldSet.getProperties();
+		public Map<String, Object> mapFieldSet(FieldSet fieldSet) {
+			return new HashMap<String, Object>((Map) fieldSet.getProperties());
 		}
 
 	}

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

@@ -49,10 +49,10 @@ public class FlatFileItemWriterAutoConfiguration {
 	private FlatFileItemWriterProperties properties;
 
 	@Autowired(required = false)
-	private LineAggregator<Map<Object, Object>> lineAggregator;
+	private LineAggregator<Map<String, Object>> lineAggregator;
 
 	@Autowired(required = false)
-	private FieldExtractor<Map<Object, Object>> fieldExtractor;
+	private FieldExtractor<Map<String, Object>> fieldExtractor;
 
 	@Autowired(required = false)
 	private FlatFileHeaderCallback headerCallback;
@@ -67,7 +67,7 @@ public FlatFileItemWriterAutoConfiguration(FlatFileItemWriterProperties properti
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = "spring.batch.job.flatfilewriter", name = "name")
-	public FlatFileItemWriter<Map<Object, Object>> itemWriter() {
+	public FlatFileItemWriter<Map<String, Object>> itemWriter() {
 
 		if (this.properties.isDelimited() && this.properties.isFormatted()) {
 			throw new IllegalStateException(
@@ -80,7 +80,7 @@ else if ((this.properties.isFormatted() || this.properties.isDelimited())
 					+ "output is not formatted or delimited");
 		}
 
-		FlatFileItemWriterBuilder<Map<Object, Object>> builder = new FlatFileItemWriterBuilder<Map<Object, Object>>()
+		FlatFileItemWriterBuilder<Map<String, Object>> builder = new FlatFileItemWriterBuilder<Map<String, Object>>()
 				.name(this.properties.getName()).resource(this.properties.getResource())
 				.append(this.properties.isAppend())
 				.encoding(this.properties.getEncoding())
@@ -93,7 +93,7 @@ else if ((this.properties.isFormatted() || this.properties.isDelimited())
 				.headerCallback(this.headerCallback).footerCallback(this.footerCallback);
 
 		if (this.properties.isDelimited()) {
-			FlatFileItemWriterBuilder.DelimitedBuilder<Map<Object, Object>> delimitedBuilder = builder
+			FlatFileItemWriterBuilder.DelimitedBuilder<Map<String, Object>> delimitedBuilder = builder
 					.delimited().delimiter(this.properties.getDelimiter());
 
 			if (this.fieldExtractor != null) {
@@ -105,7 +105,7 @@ else if ((this.properties.isFormatted() || this.properties.isDelimited())
 			}
 		}
 		else if (this.properties.isFormatted()) {
-			FlatFileItemWriterBuilder.FormattedBuilder<Map<Object, Object>> formattedBuilder = builder
+			FlatFileItemWriterBuilder.FormattedBuilder<Map<String, Object>> formattedBuilder = builder
 					.formatted().format(this.properties.getFormat())
 					.locale(this.properties.getLocale())
 					.maximumLength(this.properties.getMaximumLength())
@@ -127,10 +127,10 @@ else if (this.lineAggregator != null) {
 	}
 
 	/**
-	 * A {@code FieldExtractor} that converts a {@code Map<Object, Object>} to the ordered
+	 * A {@code FieldExtractor} that converts a {@code Map<String, Object>} to the ordered
 	 * {@code Object[]} required to populate an output record.
 	 */
-	public static class MapFieldExtractor implements FieldExtractor<Map<Object, Object>> {
+	public static class MapFieldExtractor implements FieldExtractor<Map<String, Object>> {
 
 		private String[] names;
 
@@ -139,7 +139,7 @@ public MapFieldExtractor(String[] names) {
 		}
 
 		@Override
-		public Object[] extract(Map<Object, Object> item) {
+		public Object[] extract(Map<String, Object> item) {
 
 			List<Object> fields = new ArrayList<>(item.size());
 

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

@@ -54,7 +54,7 @@ public class JdbcCursorItemReaderAutoConfiguration {
 	private PreparedStatementSetter preparedStatementSetter;
 
 	@Autowired(required = false)
-	private RowMapper<Map<Object, Object>> rowMapper;
+	private RowMapper<Map<String, Object>> rowMapper;
 
 	public JdbcCursorItemReaderAutoConfiguration(
 			JdbcCursorItemReaderProperties properties, DataSource dataSource) {
@@ -64,8 +64,8 @@ public JdbcCursorItemReaderAutoConfiguration(
 
 	@Bean
 	@ConditionalOnMissingBean
-	public JdbcCursorItemReader<Map<Object, Object>> itemReader() {
-		return new JdbcCursorItemReaderBuilder<Map<Object, Object>>()
+	public JdbcCursorItemReader<Map<String, Object>> itemReader() {
+		return new JdbcCursorItemReaderBuilder<Map<String, Object>>()
 				.name(this.properties.getName())
 				.currentItemCount(this.properties.getCurrentItemCount())
 				.dataSource(this.dataSource)
@@ -86,15 +86,15 @@ public JdbcCursorItemReader<Map<Object, Object>> itemReader() {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public RowMapper<Map<Object, Object>> rowMapper() {
+	public RowMapper<Map<String, Object>> rowMapper() {
 		return new MapRowMapper();
 	}
 
-	public static class MapRowMapper implements RowMapper<Map<Object, Object>> {
+	public static class MapRowMapper implements RowMapper<Map<String, Object>> {
 
 		@Override
-		public Map<Object, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
-			Map<Object, Object> item = new HashMap<>(rs.getMetaData().getColumnCount());
+		public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+			Map<String, Object> item = new HashMap<>(rs.getMetaData().getColumnCount());
 
 			for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
 				item.put(rs.getMetaData().getColumnName(i), rs.getObject(i));

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

@@ -37,6 +37,7 @@
  * Autconfiguration for a {@code JdbcBatchItemWriter}.
  *
  * @author Glenn Renfro
+ * @author Michael Minella
  * @since 2.3
  */
 @Configuration
@@ -63,9 +64,9 @@ public JdbcItemWriterAutoConfiguration(DataSource dataSource,
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = "spring.batch.job.jdbcwriter", name = "name")
-	public ItemWriter<Map<Object, Object>> itemWriter() {
+	public ItemWriter<Map<String, Object>> itemWriter() {
 
-		JdbcBatchItemWriterBuilder<Map<Object, Object>> jdbcBatchItemWriterBuilder = new JdbcBatchItemWriterBuilder<Map<Object, Object>>()
+		JdbcBatchItemWriterBuilder<Map<String, Object>> jdbcBatchItemWriterBuilder = new JdbcBatchItemWriterBuilder<Map<String, Object>>()
 				.dataSource(this.dataSource).sql(this.properties.getSql());
 		if (this.itemPreparedStatementSetter != null) {
 			jdbcBatchItemWriterBuilder

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

@@ -39,6 +39,7 @@
  * AutoConfiguration for a {@code KafkaItemReader}.
  *
  * @author Glenn Renfro
+ * @author Michael Minella
  * @since 2.3
  */
 @Configuration
@@ -52,7 +53,7 @@ public class KafkaItemReaderAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = "spring.batch.job.kafkaitemreader", name = "name")
-	public KafkaItemReader<Object, Map<Object, Object>> kafkaItemReader(
+	public KafkaItemReader<Object, Map<String, Object>> kafkaItemReader(
 			KafkaItemReaderProperties kafkaItemReaderProperties) {
 		Properties consumerProperties = new Properties();
 		consumerProperties.putAll(this.kafkaProperties.getConsumer().buildProperties());
@@ -62,7 +63,7 @@ public KafkaItemReader<Object, Map<Object, Object>> kafkaItemReader(
 			kafkaItemReaderProperties.setPartitions(new ArrayList<>(1));
 			kafkaItemReaderProperties.getPartitions().add(0);
 		}
-		return new KafkaItemReaderBuilder<Object, Map<Object, Object>>()
+		return new KafkaItemReaderBuilder<Object, Map<String, Object>>()
 				.partitions(kafkaItemReaderProperties.getPartitions())
 				.consumerProperties(consumerProperties)
 				.name(kafkaItemReaderProperties.getName())

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

@@ -43,6 +43,7 @@
  * Autconfiguration for a {@code KafkaItemReader}.
  *
  * @author Glenn Renfro
+ * @author Michael Minella
  * @since 2.3
  */
 @Configuration
@@ -56,37 +57,37 @@ public class KafkaItemWriterAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	@ConditionalOnProperty(prefix = "spring.batch.job.kafkaitemwriter", name = "topic")
-	public KafkaItemWriter<Object, Map<Object, Object>> kafkaItemWriter(
+	public KafkaItemWriter<Object, Map<String, Object>> kafkaItemWriter(
 			KafkaItemWriterProperties kafkaItemWriterProperties,
-			ProducerFactory<Object, Map<Object, Object>> producerFactory,
-			@Qualifier("batchItemKeyMapper") Converter<Object, Object> itemKeyMapper) {
+			ProducerFactory<Object, Map<String, Object>> producerFactory,
+			@Qualifier("batchItemKeyMapper") Converter<Map<String, Object>, Object> itemKeyMapper) {
 
 		validateProperties(kafkaItemWriterProperties);
 		KafkaTemplate template = new KafkaTemplate(producerFactory);
 		template.setDefaultTopic(kafkaItemWriterProperties.getTopic());
-		return new KafkaItemWriterBuilder<Object, Map<Object, Object>>()
+		return new KafkaItemWriterBuilder<Object, Map<String, Object>>()
 				.delete(kafkaItemWriterProperties.isDelete()).kafkaTemplate(template)
 				.itemKeyMapper(itemKeyMapper).build();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(name = "batchItemKeyMapper")
-	public Converter<Object, Object> batchItemKeyMapper() {
-		return new Converter<Object, Object>() {
+	public Converter<Map<String, Object>, Object> batchItemKeyMapper() {
+		return new Converter<Map<String, Object>, Object>() {
 			@Override
-			public Object convert(Object source) {
+			public Object convert(Map<String, Object> source) {
 				return source;
 			}
 		};
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
-	ProducerFactory<Object, Map<Object, Object>> producerFactory() {
+	ProducerFactory<Object, Map<String, Object>> producerFactory() {
 		Map<String, Object> configs = new HashMap<>();
 		configs.putAll(this.kafkaProperties.getProducer().buildProperties());
-		return new DefaultKafkaProducerFactory<Object, Map<Object, Object>>(configs, null,
-				new JsonSerializer<>());
+		return new DefaultKafkaProducerFactory<>(configs, null,
+			new JsonSerializer<>());
 	}
 
 	private void validateProperties(KafkaItemWriterProperties kafkaItemWriterProperties) {

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

@@ -36,6 +36,7 @@
  * Autconfiguration for a {@code AmqpItemReader}.
  *
  * @author Glenn Renfro
+ * @author Michael Minella
  * @since 2.3
  */
 @Configuration
@@ -54,9 +55,9 @@ public AmqpItemReaderProperties amqpItemReaderProperties() {
 	}
 
 	@Bean
-	public AmqpItemReader<Map<Object, Object>> amqpItemReader(AmqpTemplate amqpTemplate,
+	public AmqpItemReader<Map<String, Object>> amqpItemReader(AmqpTemplate amqpTemplate,
 			@Autowired(required = false) Class itemType) {
-		AmqpItemReaderBuilder<Map<Object, Object>> builder = new AmqpItemReaderBuilder<Map<Object, Object>>()
+		AmqpItemReaderBuilder<Map<String, Object>> builder = new AmqpItemReaderBuilder<Map<String, Object>>()
 				.amqpTemplate(amqpTemplate);
 		if (itemType != null) {
 			builder.itemType(itemType);

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

@@ -34,6 +34,7 @@
  * Autconfiguration for a {@code AmqpItemWriter}.
  *
  * @author Glenn Renfro
+ * @author Michael Minella
  * @since 2.3
  */
 @Configuration
@@ -44,8 +45,8 @@
 public class AmqpItemWriterAutoConfiguration {
 
 	@Bean
-	public AmqpItemWriter<Map<Object, Object>> amqpItemWriter(AmqpTemplate amqpTemplate) {
-		return new AmqpItemWriterBuilder<Map<Object, Object>>().amqpTemplate(amqpTemplate)
+	public AmqpItemWriter<Map<String, Object>> amqpItemWriter(AmqpTemplate amqpTemplate) {
+		return new AmqpItemWriterBuilder<Map<String, Object>>().amqpTemplate(amqpTemplate)
 				.build();
 	}
 

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

@@ -127,7 +127,7 @@ public void testSimpleConfiguration() {
 				Thread.sleep(1000);
 			}
 
-			List<Map<Object, Object>> writtenItems = itemWriter.getWrittenItems();
+			List<Map<String, Object>> writtenItems = itemWriter.getWrittenItems();
 
 			assertThat(writtenItems.size()).isEqualTo(3);
 
@@ -142,8 +142,8 @@ public void testSimpleConfiguration() {
 	public static class SimpleConfiguration {
 
 		@Bean
-		public ListItemReader<Map<Object, Object>> itemReader() {
-			List<Map<Object, Object>> items = new ArrayList<>(3);
+		public ListItemReader<Map<String, Object>> itemReader() {
+			List<Map<String, Object>> items = new ArrayList<>(3);
 
 			items.add(Collections.singletonMap("item", "foo"));
 			items.add(Collections.singletonMap("item", "bar"));
@@ -153,7 +153,7 @@ public ListItemReader<Map<Object, Object>> itemReader() {
 		}
 
 		@Bean
-		public ListItemWriter<Map<Object, Object>> itemWriter() {
+		public ListItemWriter<Map<String, Object>> itemWriter() {
 			return new ListItemWriter<>();
 		}