From a7e8aa1102fbd2c24adada22d300079109af2085 Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Tue, 1 Dec 2020 12:54:33 -0600 Subject: [PATCH] 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' to a 'Map'. This better reflects what is actually used. --- .../SingleStepJobAutoConfiguration.java | 10 +++---- .../FlatFileItemReaderAutoConfiguration.java | 17 ++++++----- .../FlatFileItemWriterAutoConfiguration.java | 18 +++++------ ...JdbcCursorItemReaderAutoConfiguration.java | 14 ++++----- .../jdbc/JdbcItemWriterAutoConfiguration.java | 5 ++-- .../KafkaItemReaderAutoConfiguration.java | 5 ++-- .../KafkaItemWriterAutoConfiguration.java | 21 ++++++------- .../AmqpItemReaderAutoConfiguration.java | 5 ++-- .../AmqpItemWriterAutoConfiguration.java | 5 ++-- .../SingleStepJobAutoConfigurationTests.java | 8 ++--- ...tFileItemReaderAutoConfigurationTests.java | 18 +++++------ ...tFileItemWriterAutoConfigurationTests.java | 30 +++++++++---------- ...ursorItemReaderAutoConfigurationTests.java | 14 ++++----- .../JdbcItemWriterAutoConfigurationTests.java | 10 +++---- ...KafkaItemReaderAutoConfigurationTests.java | 8 ++--- .../kafka/KafkaItemWriterTests.java | 12 ++++---- .../AmqpItemReaderAutoConfigurationTests.java | 6 ++-- .../AmqpItemWriterAutoConfigurationTests.java | 16 +++++----- 18 files changed, 114 insertions(+), 108 deletions(-) diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java index ae02f3e3..4bb5d7e8 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfiguration.java +++ b/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> itemProcessor; + private ItemProcessor, Map> itemProcessor; public SingleStepJobAutoConfiguration(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory, SingleStepJobProperties properties, @@ -79,12 +79,12 @@ public class SingleStepJobAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnProperty(prefix = "spring.batch.job", name = "jobName") - public Job job(ItemReader> itemReader, - ItemWriter> itemWriter) { + public Job job(ItemReader> itemReader, + ItemWriter> itemWriter) { - SimpleStepBuilder, Map> stepBuilder = this.stepBuilderFactory + SimpleStepBuilder, Map> stepBuilder = this.stepBuilderFactory .get(this.properties.getStepName()) - ., Map>chunk( + ., Map>chunk( this.properties.getChunkSize()) .reader(itemReader); diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java index 329f5158..d2a3a4b7 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfiguration.java +++ b/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> fieldSetMapper; + private FieldSetMapper> fieldSetMapper; @Autowired(required = false) - private LineMapper> lineMapper; + private LineMapper> lineMapper; @Autowired(required = false) private LineCallbackHandler skippedLinesCallback; @@ -71,8 +72,8 @@ public class FlatFileItemReaderAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnProperty(prefix = "spring.batch.job.flatfilereader", name = "name") - public FlatFileItemReader> itemReader() { - FlatFileItemReaderBuilder> mapFlatFileItemReaderBuilder = new FlatFileItemReaderBuilder>() + public FlatFileItemReader> itemReader() { + FlatFileItemReaderBuilder> mapFlatFileItemReaderBuilder = new FlatFileItemReaderBuilder>() .name(this.properties.getName()).resource(this.properties.getResource()) .saveState(this.properties.isSaveState()) .maxItemCount(this.properties.getMaxItemCount()) @@ -127,13 +128,13 @@ public class FlatFileItemReaderAutoConfiguration { /** * A {@link FieldSetMapper} that takes a {@code FieldSet} and returns the - * {@code Map} of its contents. + * {@code Map} of its contents. */ - public static class MapFieldSetMapper implements FieldSetMapper> { + public static class MapFieldSetMapper implements FieldSetMapper> { @Override - public Map mapFieldSet(FieldSet fieldSet) { - return fieldSet.getProperties(); + public Map mapFieldSet(FieldSet fieldSet) { + return new HashMap((Map) fieldSet.getProperties()); } } diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java index ce7c20a8..ea135067 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfiguration.java +++ b/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> lineAggregator; + private LineAggregator> lineAggregator; @Autowired(required = false) - private FieldExtractor> fieldExtractor; + private FieldExtractor> fieldExtractor; @Autowired(required = false) private FlatFileHeaderCallback headerCallback; @@ -67,7 +67,7 @@ public class FlatFileItemWriterAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnProperty(prefix = "spring.batch.job.flatfilewriter", name = "name") - public FlatFileItemWriter> itemWriter() { + public FlatFileItemWriter> itemWriter() { if (this.properties.isDelimited() && this.properties.isFormatted()) { throw new IllegalStateException( @@ -80,7 +80,7 @@ public class FlatFileItemWriterAutoConfiguration { + "output is not formatted or delimited"); } - FlatFileItemWriterBuilder> builder = new FlatFileItemWriterBuilder>() + FlatFileItemWriterBuilder> builder = new FlatFileItemWriterBuilder>() .name(this.properties.getName()).resource(this.properties.getResource()) .append(this.properties.isAppend()) .encoding(this.properties.getEncoding()) @@ -93,7 +93,7 @@ public class FlatFileItemWriterAutoConfiguration { .headerCallback(this.headerCallback).footerCallback(this.footerCallback); if (this.properties.isDelimited()) { - FlatFileItemWriterBuilder.DelimitedBuilder> delimitedBuilder = builder + FlatFileItemWriterBuilder.DelimitedBuilder> delimitedBuilder = builder .delimited().delimiter(this.properties.getDelimiter()); if (this.fieldExtractor != null) { @@ -105,7 +105,7 @@ public class FlatFileItemWriterAutoConfiguration { } } else if (this.properties.isFormatted()) { - FlatFileItemWriterBuilder.FormattedBuilder> formattedBuilder = builder + FlatFileItemWriterBuilder.FormattedBuilder> formattedBuilder = builder .formatted().format(this.properties.getFormat()) .locale(this.properties.getLocale()) .maximumLength(this.properties.getMaximumLength()) @@ -127,10 +127,10 @@ public class FlatFileItemWriterAutoConfiguration { } /** - * A {@code FieldExtractor} that converts a {@code Map} to the ordered + * A {@code FieldExtractor} that converts a {@code Map} to the ordered * {@code Object[]} required to populate an output record. */ - public static class MapFieldExtractor implements FieldExtractor> { + public static class MapFieldExtractor implements FieldExtractor> { private String[] names; @@ -139,7 +139,7 @@ public class FlatFileItemWriterAutoConfiguration { } @Override - public Object[] extract(Map item) { + public Object[] extract(Map item) { List fields = new ArrayList<>(item.size()); diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java index a7af8f91..66a7f028 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfiguration.java +++ b/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> rowMapper; + private RowMapper> rowMapper; public JdbcCursorItemReaderAutoConfiguration( JdbcCursorItemReaderProperties properties, DataSource dataSource) { @@ -64,8 +64,8 @@ public class JdbcCursorItemReaderAutoConfiguration { @Bean @ConditionalOnMissingBean - public JdbcCursorItemReader> itemReader() { - return new JdbcCursorItemReaderBuilder>() + public JdbcCursorItemReader> itemReader() { + return new JdbcCursorItemReaderBuilder>() .name(this.properties.getName()) .currentItemCount(this.properties.getCurrentItemCount()) .dataSource(this.dataSource) @@ -86,15 +86,15 @@ public class JdbcCursorItemReaderAutoConfiguration { @Bean @ConditionalOnMissingBean - public RowMapper> rowMapper() { + public RowMapper> rowMapper() { return new MapRowMapper(); } - public static class MapRowMapper implements RowMapper> { + public static class MapRowMapper implements RowMapper> { @Override - public Map mapRow(ResultSet rs, int rowNum) throws SQLException { - Map item = new HashMap<>(rs.getMetaData().getColumnCount()); + public Map mapRow(ResultSet rs, int rowNum) throws SQLException { + Map item = new HashMap<>(rs.getMetaData().getColumnCount()); for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) { item.put(rs.getMetaData().getColumnName(i), rs.getObject(i)); diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfiguration.java index 05be21ee..d1e88edf 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfiguration.java @@ -37,6 +37,7 @@ import org.springframework.context.annotation.Configuration; * Autconfiguration for a {@code JdbcBatchItemWriter}. * * @author Glenn Renfro + * @author Michael Minella * @since 2.3 */ @Configuration @@ -63,9 +64,9 @@ public class JdbcItemWriterAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnProperty(prefix = "spring.batch.job.jdbcwriter", name = "name") - public ItemWriter> itemWriter() { + public ItemWriter> itemWriter() { - JdbcBatchItemWriterBuilder> jdbcBatchItemWriterBuilder = new JdbcBatchItemWriterBuilder>() + JdbcBatchItemWriterBuilder> jdbcBatchItemWriterBuilder = new JdbcBatchItemWriterBuilder>() .dataSource(this.dataSource).sql(this.properties.getSql()); if (this.itemPreparedStatementSetter != null) { jdbcBatchItemWriterBuilder diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java index c91b7473..58961696 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfiguration.java @@ -39,6 +39,7 @@ import org.springframework.util.StringUtils; * 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> kafkaItemReader( + public KafkaItemReader> kafkaItemReader( KafkaItemReaderProperties kafkaItemReaderProperties) { Properties consumerProperties = new Properties(); consumerProperties.putAll(this.kafkaProperties.getConsumer().buildProperties()); @@ -62,7 +63,7 @@ public class KafkaItemReaderAutoConfiguration { kafkaItemReaderProperties.setPartitions(new ArrayList<>(1)); kafkaItemReaderProperties.getPartitions().add(0); } - return new KafkaItemReaderBuilder>() + return new KafkaItemReaderBuilder>() .partitions(kafkaItemReaderProperties.getPartitions()) .consumerProperties(consumerProperties) .name(kafkaItemReaderProperties.getName()) diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java index d7e16251..3f9681ff 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterAutoConfiguration.java @@ -43,6 +43,7 @@ import org.springframework.util.Assert; * Autconfiguration for a {@code KafkaItemReader}. * * @author Glenn Renfro + * @author Michael Minella * @since 2.3 */ @Configuration @@ -56,25 +57,25 @@ public class KafkaItemWriterAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnProperty(prefix = "spring.batch.job.kafkaitemwriter", name = "topic") - public KafkaItemWriter> kafkaItemWriter( + public KafkaItemWriter> kafkaItemWriter( KafkaItemWriterProperties kafkaItemWriterProperties, - ProducerFactory> producerFactory, - @Qualifier("batchItemKeyMapper") Converter itemKeyMapper) { + ProducerFactory> producerFactory, + @Qualifier("batchItemKeyMapper") Converter, Object> itemKeyMapper) { validateProperties(kafkaItemWriterProperties); KafkaTemplate template = new KafkaTemplate(producerFactory); template.setDefaultTopic(kafkaItemWriterProperties.getTopic()); - return new KafkaItemWriterBuilder>() + return new KafkaItemWriterBuilder>() .delete(kafkaItemWriterProperties.isDelete()).kafkaTemplate(template) .itemKeyMapper(itemKeyMapper).build(); } @Bean @ConditionalOnMissingBean(name = "batchItemKeyMapper") - public Converter batchItemKeyMapper() { - return new Converter() { + public Converter, Object> batchItemKeyMapper() { + return new Converter, Object>() { @Override - public Object convert(Object source) { + public Object convert(Map source) { return source; } }; @@ -82,11 +83,11 @@ public class KafkaItemWriterAutoConfiguration { @Bean @ConditionalOnMissingBean - ProducerFactory> producerFactory() { + ProducerFactory> producerFactory() { Map configs = new HashMap<>(); configs.putAll(this.kafkaProperties.getProducer().buildProperties()); - return new DefaultKafkaProducerFactory>(configs, null, - new JsonSerializer<>()); + return new DefaultKafkaProducerFactory<>(configs, null, + new JsonSerializer<>()); } private void validateProperties(KafkaItemWriterProperties kafkaItemWriterProperties) { diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java index 864cfd7e..d87d635d 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfiguration.java @@ -36,6 +36,7 @@ import org.springframework.context.annotation.Configuration; * Autconfiguration for a {@code AmqpItemReader}. * * @author Glenn Renfro + * @author Michael Minella * @since 2.3 */ @Configuration @@ -54,9 +55,9 @@ public class AmqpItemReaderAutoConfiguration { } @Bean - public AmqpItemReader> amqpItemReader(AmqpTemplate amqpTemplate, + public AmqpItemReader> amqpItemReader(AmqpTemplate amqpTemplate, @Autowired(required = false) Class itemType) { - AmqpItemReaderBuilder> builder = new AmqpItemReaderBuilder>() + AmqpItemReaderBuilder> builder = new AmqpItemReaderBuilder>() .amqpTemplate(amqpTemplate); if (itemType != null) { builder.itemType(itemType); diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java index 982a1612..22df0470 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfiguration.java @@ -34,6 +34,7 @@ import org.springframework.context.annotation.Configuration; * Autconfiguration for a {@code AmqpItemWriter}. * * @author Glenn Renfro + * @author Michael Minella * @since 2.3 */ @Configuration @@ -44,8 +45,8 @@ import org.springframework.context.annotation.Configuration; public class AmqpItemWriterAutoConfiguration { @Bean - public AmqpItemWriter> amqpItemWriter(AmqpTemplate amqpTemplate) { - return new AmqpItemWriterBuilder>().amqpTemplate(amqpTemplate) + public AmqpItemWriter> amqpItemWriter(AmqpTemplate amqpTemplate) { + return new AmqpItemWriterBuilder>().amqpTemplate(amqpTemplate) .build(); } diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfigurationTests.java index ad7de221..cf5277be 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/SingleStepJobAutoConfigurationTests.java @@ -127,7 +127,7 @@ public class SingleStepJobAutoConfigurationTests { Thread.sleep(1000); } - List> writtenItems = itemWriter.getWrittenItems(); + List> writtenItems = itemWriter.getWrittenItems(); assertThat(writtenItems.size()).isEqualTo(3); @@ -142,8 +142,8 @@ public class SingleStepJobAutoConfigurationTests { public static class SimpleConfiguration { @Bean - public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + public ListItemReader> itemReader() { + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item", "foo")); items.add(Collections.singletonMap("item", "bar")); @@ -153,7 +153,7 @@ public class SingleStepJobAutoConfigurationTests { } @Bean - public ListItemWriter> itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfigurationTests.java index ae568c27..0a960411 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemReaderAutoConfigurationTests.java @@ -307,7 +307,7 @@ public class FlatFileItemReaderAutoConfigurationTests { Thread.sleep(1000); } - List> writtenItems = itemWriter.getWrittenItems(); + List> writtenItems = itemWriter.getWrittenItems(); assertThat(writtenItems.size()).isEqualTo(1); assertThat(writtenItems.get(0).get("one")).isEqualTo("1 2 3"); @@ -329,7 +329,7 @@ public class FlatFileItemReaderAutoConfigurationTests { private FlatFileItemReader itemReader; @Bean - public ListItemWriter itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } @@ -341,8 +341,8 @@ public class FlatFileItemReaderAutoConfigurationTests { } @Bean - public FieldSetMapper> fieldSetMapper() { - return fieldSet -> fieldSet.getProperties(); + public FieldSetMapper> fieldSetMapper() { + return fieldSet -> new HashMap((Map) fieldSet.getProperties()); } } @@ -352,7 +352,7 @@ public class FlatFileItemReaderAutoConfigurationTests { public static class JobConfiguration { @Bean - public ListItemWriter itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } @@ -397,7 +397,7 @@ public class FlatFileItemReaderAutoConfigurationTests { } @Bean - public ListItemWriter itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } @@ -408,9 +408,9 @@ public class FlatFileItemReaderAutoConfigurationTests { public static class CustomLineMapperConfiguration { @Bean - public LineMapper> lineMapper() { + public LineMapper> lineMapper() { return (line, lineNumber) -> { - Map item = new HashMap<>(1); + Map item = new HashMap<>(1); item.put("line", line); item.put("lineNumber", lineNumber); @@ -420,7 +420,7 @@ public class FlatFileItemReaderAutoConfigurationTests { } @Bean - public ListItemWriter itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfigurationTests.java index e817d638..087dcd65 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/flatfile/FlatFileItemWriterAutoConfigurationTests.java @@ -395,9 +395,9 @@ public class FlatFileItemWriterAutoConfigurationTests { public static class DelimitedJobConfiguration { @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item", "foo")); items.add(Collections.singletonMap("item", "bar")); @@ -413,9 +413,9 @@ public class FlatFileItemWriterAutoConfigurationTests { public static class LineAggregatorConfiguration { @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item", "foo")); items.add(Collections.singletonMap("item", "bar")); @@ -425,7 +425,7 @@ public class FlatFileItemWriterAutoConfigurationTests { } @Bean - public LineAggregator> lineAggregator() { + public LineAggregator> lineAggregator() { return new PassThroughLineAggregator<>(); } @@ -436,9 +436,9 @@ public class FlatFileItemWriterAutoConfigurationTests { public static class HeaderFooterConfiguration { @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item", "foo")); items.add(Collections.singletonMap("item", "bar")); @@ -464,9 +464,9 @@ public class FlatFileItemWriterAutoConfigurationTests { public static class FieldExtractorConfiguration { @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item", "foo")); items.add(Collections.singletonMap("item", "bar")); @@ -476,7 +476,7 @@ public class FlatFileItemWriterAutoConfigurationTests { } @Bean - public FieldExtractor> lineAggregator() { + public FieldExtractor> lineAggregator() { return item -> { List fields = new ArrayList<>(1); @@ -492,9 +492,9 @@ public class FlatFileItemWriterAutoConfigurationTests { public static class FormattedJobConfiguration { @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item", "foo")); items.add(Collections.singletonMap("item", "bar")); @@ -510,7 +510,7 @@ public class FlatFileItemWriterAutoConfigurationTests { public static class FormattedFieldExtractorJobConfiguration { @Bean - public FieldExtractor> lineAggregator() { + public FieldExtractor> lineAggregator() { return item -> { List fields = new ArrayList<>(1); @@ -520,9 +520,9 @@ public class FlatFileItemWriterAutoConfigurationTests { } @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item", "foo")); items.add(Collections.singletonMap("item", "bar")); diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java index 8d7c7b60..8239409f 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcCursorItemReaderAutoConfigurationTests.java @@ -116,7 +116,7 @@ public class JdbcCursorItemReaderAutoConfigurationTests { Thread.sleep(1000); } - List> items = context.getBean(ListItemWriter.class) + List> items = context.getBean(ListItemWriter.class) .getWrittenItems(); assertThat(items.size()).isEqualTo(3); @@ -154,7 +154,7 @@ public class JdbcCursorItemReaderAutoConfigurationTests { Thread.sleep(1000); } - List> items = context.getBean(ListItemWriter.class) + List> items = context.getBean(ListItemWriter.class) .getWrittenItems(); assertThat(items.size()).isEqualTo(3); @@ -191,7 +191,7 @@ public class JdbcCursorItemReaderAutoConfigurationTests { applicationContextRunner.run((context) -> { - JdbcCursorItemReader> itemReader = context + JdbcCursorItemReader> itemReader = context .getBean(JdbcCursorItemReader.class); validateBean(itemReader); @@ -340,7 +340,7 @@ public class JdbcCursorItemReaderAutoConfigurationTests { public static class BaseConfiguration { @Bean - public ListItemWriter> itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } @@ -351,9 +351,9 @@ public class JdbcCursorItemReaderAutoConfigurationTests { public static class RowMapperConfiguration { @Bean - public RowMapper> rowMapper() { + public RowMapper> rowMapper() { return (rs, rowNum) -> { - Map item = new HashMap<>(); + Map item = new HashMap<>(); item.put("item", rs.getString("item_name")); @@ -362,7 +362,7 @@ public class JdbcCursorItemReaderAutoConfigurationTests { } @Bean - public ListItemWriter> itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java index 1a48a3cb..d1b74a7b 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java @@ -239,9 +239,9 @@ public class JdbcItemWriterAutoConfigurationTests { public static class DelimitedJobConfiguration { @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item_name", "foo")); items.add(Collections.singletonMap("item_name", "bar")); @@ -257,9 +257,9 @@ public class JdbcItemWriterAutoConfigurationTests { public static class DelimitedDifferentKeyNameJobConfiguration { @Bean - public ListItemReader> itemReader() { + public ListItemReader> itemReader() { - List> items = new ArrayList<>(3); + List> items = new ArrayList<>(3); items.add(Collections.singletonMap("item_foo", "foo")); items.add(Collections.singletonMap("item_foo", "bar")); @@ -275,7 +275,7 @@ public class JdbcItemWriterAutoConfigurationTests { public static class CustomSqlParameterSourceProviderConfiguration { @Bean - public ItemSqlParameterSourceProvider> itemSqlParameterSourceProvider() { + public ItemSqlParameterSourceProvider> itemSqlParameterSourceProvider() { return item -> new MapSqlParameterSource(new HashMap() { { put("item_name", item.get("item_foo")); diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java index 4c90230a..900d7033 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java @@ -102,7 +102,7 @@ public class KafkaItemReaderAutoConfigurationTests { Thread.sleep(1000); } - List> writtenItems = itemWriter.getWrittenItems(); + List> writtenItems = itemWriter.getWrittenItems(); assertThat(writtenItems.size()).isEqualTo(4); assertThat(writtenItems.get(0).get("first_name")).isEqualTo("jane"); @@ -197,7 +197,7 @@ public class KafkaItemReaderAutoConfigurationTests { } private void basicValidation(ListItemWriter itemWriter) { - List> writtenItems = itemWriter.getWrittenItems(); + List> writtenItems = itemWriter.getWrittenItems(); assertThat(writtenItems.size()).isEqualTo(4); List results = new ArrayList<>(); for (int i = 0; i < 4; i++) { @@ -212,7 +212,7 @@ public class KafkaItemReaderAutoConfigurationTests { KafkaTestUtils.producerProps(embeddedKafkaBroker)); Producer producer = new DefaultKafkaProducerFactory<>(configps, new StringSerializer(), new JsonSerializer<>()).createProducer(); - Map testMap = new HashMap<>(); + Map testMap = new HashMap<>(); testMap.put("first_name", "jane"); producer.send(new ProducerRecord<>(topic, "my-aggregate-id", testMap)); testMap = new HashMap<>(); @@ -232,7 +232,7 @@ public class KafkaItemReaderAutoConfigurationTests { @Configuration public static class CustomMappingConfiguration { @Bean - public ListItemWriter> itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } } diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java index 6f218868..102e36b2 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java @@ -95,9 +95,9 @@ public class KafkaItemWriterTests { ConsumerRecords consumerRecords = KafkaTestUtils .getRecords(consumer); assertThat(consumerRecords.count()).isEqualTo(5); - List> result = new ArrayList<>(); + List> result = new ArrayList<>(); consumerRecords.forEach(cs -> { - result.add((Map) cs.value()); + result.add((Map) cs.value()); }); List firstNames = new ArrayList<>(); result.forEach(s -> firstNames.add((String) s.get("first_name"))); @@ -125,8 +125,8 @@ public class KafkaItemWriterTests { public static class CustomMappingConfiguration { @Bean - public ListItemReader> itemWriter() { - List> list = new ArrayList<>(5); + public ListItemReader> itemReader() { + List> list = new ArrayList<>(5); addNameToReaderList(list, "Jane"); addNameToReaderList(list, "John"); addNameToReaderList(list, "Liz"); @@ -135,9 +135,9 @@ public class KafkaItemWriterTests { return new ListItemReader<>(list); } - private void addNameToReaderList(List> itemReaderList, + private void addNameToReaderList(List> itemReaderList, String value) { - Map prepMap = new HashMap<>(); + Map prepMap = new HashMap<>(); prepMap.put("first_name", value); itemReaderList.add(prepMap); } diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java index 1c7087ff..1da65df2 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java @@ -81,7 +81,7 @@ public class AmqpItemReaderAutoConfigurationTests { AmqpAdmin admin = new RabbitAdmin(this.connectionFactory); admin.declareQueue(new Queue("foo")); - Map testMap = new HashMap<>(); + Map testMap = new HashMap<>(); testMap.put("ITEM_NAME", "foo"); this.template.convertAndSend("foo", testMap); testMap = new HashMap<>(); @@ -186,7 +186,7 @@ public class AmqpItemReaderAutoConfigurationTests { return jobLauncher.run(job, new JobParameters()); } - private void validateBasicTest(List> items) { + private void validateBasicTest(List> items) { assertThat(items.size()).isEqualTo(3); assertThat(items.get(0).get("ITEM_NAME")).isEqualTo("foo"); assertThat(items.get(1).get("ITEM_NAME")).isEqualTo("bar"); @@ -216,7 +216,7 @@ public class AmqpItemReaderAutoConfigurationTests { public static class BaseConfiguration { @Bean - public ListItemWriter> itemWriter() { + public ListItemWriter> itemWriter() { return new ListItemWriter<>(); } diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfigurationTests.java index b2ab43ae..21295279 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfigurationTests.java @@ -69,7 +69,7 @@ public class AmqpItemWriterAutoConfigurationTests { private static String host; - private static List> sampleData; + private static List> sampleData; private RabbitTemplate template; @@ -92,9 +92,9 @@ public class AmqpItemWriterAutoConfigurationTests { addNameToReaderList(sampleData, "Judy"); } - private static void addNameToReaderList(List> itemReaderList, + private static void addNameToReaderList(List> itemReaderList, String value) { - Map prepMap = new HashMap<>(); + Map prepMap = new HashMap<>(); prepMap.put("first_name", value); itemReaderList.add(prepMap); } @@ -144,8 +144,8 @@ public class AmqpItemWriterAutoConfigurationTests { Thread.sleep(1000); } - for (Map sampleEntry : sampleData) { - Map map = (Map) template + for (Map sampleEntry : sampleData) { + Map map = (Map) template .receiveAndConvert(QUEUE_NAME); assertThat(map.get("first_name")) .isEqualTo(sampleEntry.get("first_name")); @@ -199,9 +199,9 @@ public class AmqpItemWriterAutoConfigurationTests { public static class ItemWriterConfiguration { @Bean - public RowMapper> rowMapper() { + public RowMapper> rowMapper() { return (rs, rowNum) -> { - Map item = new HashMap<>(); + Map item = new HashMap<>(); item.put("item", rs.getString("item_name")); @@ -210,7 +210,7 @@ public class AmqpItemWriterAutoConfigurationTests { } @Bean - public ItemReader> itemWriter() { + public ItemReader> itemWriter() { return new ListItemReader<>(sampleData); }