diff --git a/spring-cloud-starter-single-step-batch-job/pom.xml b/spring-cloud-starter-single-step-batch-job/pom.xml index 113ecf55..fa99bfe4 100644 --- a/spring-cloud-starter-single-step-batch-job/pom.xml +++ b/spring-cloud-starter-single-step-batch-job/pom.xml @@ -39,9 +39,8 @@ test - org.hsqldb - hsqldb - 2.4.0 + com.h2database + h2 test diff --git a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterProperties.java b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterProperties.java index 68db2d86..7efa719b 100644 --- a/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterProperties.java +++ b/spring-cloud-starter-single-step-batch-job/src/main/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterProperties.java @@ -140,8 +140,8 @@ public class FlatFileItemWriterProperties { } /** - * . When a file is delimited, this {@code String} will be used as the delimiter - * between fields + * When a file is delimited, this {@code String} will be used as the delimiter between + * fields. * @return delimiter */ public String getDelimiter() { @@ -192,7 +192,7 @@ public class FlatFileItemWriterProperties { /** * Indicates that the output file will use String formatting to generate the output. - * @return true if the file will contain formatted records + * @return true if the file will contain formatted records defaults to true */ public boolean isFormatted() { return formatted; @@ -348,7 +348,7 @@ public class FlatFileItemWriterProperties { /** * The longest a record is allowed to be. If 0, the maximum is unlimited. - * @return the max record length allowed + * @return the max record length allowed. Defaults to 0. */ public int getMaximumLength() { return maximumLength; 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 10423abe..ae02f3e3 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 @@ -27,7 +27,7 @@ import org.springframework.batch.item.ItemProcessor; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -45,7 +45,7 @@ import org.springframework.util.Assert; */ @Configuration @EnableConfigurationProperties(SingleStepJobProperties.class) -@AutoConfigureAfter(BatchAutoConfiguration.class) +@AutoConfigureBefore(BatchAutoConfiguration.class) public class SingleStepJobAutoConfiguration { private JobBuilderFactory jobBuilderFactory; diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderAutoConfigurationTests.java index cde17ad5..4d37bf62 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemReaderAutoConfigurationTests.java @@ -349,15 +349,6 @@ public class FlatFileItemReaderAutoConfigurationTests { @Configuration public static class JobConfiguration { - @Autowired - private JobBuilderFactory jobBuilderFactory; - - @Autowired - private StepBuilderFactory stepBuilderFactory; - - @Autowired - private FlatFileItemReader itemReader; - @Bean public ListItemWriter itemWriter() { return new ListItemWriter<>(); @@ -369,15 +360,6 @@ public class FlatFileItemReaderAutoConfigurationTests { @Configuration public static class RecordSeparatorAndSkippedLinesJobConfiguration { - @Autowired - private JobBuilderFactory jobBuilderFactory; - - @Autowired - private StepBuilderFactory stepBuilderFactory; - - @Autowired - private FlatFileItemReader itemReader; - @Bean public RecordSeparatorPolicy recordSeparatorPolicy() { return new RecordSeparatorPolicy() { @@ -423,15 +405,6 @@ public class FlatFileItemReaderAutoConfigurationTests { @Configuration public static class CustomLineMapperConfiguration { - @Autowired - private JobBuilderFactory jobBuilderFactory; - - @Autowired - private StepBuilderFactory stepBuilderFactory; - - @Autowired - private FlatFileItemReader itemReader; - @Bean public LineMapper> lineMapper() { return (line, lineNumber) -> { diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterAutoConfigurationTests.java index 148198bc..11e4b427 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/FlatFileItemWriterAutoConfigurationTests.java @@ -85,6 +85,7 @@ public class FlatFileItemWriterAutoConfigurationTests { try { configuration.itemWriter(); + fail("Exception should have been thrown when both formatted and delimited are selected"); } catch (IllegalStateException ise) { assertThat(ise.getMessage()).isEqualTo( @@ -103,6 +104,7 @@ public class FlatFileItemWriterAutoConfigurationTests { try { configuration.itemWriter(); + fail("Exception should have been thrown when a LineAggregator and one of the autocreated options are selected"); } catch (IllegalStateException ise) { assertThat(ise.getMessage()) @@ -118,6 +120,7 @@ public class FlatFileItemWriterAutoConfigurationTests { try { configuration.itemWriter(); + fail("Exception should have been thrown when a LineAggregator and one of the autocreated options are selected"); } catch (IllegalStateException ise) { assertThat(ise.getMessage()) @@ -238,7 +241,7 @@ public class FlatFileItemWriterAutoConfigurationTests { SingleStepJobAutoConfiguration.class, FlatFileItemWriterAutoConfiguration.class)) .withPropertyValues("spring.batch.job.jobName=job", - "spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=2", + "spring.batch.job.stepName=step1", "spring.batch.job.chunkSize=5", "spring.batch.job.flatfilewriter.name=fooWriter", String.format( "spring.batch.job.flatfilewriter.resource=file://%s",