SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed BatchConfigurer and @EnableBatchProcessing from tests and samples

Browse Source 
TaskJobLauncherApplicationRunnerTests updated

Signed-off-by: Glenn Renfro <grenfro@vmware.com>

Updated Integration tests

Updated Tests for samples
This commit is contained in:
Glenn Renfro
2022-09-21 09:45:33 -04:00
parent 25cf280f78
commit b46278be5d
21 changed files with 281 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.support.ListItemReader;
@@ -154,7 +153,6 @@ public class SingleStepJobAutoConfigurationTests {
});
}
@EnableBatchProcessing
@Configuration
public static class SimpleConfiguration {

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

@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.file.LineCallbackHandler;
@@ -304,7 +303,6 @@ public class FlatFileItemReaderAutoConfigurationTests {
});
}
@EnableBatchProcessing
@Configuration
public static class CustomMappingConfiguration {
@@ -331,7 +329,6 @@ public class FlatFileItemReaderAutoConfigurationTests {
}
@EnableBatchProcessing
@Configuration
public static class JobConfiguration {
@@ -347,7 +344,6 @@ public class FlatFileItemReaderAutoConfigurationTests {
}
@EnableBatchProcessing
@Configuration
public static class RecordSeparatorAndSkippedLinesJobConfiguration {
@@ -397,7 +393,6 @@ public class FlatFileItemReaderAutoConfigurationTests {
}
@EnableBatchProcessing
@Configuration
public static class CustomLineMapperConfiguration {

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

@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.file.FlatFileFooterCallback;
@@ -361,7 +360,6 @@ public class FlatFileItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class DelimitedJobConfiguration {
@Bean
@@ -384,7 +382,6 @@ public class FlatFileItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class LineAggregatorConfiguration {
@Bean
@@ -412,7 +409,6 @@ public class FlatFileItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class HeaderFooterConfiguration {
@Bean
@@ -445,7 +441,6 @@ public class FlatFileItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class FieldExtractorConfiguration {
@Bean
@@ -478,7 +473,6 @@ public class FlatFileItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class FormattedJobConfiguration {
@Bean
@@ -501,7 +495,6 @@ public class FlatFileItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class FormattedFieldExtractorJobConfiguration {
@Bean

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

@@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.database.ItemPreparedStatementSetter;
@@ -262,7 +261,6 @@ public class JdbcBatchItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class DelimitedJobConfiguration {
@Bean
@@ -285,7 +283,6 @@ public class JdbcBatchItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class DelimitedDifferentKeyNameJobConfiguration {
@Bean
@@ -308,7 +305,6 @@ public class JdbcBatchItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class CustomSqlParameterSourceProviderConfiguration {
@Bean
@@ -323,7 +319,6 @@ public class JdbcBatchItemWriterAutoConfigurationTests {
}
@Configuration
@EnableBatchProcessing
public static class ItemPreparedStatementSetterConfiguration {
@Bean

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

@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.database.JdbcCursorItemReader;
@@ -353,7 +352,6 @@ public class JdbcCursorItemReaderAutoConfigurationTests {
}
@EnableBatchProcessing
@Configuration
public static class BaseConfiguration {
@@ -364,7 +362,6 @@ public class JdbcCursorItemReaderAutoConfigurationTests {
}
@EnableBatchProcessing
@Configuration
public static class RowMapperConfiguration {

2
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemReaderAutoConfigurationTests.java
View File

@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.support.ListItemWriter;
@@ -214,7 +213,6 @@ public class KafkaItemReaderAutoConfigurationTests {
producer.close();
}
@EnableBatchProcessing
@Configuration
public static class CustomMappingConfiguration {

2
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/kafka/KafkaItemWriterTests.java
View File

@@ -30,7 +30,6 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.support.ListItemReader;
@@ -118,7 +117,6 @@ public class KafkaItemWriterTests {
}
}
@EnableBatchProcessing
@Configuration
public static class CustomMappingConfiguration {

2
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemReaderAutoConfigurationTests.java
View File

@@ -39,7 +39,6 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.support.ListItemWriter;
@@ -203,7 +202,6 @@ public class AmqpItemReaderAutoConfigurationTests {
}
@EnableBatchProcessing
@Configuration
public static class BaseConfiguration {

3
spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/rabbit/AmqpItemWriterAutoConfigurationTests.java
View File

@@ -42,7 +42,6 @@ import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
import org.springframework.batch.core.Job;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
import org.springframework.batch.core.explore.JobExplorer;
import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.batch.item.ItemReader;
@@ -173,13 +172,11 @@ public class AmqpItemWriterAutoConfigurationTests {
return jobLauncher.run(job, new JobParameters());
}
@EnableBatchProcessing
@Configuration
public static class BaseConfiguration extends ItemWriterConfiguration {
}
@EnableBatchProcessing
@Configuration
public static class MockConfiguration extends ItemWriterConfiguration {