Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve Step/Job builder APIs to guide users to set mandatory properties

Browse Source 
Before this commit, the user had to manually set the job repository and transaction
manager on `JobBuilder` and `StepBuilder` instances with a chained call to
`.repository(jobRepository)` and `.transactionManager(transactionManager)`.
This is error prone and can lead to runtime errors if these properties are not set.

This commit introduces new APIs to guide the user to set these properties at
builder creation time.

Resolves #4192
This commit is contained in:
Mahmoud Ben Hassine
2022-09-17 22:31:12 +02:00
parent d11b5b2c3a
commit f39f07075a
63 changed files with 520 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java
View File

@@ -82,18 +82,18 @@ class JobLauncherTestUtilsTests {
@Bean
public Step step(JobRepository jobRepository) {
return new StepBuilder("step1").repository(jobRepository).tasklet(new Tasklet() {
return new StepBuilder("step1", jobRepository).tasklet(new Tasklet() {
@Nullable
@Override
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
return null;
}
}).transactionManager(transactionManager(dataSource())).build();
}, transactionManager(dataSource())).build();
}
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository).flow(step(jobRepository)).end().build();
return new JobBuilder("job", jobRepository).flow(step(jobRepository)).end().build();
}
@Bean

8
spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java
View File

@@ -145,11 +145,9 @@ public class SpringBatchTestJUnit4Tests {
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository)
.start(new StepBuilder("step").repository(jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED)
.transactionManager(transactionManager(dataSource())).build())
.build();
return new JobBuilder("job", jobRepository).start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager(dataSource()))
.build()).build();
}
}

8
spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java
View File

@@ -145,11 +145,9 @@ public class SpringBatchTestJUnit5Tests {
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository)
.start(new StepBuilder("step").repository(jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED)
.transactionManager(transactionManager(dataSource())).build())
.build();
return new JobBuilder("job", jobRepository).start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager(dataSource()))
.build()).build();
}
}

8
spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java
View File

@@ -123,15 +123,13 @@ class StepScopeAnnotatedListenerIntegrationTests {
@Bean
public Job jobUnderTest(JobRepository jobRepository) {
return new JobBuilder("job-under-test").repository(jobRepository).start(stepUnderTest(jobRepository))
.build();
return new JobBuilder("job-under-test", jobRepository).start(stepUnderTest(jobRepository)).build();
}
@Bean
public Step stepUnderTest(JobRepository jobRepository) {
return new StepBuilder("step-under-test").repository(jobRepository).<String, String>chunk(1)
.transactionManager(this.transactionManager).reader(reader()).processor(processor())
.writer(writer()).build();
return new StepBuilder("step-under-test", jobRepository).<String, String>chunk(1, this.transactionManager)
.reader(reader()).processor(processor()).writer(writer()).build();
}
@Bean