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

2
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/JobBuilderFactory.java
View File

@@ -51,7 +51,7 @@ public class JobBuilderFactory {
* @return a job builder
*/
public JobBuilder get(String name) {
return new JobBuilder(name).repository(this.jobRepository);
return new JobBuilder(name, this.jobRepository);
}
}

2
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/StepBuilderFactory.java
View File

@@ -53,7 +53,7 @@ public class StepBuilderFactory {
* @return a step builder
*/
public StepBuilder get(String name) {
return new StepBuilder(name).repository(this.jobRepository);
return new StepBuilder(name, this.jobRepository);
}
}

18
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java
View File

@@ -274,7 +274,6 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
if (startLimit != null) {
builder.startLimit(startLimit);
}
builder.repository(jobRepository);
for (Object listener : stepExecutionListeners) {
if (listener instanceof StepExecutionListener) {
builder.listener((StepExecutionListener) listener);
@@ -290,10 +289,11 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
PartitionStepBuilder builder;
if (partitioner != null) {
builder = new StepBuilder(name).partitioner(step != null ? step.getName() : name, partitioner).step(step);
builder = new StepBuilder(name, jobRepository)
.partitioner(step != null ? step.getName() : name, partitioner).step(step);
}
else {
builder = new StepBuilder(name).partitioner(step);
builder = new StepBuilder(name, jobRepository).partitioner(step);
}
enhanceCommonStep(builder);
@@ -401,7 +401,7 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
* @return the {@link FaultTolerantStepBuilder}.
*/
protected FaultTolerantStepBuilder<I, O> getFaultTolerantStepBuilder(String stepName) {
return new FaultTolerantStepBuilder<>(new StepBuilder(stepName));
return new FaultTolerantStepBuilder<>(new StepBuilder(stepName, jobRepository));
}
protected void registerItemListeners(SimpleStepBuilder<I, O> builder) {
@@ -445,7 +445,7 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
}
protected SimpleStepBuilder<I, O> getSimpleStepBuilder(String stepName) {
return new SimpleStepBuilder<>(new StepBuilder(stepName));
return new SimpleStepBuilder<>(new StepBuilder(stepName, jobRepository));
}
/**
@@ -453,8 +453,8 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
* @return a new {@link TaskletStep}
*/
protected TaskletStep createTaskletStep() {
TaskletStepBuilder builder = new TaskletStepBuilder(new StepBuilder(name))
.transactionManager(transactionManager).tasklet(tasklet);
TaskletStepBuilder builder = new TaskletStepBuilder(new StepBuilder(name, jobRepository)).tasklet(tasklet,
transactionManager);
enhanceTaskletStepBuilder(builder);
return builder.build();
}
@@ -512,14 +512,14 @@ public class StepParserStepFactoryBean<I, O> implements FactoryBean<Step>, BeanN
* @return the {@link org.springframework.batch.core.job.flow.FlowStep}.
*/
protected Step createFlowStep() {
FlowStepBuilder builder = new StepBuilder(name).flow(flow);
FlowStepBuilder builder = new StepBuilder(name, jobRepository).flow(flow);
enhanceCommonStep(builder);
return builder.build();
}
private Step createJobStep() throws Exception {
JobStepBuilder builder = new StepBuilder(name).job(job);
JobStepBuilder builder = new StepBuilder(name, jobRepository).job(job);
enhanceCommonStep(builder);
builder.parametersExtractor(jobParametersExtractor);
builder.launcher(jobLauncher);

17
spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2013 the original author or authors.
* Copyright 2006-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,11 +17,13 @@ package org.springframework.batch.core.job.builder;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.repository.JobRepository;
/**
* Convenience for building jobs of various kinds.
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.2
*
*/
@@ -30,11 +32,24 @@ public class JobBuilder extends JobBuilderHelper<JobBuilder> {
/**
* Create a new builder for a job with the given name.
* @param name the name of the job
* @deprecated use {@link JobBuilder#JobBuilder(String, JobRepository)}
*/
@Deprecated(since = "5.0")
public JobBuilder(String name) {
super(name);
}
/**
* Create a new builder for a job with the given name.
* @param name the name of the job
* @param jobRepository the job repository to which the job should report to
* @since 5.0
*/
public JobBuilder(String name, JobRepository jobRepository) {
super(name);
super.repository(jobRepository);
}
/**
* Create a new job builder that will execute a step or sequence of steps.
* @param step a step to execute

82
spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java
View File

@@ -19,14 +19,17 @@ import org.springframework.batch.core.Job;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.job.flow.Flow;
import org.springframework.batch.core.partition.support.Partitioner;
import org.springframework.batch.core.repository.JobRepository;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.batch.repeat.CompletionPolicy;
import org.springframework.transaction.PlatformTransactionManager;
/**
* Convenient entry point for building all kinds of steps. Use this as a factory for
* fluent builders of any step.
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.2
*/
public class StepBuilder extends StepBuilderHelper<StepBuilder> {
@@ -34,20 +37,46 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
/**
* Initialize a step builder for a step with the given name.
* @param name the name of the step
* @deprecated use {@link StepBuilder#StepBuilder(String, JobRepository)}
*/
@Deprecated(since = "5.0")
public StepBuilder(String name) {
super(name);
}
/**
* Initialize a step builder for a step with the given name and job repository.
* @param name the name of the step
* @param jobRepository the job repository to which the step should report to.
* @since 5.0
*/
public StepBuilder(String name, JobRepository jobRepository) {
super(name);
super.repository(jobRepository);
}
/**
* Build a step with a custom tasklet, not necessarily item processing.
* @param tasklet a tasklet
* @return a {@link TaskletStepBuilder}
* @deprecated use {@link StepBuilder#tasklet(Tasklet, PlatformTransactionManager)}
*/
@Deprecated(since = "5.0")
public TaskletStepBuilder tasklet(Tasklet tasklet) {
return new TaskletStepBuilder(this).tasklet(tasklet);
}
/**
* Build a step with a custom tasklet, not necessarily item processing.
* @param tasklet a tasklet
* @param transactionManager the transaction manager to use for the tasklet
* @return a {@link TaskletStepBuilder}
* @since 5.0
*/
public TaskletStepBuilder tasklet(Tasklet tasklet, PlatformTransactionManager transactionManager) {
return new TaskletStepBuilder(this).tasklet(tasklet, transactionManager);
}
/**
* Build a step that processes items in chunks with the size provided. To extend the
* step to being fault tolerant, call the {@link SimpleStepBuilder#faultTolerant()}
@@ -62,11 +91,35 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
* @return a {@link SimpleStepBuilder}
* @param <I> the type of item to be processed as input
* @param <O> the type of item to be output
* @deprecated use {@link StepBuilder#chunk(int, PlatformTransactionManager)}
*/
@Deprecated(since = "5.0")
public <I, O> SimpleStepBuilder<I, O> chunk(int chunkSize) {
return new SimpleStepBuilder<I, O>(this).chunk(chunkSize);
}
/**
* Build a step that processes items in chunks with the size provided. To extend the
* step to being fault tolerant, call the {@link SimpleStepBuilder#faultTolerant()}
* method on the builder. In most cases you will want to parameterize your call to
* this method, to preserve the type safety of your readers and writers, e.g.
*
* <pre>
* new StepBuilder(&quot;step1&quot;).&lt;Order, Ledger&gt; chunk(100, transactionManager).reader(new OrderReader()).writer(new LedgerWriter())
* // ... etc.
* </pre>
* @param chunkSize the chunk size (commit interval)
* @param transactionManager the transaction manager to use for the chunk-oriented
* tasklet
* @return a {@link SimpleStepBuilder}
* @param <I> the type of item to be processed as input
* @param <O> the type of item to be output
* @since 5.0
*/
public <I, O> SimpleStepBuilder<I, O> chunk(int chunkSize, PlatformTransactionManager transactionManager) {
return new SimpleStepBuilder<I, O>(this).transactionManager(transactionManager).chunk(chunkSize);
}
/**
* Build a step that processes items in chunks with the completion policy provided. To
* extend the step to being fault tolerant, call the
@@ -81,12 +134,39 @@ public class StepBuilder extends StepBuilderHelper<StepBuilder> {
* @param completionPolicy the completion policy to use to control chunk processing
* @return a {@link SimpleStepBuilder}
* @param <I> the type of item to be processed as input
* @param <O> the type of item to be output *
* @param <O> the type of item to be output
* @deprecated use
* {@link StepBuilder#chunk(CompletionPolicy, PlatformTransactionManager)}
*/
@Deprecated(since = "5.0")
public <I, O> SimpleStepBuilder<I, O> chunk(CompletionPolicy completionPolicy) {
return new SimpleStepBuilder<I, O>(this).chunk(completionPolicy);
}
/**
* Build a step that processes items in chunks with the completion policy provided. To
* extend the step to being fault tolerant, call the
* {@link SimpleStepBuilder#faultTolerant()} method on the builder. In most cases you
* will want to parameterize your call to this method, to preserve the type safety of
* your readers and writers, e.g.
*
* <pre>
* new StepBuilder(&quot;step1&quot;).&lt;Order, Ledger&gt; chunk(100, transactionManager).reader(new OrderReader()).writer(new LedgerWriter())
* // ... etc.
* </pre>
* @param completionPolicy the completion policy to use to control chunk processing
* @param transactionManager the transaction manager to use for the chunk-oriented
* tasklet
* @return a {@link SimpleStepBuilder}
* @param <I> the type of item to be processed as input
* @param <O> the type of item to be output
* @since 5.0
*/
public <I, O> SimpleStepBuilder<I, O> chunk(CompletionPolicy completionPolicy,
PlatformTransactionManager transactionManager) {
return new SimpleStepBuilder<I, O>(this).transactionManager(transactionManager).chunk(completionPolicy);
}
/**
* Create a partition step builder for a remote (or local) step.
* @param stepName the name of the remote or delegate step

16
spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/TaskletStepBuilder.java
View File

@@ -16,11 +16,13 @@
package org.springframework.batch.core.step.builder;
import org.springframework.batch.core.step.tasklet.Tasklet;
import org.springframework.transaction.PlatformTransactionManager;
/**
* Builder for tasklet step based on a custom tasklet (not item oriented).
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
* @since 2.2
*/
public class TaskletStepBuilder extends AbstractTaskletStepBuilder<TaskletStepBuilder> {
@@ -39,12 +41,26 @@ public class TaskletStepBuilder extends AbstractTaskletStepBuilder<TaskletStepBu
/**
* @param tasklet the tasklet to use
* @return this for fluent chaining
* @deprecated use
* {@link TaskletStepBuilder#tasklet(Tasklet, PlatformTransactionManager)}
*/
@Deprecated(since = "5.0")
public TaskletStepBuilder tasklet(Tasklet tasklet) {
this.tasklet = tasklet;
return this;
}
/**
* @param tasklet the tasklet to use
* @return this for fluent chaining
* @since 5.0
*/
public TaskletStepBuilder tasklet(Tasklet tasklet, PlatformTransactionManager transactionManager) {
this.tasklet = tasklet;
super.transactionManager(transactionManager);
return this;
}
@Override
protected TaskletStepBuilder self() {
return this;

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2013 the original author or authors.
* Copyright 2006-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -214,7 +214,7 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
@Override
protected SimpleStepBuilder<T, S> createBuilder(String name) {
return new FaultTolerantStepBuilder<>(new StepBuilder(name));
return new FaultTolerantStepBuilder<>(new StepBuilder(name, jobRepository));
}
@Override

7
spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2013 the original author or authors.
* Copyright 2006-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
* @see FaultTolerantStepFactoryBean
* @author Dave Syer
* @author Robert Kasanicky
* @author Mahmoud Ben Hassine
*
*/
public class SimpleStepFactoryBean<T, S> implements FactoryBean<Step>, BeanNameAware {
@@ -81,7 +82,7 @@ public class SimpleStepFactoryBean<T, S> implements FactoryBean<Step>, BeanNameA
private int transactionTimeout = DefaultTransactionAttribute.TIMEOUT_DEFAULT;
private JobRepository jobRepository;
protected JobRepository jobRepository;
private boolean singleton = true;
@@ -318,7 +319,7 @@ public class SimpleStepFactoryBean<T, S> implements FactoryBean<Step>, BeanNameA
}
protected SimpleStepBuilder<T, S> createBuilder(String name) {
return new SimpleStepBuilder<>(new StepBuilder(name));
return new SimpleStepBuilder<>(new StepBuilder(name, jobRepository));
}
@Override

15
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java
View File

@@ -35,7 +35,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.transaction.PlatformTransactionManager;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -57,12 +59,12 @@ class InlineDataSourceDefinitionTests {
static class MyJobConfiguration {
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository)
.start(new StepBuilder("step").repository(jobRepository).tasklet((contribution, chunkContext) -> {
public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository).tasklet((contribution, chunkContext) -> {
System.out.println("hello world");
return RepeatStatus.FINISHED;
}).build()).build();
}, transactionManager).build()).build();
}
@Bean
@@ -72,6 +74,11 @@ class InlineDataSourceDefinitionTests {
.addScript("/org/springframework/batch/core/schema-h2.sql").generateUniqueName(true).build();
}
@Bean
public JdbcTransactionManager transactionManager(DataSource dataSource) {
return new JdbcTransactionManager(dataSource);
}
}
}

22
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java
View File

@@ -120,21 +120,18 @@ public class JobBuilderConfigurationTests {
@Bean
public Job testJob() throws Exception {
SimpleJobBuilder builder = new JobBuilder("test").repository(this.jobRepository).start(step1())
.next(step2());
SimpleJobBuilder builder = new JobBuilder("test", this.jobRepository).start(step1()).next(step2());
return builder.build();
}
@Bean
protected Step step1() throws Exception {
return new StepBuilder("step1").repository(jobRepository).tasklet(tasklet())
.transactionManager(this.transactionManager).build();
return new StepBuilder("step1", jobRepository).tasklet(tasklet(), this.transactionManager).build();
}
@Bean
protected Step step2() throws Exception {
return new StepBuilder("step2").repository(jobRepository).tasklet(tasklet())
.transactionManager(this.transactionManager).build();
return new StepBuilder("step2", jobRepository).tasklet(tasklet(), this.transactionManager).build();
}
@Bean
@@ -166,14 +163,13 @@ public class JobBuilderConfigurationTests {
@Bean
public Job anotherJob(JobRepository jobRepository) throws Exception {
SimpleJobBuilder builder = new JobBuilder("another").repository(jobRepository).start(step3(jobRepository));
SimpleJobBuilder builder = new JobBuilder("another", jobRepository).start(step3(jobRepository));
return builder.build();
}
@Bean
protected Step step3(JobRepository jobRepository) throws Exception {
return new StepBuilder("step3").repository(jobRepository).tasklet(tasklet)
.transactionManager(this.transactionManager).build();
return new StepBuilder("step3", jobRepository).tasklet(tasklet, this.transactionManager).build();
}
}
@@ -189,7 +185,7 @@ public class JobBuilderConfigurationTests {
@Bean
public Job testConfigurerJob(JobRepository jobRepository) throws Exception {
SimpleJobBuilder builder = new JobBuilder("configurer").repository(jobRepository).start(step1());
SimpleJobBuilder builder = new JobBuilder("configurer", jobRepository).start(step1());
return builder.build();
}
@@ -218,20 +214,20 @@ public class JobBuilderConfigurationTests {
@Bean
public Job beansConfigurerJob(JobRepository jobRepository) throws Exception {
SimpleJobBuilder builder = new JobBuilder("beans").repository(jobRepository).start(step1(jobRepository));
SimpleJobBuilder builder = new JobBuilder("beans", jobRepository).start(step1(jobRepository));
return builder.build();
}
@Bean
protected Step step1(JobRepository jobRepository) throws Exception {
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(this.transactionManager).build();
}, this.transactionManager).build();
}
@Bean

16
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java
View File

@@ -127,21 +127,21 @@ class JobLoaderConfigurationTests {
@Bean
public Job testJob(JobRepository jobRepository) throws Exception {
SimpleJobBuilder builder = new JobBuilder("test").repository(jobRepository).start(step1(jobRepository))
SimpleJobBuilder builder = new JobBuilder("test", jobRepository).start(step1(jobRepository))
.next(step2(jobRepository));
return builder.build();
}
@Bean
protected Step step1(JobRepository jobRepository) throws Exception {
return new StepBuilder("step1").repository(jobRepository).tasklet(tasklet())
.transactionManager(new ResourcelessTransactionManager()).build();
return new StepBuilder("step1", jobRepository).tasklet(tasklet(), new ResourcelessTransactionManager())
.build();
}
@Bean
protected Step step2(JobRepository jobRepository) throws Exception {
return new StepBuilder("step2").repository(jobRepository).tasklet(tasklet())
.transactionManager(new ResourcelessTransactionManager()).build();
return new StepBuilder("step2", jobRepository).tasklet(tasklet(), new ResourcelessTransactionManager())
.build();
}
@Bean
@@ -162,19 +162,19 @@ class JobLoaderConfigurationTests {
@Bean
public Job vanillaJob(JobRepository jobRepository) throws Exception {
SimpleJobBuilder builder = new JobBuilder("vanilla").repository(jobRepository).start(step3(jobRepository));
SimpleJobBuilder builder = new JobBuilder("vanilla", jobRepository).start(step3(jobRepository));
return builder.build();
}
@Bean
protected Step step3(JobRepository jobRepository) throws Exception {
return new StepBuilder("step3").repository(jobRepository).tasklet(new Tasklet() {
return new StepBuilder("step3", jobRepository).tasklet(new Tasklet() {
@Nullable
@Override
public RepeatStatus execute(StepContribution contribution, ChunkContext context) throws Exception {
return RepeatStatus.FINISHED;
}
}).transactionManager(new ResourcelessTransactionManager()).build();
}, new ResourcelessTransactionManager()).build();
}
}

4
spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java
View File

@@ -88,7 +88,7 @@ class SimpleJobExplorerIntegrationTests {
@Bean
public Step flowStep(JobRepository jobRepository) {
return new StepBuilder("flowStep").repository(jobRepository).flow(simpleFlow()).build();
return new StepBuilder("flowStep", jobRepository).flow(simpleFlow()).build();
}
@Bean
@@ -129,7 +129,7 @@ class SimpleJobExplorerIntegrationTests {
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository).start(dummyStep()).build();
return new JobBuilder("job", jobRepository).start(dummyStep()).build();
}
}

36
spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java
View File

@@ -122,8 +122,8 @@ class FlowJobBuilderTests {
@Test
void testBuildOnOneLine() {
FlowJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step1).on("COMPLETED").to(step2)
.end().preventRestart();
FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1).on("COMPLETED").to(step2).end()
.preventRestart();
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(2, execution.getStepExecutions().size());
@@ -132,7 +132,7 @@ class FlowJobBuilderTests {
@Test
void testBuildSingleFlow() {
Flow flow = new FlowBuilder<Flow>("subflow").from(step1).next(step2).build();
FlowJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(flow).end().preventRestart();
FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(flow).end().preventRestart();
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(2, execution.getStepExecutions().size());
@@ -140,8 +140,7 @@ class FlowJobBuilderTests {
@Test
void testBuildOverTwoLines() {
FlowJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step1).on("COMPLETED").to(step2)
.end();
FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1).on("COMPLETED").to(step2).end();
builder.preventRestart();
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -151,7 +150,7 @@ class FlowJobBuilderTests {
@Test
void testBuildSubflow() {
Flow flow = new FlowBuilder<Flow>("subflow").from(step1).end();
JobFlowBuilder builder = new JobBuilder("flow").repository(jobRepository).start(flow);
JobFlowBuilder builder = new JobBuilder("flow", jobRepository).start(flow);
builder.on("COMPLETED").to(step2);
builder.end().preventRestart().build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -161,7 +160,7 @@ class FlowJobBuilderTests {
@Test
void testBuildSplit() {
Flow flow = new FlowBuilder<Flow>("subflow").from(step1).end();
SimpleJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step2);
SimpleJobBuilder builder = new JobBuilder("flow", jobRepository).start(step2);
builder.split(new SimpleAsyncTaskExecutor()).add(flow).end();
builder.preventRestart().build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -175,7 +174,7 @@ class FlowJobBuilderTests {
Flow splitflow = new FlowBuilder<Flow>("splitflow").start(subflow1).split(new SimpleAsyncTaskExecutor())
.add(subflow2).build();
FlowJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(splitflow).end();
FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(splitflow).end();
builder.preventRestart().build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(2, execution.getStepExecutions().size());
@@ -187,7 +186,7 @@ class FlowJobBuilderTests {
Flow flow2 = new FlowBuilder<Flow>("subflow2").from(step2).end();
Flow splitFlow = new FlowBuilder<Flow>("splitflow").split(new SimpleAsyncTaskExecutor()).add(flow1, flow2)
.build();
FlowJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(splitFlow).end();
FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(splitFlow).end();
builder.preventRestart().build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(2, execution.getStepExecutions().size());
@@ -205,7 +204,7 @@ class FlowJobBuilderTests {
}
};
step1.setAllowStartIfComplete(true);
SimpleJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step1);
SimpleJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1);
builder.next(decider).on("COMPLETED").end().from(decider).on("*").to(step1).end();
builder.preventRestart().build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -214,7 +213,7 @@ class FlowJobBuilderTests {
@Test
void testBuildWithIntermediateSimpleJob() {
SimpleJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step1);
SimpleJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1);
builder.on("COMPLETED").to(step2).end();
builder.preventRestart();
builder.build().execute(execution);
@@ -224,7 +223,7 @@ class FlowJobBuilderTests {
@Test
void testBuildWithIntermediateSimpleJobTwoSteps() {
SimpleJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step1).next(step2);
SimpleJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1).next(step2);
builder.on("FAILED").to(step3).end();
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -233,7 +232,7 @@ class FlowJobBuilderTests {
@Test
void testBuildWithCustomEndState() {
SimpleJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step1);
SimpleJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1);
builder.on("COMPLETED").end("FOO");
builder.preventRestart();
builder.build().execute(execution);
@@ -244,7 +243,7 @@ class FlowJobBuilderTests {
@Test
void testBuildWithStop() {
SimpleJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(step1);
SimpleJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1);
builder.on("COMPLETED").stop();
builder.preventRestart();
builder.build().execute(execution);
@@ -255,7 +254,7 @@ class FlowJobBuilderTests {
@Test
void testBuildWithStopAndRestart() throws Exception {
SimpleJobBuilder builder = new JobBuilder("flow").repository(jobRepository).start(fails);
SimpleJobBuilder builder = new JobBuilder("flow", jobRepository).start(fails);
builder.on("FAILED").stopAndRestart(step2);
Job job = builder.build();
job.execute(execution);
@@ -291,16 +290,15 @@ class FlowJobBuilderTests {
@JobScope
public Step step(JobRepository jobRepository, PlatformTransactionManager transactionManager,
@Value("#{jobParameters['chunkSize']}") Integer chunkSize) {
return new StepBuilder("step").repository(jobRepository).<Integer, Integer>chunk(chunkSize)
.transactionManager(transactionManager).reader(new ListItemReader<>(Arrays.asList(1, 2, 3, 4)))
.writer(items -> {
return new StepBuilder("step", jobRepository).<Integer, Integer>chunk(chunkSize, transactionManager)
.reader(new ListItemReader<>(Arrays.asList(1, 2, 3, 4))).writer(items -> {
}).build();
}
@Bean
public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
Step step = step(jobRepository, transactionManager, null);
return new JobBuilder("job").repository(jobRepository).flow(step).build().build();
return new JobBuilder("job", jobRepository).flow(step).build().build();
}
@Bean

7
spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java
View File

@@ -71,11 +71,10 @@ class JobBuilderTests {
@Bean
public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job").repository(jobRepository).listener(new InterfaceBasedJobExecutionListener())
return new JobBuilder("job", jobRepository).listener(new InterfaceBasedJobExecutionListener())
.listener(new AnnotationBasedJobExecutionListener())
.start(new StepBuilder("step").repository(jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED)
.transactionManager(transactionManager).build())
.start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build())
.build();
}

10
spring-batch-core/src/test/java/org/springframework/batch/core/listener/ItemListenerErrorTests.java
View File

@@ -133,8 +133,7 @@ class ItemListenerErrorTests {
@Bean
public Job testJob(JobRepository jobRepository, Step testStep) {
return new JobBuilder("testJob").repository(jobRepository).incrementer(new RunIdIncrementer())
.start(testStep).build();
return new JobBuilder("testJob", jobRepository).incrementer(new RunIdIncrementer()).start(testStep).build();
}
@Bean
@@ -142,10 +141,9 @@ class ItemListenerErrorTests {
ItemReader<String> fakeItemReader, ItemProcessor<String, String> fakeProcessor,
ItemWriter<String> fakeItemWriter, ItemProcessListener<String, String> itemProcessListener) {
return new StepBuilder("testStep").repository(jobRepository).<String, String>chunk(10)
.transactionManager(transactionManager).reader(fakeItemReader).processor(fakeProcessor)
.writer(fakeItemWriter).listener(itemProcessListener).faultTolerant().skipLimit(50)
.skip(RuntimeException.class).build();
return new StepBuilder("testStep", jobRepository).<String, String>chunk(10, transactionManager)
.reader(fakeItemReader).processor(fakeProcessor).writer(fakeItemWriter)
.listener(itemProcessListener).faultTolerant().skipLimit(50).skip(RuntimeException.class).build();
}
@Bean

15
spring-batch-core/src/test/java/org/springframework/batch/core/observability/BatchMetricsTests.java
View File

@@ -231,23 +231,20 @@ class BatchMetricsTests {
@Bean
public Step step1(JobRepository jobRepository) {
return new StepBuilder("step1").repository(jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED)
.transactionManager(this.transactionManager).build();
return new StepBuilder("step1", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, this.transactionManager).build();
}
@Bean
public Step step2(JobRepository jobRepository) {
return new StepBuilder("step2").repository(jobRepository).<Integer, Integer>chunk(2)
.transactionManager(this.transactionManager)
return new StepBuilder("step2", jobRepository).<Integer, Integer>chunk(2, this.transactionManager)
.reader(new ListItemReader<>(Arrays.asList(1, 2, 3, 4, 5)))
.writer(items -> items.forEach(System.out::println)).build();
}
@Bean
public Step step3(JobRepository jobRepository) {
return new StepBuilder("step3").repository(jobRepository).<Integer, Integer>chunk(2)
.transactionManager(this.transactionManager)
return new StepBuilder("step3", jobRepository).<Integer, Integer>chunk(2, this.transactionManager)
.reader(new ListItemReader<>(Arrays.asList(6, 7, 8, 9, 10)))
.writer(items -> items.forEach(System.out::println)).faultTolerant().skip(Exception.class)
.skipLimit(3).build();
@@ -255,8 +252,8 @@ class BatchMetricsTests {
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository).start(step1(jobRepository))
.next(step2(jobRepository)).next(step3(jobRepository)).build();
return new JobBuilder("job", jobRepository).start(step1(jobRepository)).next(step2(jobRepository))
.next(step3(jobRepository)).build();
}
}

12
spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java
View File

@@ -30,18 +30,18 @@ class FaultTolerantStepBuilderTests {
@Test
void faultTolerantReturnsSameInstance() {
FaultTolerantStepBuilder<Object, Object> builder = new FaultTolerantStepBuilder<>(new StepBuilder("test"));
FaultTolerantStepBuilder<Object, Object> builder = new FaultTolerantStepBuilder<>(
new StepBuilder("test", new DummyJobRepository()));
assertEquals(builder, builder.faultTolerant());
}
@Test
void testAnnotationBasedStepExecutionListenerRegistration() {
// given
FaultTolerantStepBuilder<Object, Object> faultTolerantStepBuilder = new StepBuilder("myStep")
.repository(new DummyJobRepository()).<Object, Object>chunk(5)
.transactionManager(new ResourcelessTransactionManager()).reader(new DummyItemReader())
.writer(new DummyItemWriter()).faultTolerant()
.listener(new StepBuilderTests.AnnotationBasedStepExecutionListener());
FaultTolerantStepBuilder<Object, Object> faultTolerantStepBuilder = new StepBuilder("myStep",
new DummyJobRepository()).<Object, Object>chunk(5, new ResourcelessTransactionManager())
.reader(new DummyItemReader()).writer(new DummyItemWriter()).faultTolerant()
.listener(new StepBuilderTests.AnnotationBasedStepExecutionListener());
// when
Step step = faultTolerantStepBuilder.build();

11
spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/RegisterMultiListenerTests.java
View File

@@ -130,7 +130,7 @@ class RegisterMultiListenerTests {
@Bean
public Job testJob(JobRepository jobRepository) {
return new JobBuilder("testJob").repository(jobRepository).start(step(jobRepository)).build();
return new JobBuilder("testJob", jobRepository).start(step(jobRepository)).build();
}
@Bean
@@ -204,8 +204,8 @@ class RegisterMultiListenerTests {
@Override
@Bean
public Step step(JobRepository jobRepository) {
return new StepBuilder("step").repository(jobRepository).listener(listener()).<String, String>chunk(2)
.transactionManager(transactionManager(dataSource())).reader(reader()).writer(writer())
return new StepBuilder("step", jobRepository).listener(listener())
.<String, String>chunk(2, transactionManager(dataSource())).reader(reader()).writer(writer())
.faultTolerant().skipLimit(1).skip(MySkippableException.class)
// ChunkListener registered twice for checking BATCH-2149
.listener((ChunkListener) listener()).build();
@@ -233,8 +233,9 @@ class RegisterMultiListenerTests {
@Override
@Bean
public Step step(JobRepository jobRepository) {
return new StepBuilder("step").repository(jobRepository).listener(listener()).<String, String>chunk(2)
.transactionManager(transactionManager(dataSource())).reader(reader()).writer(writer()).build();
return new StepBuilder("step", jobRepository).listener(listener())
.<String, String>chunk(2, transactionManager(dataSource())).reader(reader()).writer(writer())
.build();
}
}

52
spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java
View File

@@ -94,18 +94,18 @@ class StepBuilderTests {
@Test
void test() throws Exception {
TaskletStepBuilder builder = new StepBuilder("step").repository(jobRepository)
.tasklet((contribution, chunkContext) -> null).transactionManager(transactionManager);
TaskletStepBuilder builder = new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> null, transactionManager);
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
}
@Test
void testListeners() throws Exception {
TaskletStepBuilder builder = new StepBuilder("step").repository(jobRepository)
TaskletStepBuilder builder = new StepBuilder("step", jobRepository)
.listener(new InterfaceBasedStepExecutionListener())
.listener(new AnnotationBasedStepExecutionListener()).tasklet((contribution, chunkContext) -> null)
.transactionManager(transactionManager);
.listener(new AnnotationBasedStepExecutionListener())
.tasklet((contribution, chunkContext) -> null, transactionManager);
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(1, InterfaceBasedStepExecutionListener.beforeStepCount);
@@ -118,8 +118,8 @@ class StepBuilderTests {
@Test
void testAnnotationBasedChunkListenerForTaskletStep() throws Exception {
TaskletStepBuilder builder = new StepBuilder("step").repository(jobRepository)
.tasklet((contribution, chunkContext) -> null).transactionManager(transactionManager)
TaskletStepBuilder builder = new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> null, transactionManager)
.listener(new AnnotationBasedChunkListener());
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -129,8 +129,8 @@ class StepBuilderTests {
@Test
void testAnnotationBasedChunkListenerForSimpleTaskletStep() throws Exception {
SimpleStepBuilder<Object, Object> builder = new StepBuilder("step").repository(jobRepository).chunk(5)
.transactionManager(transactionManager).reader(new DummyItemReader()).writer(new DummyItemWriter())
SimpleStepBuilder<Object, Object> builder = new StepBuilder("step", jobRepository).chunk(5, transactionManager)
.reader(new DummyItemReader()).writer(new DummyItemWriter())
.listener(new AnnotationBasedChunkListener());
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -140,13 +140,13 @@ class StepBuilderTests {
@Test
void testAnnotationBasedChunkListenerForFaultTolerantTaskletStep() throws Exception {
SimpleStepBuilder<Object, Object> builder = new StepBuilder("step").repository(jobRepository).chunk(5)
.transactionManager(transactionManager).reader(new DummyItemReader()).writer(new DummyItemWriter())
.faultTolerant().listener(new AnnotationBasedChunkListener()); // TODO//
// should
// this
// return
// FaultTolerantStepBuilder?
SimpleStepBuilder<Object, Object> builder = new StepBuilder("step", jobRepository).chunk(5, transactionManager)
.reader(new DummyItemReader()).writer(new DummyItemWriter()).faultTolerant()
.listener(new AnnotationBasedChunkListener()); // TODO//
// should
// this
// return
// FaultTolerantStepBuilder?
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
assertEquals(1, AnnotationBasedChunkListener.beforeChunkCount);
@@ -157,7 +157,7 @@ class StepBuilderTests {
void testAnnotationBasedChunkListenerForJobStepBuilder() throws Exception {
SimpleJob job = new SimpleJob("job");
job.setJobRepository(jobRepository);
JobStepBuilder builder = new StepBuilder("step").repository(jobRepository).job(job)
JobStepBuilder builder = new StepBuilder("step", jobRepository).job(job)
.listener(new AnnotationBasedChunkListener());
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -174,10 +174,9 @@ class StepBuilderTests {
ItemReader<String> reader = new ListItemReader<>(items);
SimpleStepBuilder<String, String> builder = new StepBuilder("step").repository(jobRepository)
.<String, String>chunk(3).transactionManager(transactionManager).reader(reader)
.processor(new PassThroughItemProcessor<>()).writer(new DummyItemWriter())
.listener(new AnnotationBasedStepExecutionListener());
SimpleStepBuilder<String, String> builder = new StepBuilder("step", jobRepository)
.<String, String>chunk(3, transactionManager).reader(reader).processor(new PassThroughItemProcessor<>())
.writer(new DummyItemWriter()).listener(new AnnotationBasedStepExecutionListener());
builder.build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());
@@ -209,9 +208,9 @@ class StepBuilderTests {
ItemReader<Long> reader = new ListItemReader<>(items);
ListItemWriter<String> itemWriter = new ListItemWriter<>();
SimpleStepBuilder<Object, String> builder = new StepBuilder("step").repository(jobRepository)
.<Object, String>chunk(3).transactionManager(transactionManager).reader(reader)
.processor(Object::toString).writer(itemWriter).listener(new AnnotationBasedStepExecutionListener());
SimpleStepBuilder<Object, String> builder = new StepBuilder("step", jobRepository)
.<Object, String>chunk(3, transactionManager).reader(reader).processor(Object::toString)
.writer(itemWriter).listener(new AnnotationBasedStepExecutionListener());
if (faultTolerantStep) {
builder = builder.faultTolerant();
@@ -291,9 +290,8 @@ class StepBuilderTests {
List<String> items = Arrays.asList("1", "2", "3");
ItemReader<String> reader = new ListItemReader<>(items);
SimpleStepBuilder<String, String> builder = new StepBuilder("step").repository(jobRepository)
.<String, String>chunk(3).transactionManager(transactionManager).reader(reader)
.writer(new DummyItemWriter());
SimpleStepBuilder<String, String> builder = new StepBuilder("step", jobRepository)
.<String, String>chunk(3, transactionManager).reader(reader).writer(new DummyItemWriter());
configurer.apply(builder).listener(new InterfaceBasedItemReadListenerListener()).build().execute(execution);
assertEquals(BatchStatus.COMPLETED, execution.getStatus());

20
spring-batch-core/src/test/java/org/springframework/batch/core/test/concurrent/ConcurrentTransactionTests.java
View File

@@ -102,46 +102,46 @@ class ConcurrentTransactionTests {
@Bean
public Flow flow(JobRepository jobRepository) {
return new FlowBuilder<Flow>("flow")
.start(new StepBuilder("flow.step1").repository(jobRepository).tasklet(new Tasklet() {
.start(new StepBuilder("flow.step1", jobRepository).tasklet(new Tasklet() {
@Nullable
@Override
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
throws Exception {
return RepeatStatus.FINISHED;
}
}).transactionManager(getTransactionManager()).build())
.next(new StepBuilder("flow.step2").repository(jobRepository).tasklet(new Tasklet() {
}, getTransactionManager()).build())
.next(new StepBuilder("flow.step2", jobRepository).tasklet(new Tasklet() {
@Nullable
@Override
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext)
throws Exception {
return RepeatStatus.FINISHED;
}
}).transactionManager(getTransactionManager()).build()).build();
}, getTransactionManager()).build()).build();
}
@Bean
public Step firstStep(JobRepository jobRepository) {
return new StepBuilder("firstStep").repository(jobRepository).tasklet(new Tasklet() {
return new StepBuilder("firstStep", jobRepository).tasklet(new Tasklet() {
@Nullable
@Override
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
System.out.println(">> Beginning concurrent job test");
return RepeatStatus.FINISHED;
}
}).transactionManager(getTransactionManager()).build();
}, getTransactionManager()).build();
}
@Bean
public Step lastStep(JobRepository jobRepository) {
return new StepBuilder("lastStep").repository(jobRepository).tasklet(new Tasklet() {
return new StepBuilder("lastStep", jobRepository).tasklet(new Tasklet() {
@Nullable
@Override
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
System.out.println(">> Ending concurrent job test");
return RepeatStatus.FINISHED;
}
}).transactionManager(getTransactionManager()).build();
}, getTransactionManager()).build();
}
@Bean
@@ -151,8 +151,8 @@ class ConcurrentTransactionTests {
flow(jobRepository), flow(jobRepository), flow(jobRepository))
.build();
return new JobBuilder("concurrentJob").repository(jobRepository).start(firstStep(jobRepository))
.next(new StepBuilder("splitFlowStep").repository(jobRepository).flow(splitFlow).build())
return new JobBuilder("concurrentJob", jobRepository).start(firstStep(jobRepository))
.next(new StepBuilder("splitFlowStep", jobRepository).flow(splitFlow).build())
.next(lastStep(jobRepository)).build();
}

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/Db2JobRepositoryIntegrationTests.java
View File

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

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/DerbyJobRepositoryIntegrationTests.java
View File

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

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2CompatibilityModeJobRepositoryIntegrationTests.java
View File

@@ -93,10 +93,9 @@ class H2CompatibilityModeJobRepositoryIntegrationTests {
@Bean
Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job").repository(jobRepository)
.start(new StepBuilder("step").repository(jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED)
.transactionManager(transactionManager).build())
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build())
.build();
}

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2JobRepositoryIntegrationTests.java
View File

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

14
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HANAJobRepositoryIntegrationTests.java
View File

@@ -43,7 +43,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.transaction.PlatformTransactionManager;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
@@ -121,9 +123,15 @@ class HANAJobRepositoryIntegrationTests {
}
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository).start(new StepBuilder("step")
.repository(jobRepository).tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED).build())
public JdbcTransactionManager transactionManager(DataSource dataSource) {
return new JdbcTransactionManager(dataSource);
}
@Bean
public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build())
.build();
}

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HSQLDBJobRepositoryIntegrationTests.java
View File

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

6
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJdbcJobRepositoryIntegrationTests.java
View File

@@ -139,10 +139,10 @@ class MySQLJdbcJobRepositoryIntegrationTests {
@Bean
public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job").repository(jobRepository)
.start(new StepBuilder("step").repository(jobRepository).tasklet((contribution, chunkContext) -> {
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository).tasklet((contribution, chunkContext) -> {
throw new Exception("expected failure");
}).transactionManager(transactionManager).build()).build();
}, transactionManager).build()).build();
}
@Bean

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJobRepositoryIntegrationTests.java
View File

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

14
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java
View File

@@ -42,7 +42,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.transaction.PlatformTransactionManager;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -111,9 +113,15 @@ class OracleJobRepositoryIntegrationTests {
}
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository).start(new StepBuilder("step")
.repository(jobRepository).tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED).build())
public JdbcTransactionManager transactionManager(DataSource dataSource) {
return new JdbcTransactionManager(dataSource);
}
@Bean
public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build())
.build();
}

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/PostgreSQLJobRepositoryIntegrationTests.java
View File

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

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLServerJobRepositoryIntegrationTests.java
View File

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

7
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLiteJobRepositoryIntegrationTests.java
View File

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

14
spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SybaseJobRepositoryIntegrationTests.java
View File

@@ -38,7 +38,9 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.ClassPathResource;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.jdbc.support.JdbcTransactionManager;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.transaction.PlatformTransactionManager;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -105,9 +107,15 @@ class SybaseJobRepositoryIntegrationTests {
}
@Bean
public Job job(JobRepository jobRepository) {
return new JobBuilder("job").repository(jobRepository).start(new StepBuilder("step")
.repository(jobRepository).tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED).build())
public JdbcTransactionManager transactionManager(DataSource dataSource) {
return new JdbcTransactionManager(dataSource);
}
@Bean
public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) {
return new JobBuilder("job", jobRepository)
.start(new StepBuilder("step", jobRepository)
.tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build())
.build();
}

17
spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepIntegrationTests.java
View File

@@ -77,9 +77,8 @@ class FaultTolerantStepIntegrationTests {
}
};
skipPolicy = new SkipIllegalArgumentExceptionSkipPolicy();
stepBuilder = new StepBuilder("step").repository(jobRepository).<Integer, Integer>chunk(CHUNK_SIZE)
.transactionManager(transactionManager).reader(itemReader).processor(item -> item > 20 ? null : item)
.writer(itemWriter).faultTolerant();
stepBuilder = new StepBuilder("step", jobRepository).<Integer, Integer>chunk(CHUNK_SIZE, transactionManager)
.reader(itemReader).processor(item -> item > 20 ? null : item).writer(itemWriter).faultTolerant();
}
@Test
@@ -178,9 +177,9 @@ class FaultTolerantStepIntegrationTests {
}
};
Step step = new StepBuilder("step").repository(jobRepository).<Integer, Integer>chunk(5)
.transactionManager(transactionManager).reader(itemReader).processor(itemProcessor).writer(itemWriter)
.faultTolerant().skip(Exception.class).skipLimit(3).build();
Step step = new StepBuilder("step", jobRepository).<Integer, Integer>chunk(5, transactionManager)
.reader(itemReader).processor(itemProcessor).writer(itemWriter).faultTolerant().skip(Exception.class)
.skipLimit(3).build();
// When
StepExecution stepExecution = execute(step);
@@ -218,9 +217,9 @@ class FaultTolerantStepIntegrationTests {
}
};
Step step = new StepBuilder("step").repository(jobRepository).<Integer, Integer>chunk(5)
.transactionManager(transactionManager).reader(itemReader).processor(itemProcessor).writer(itemWriter)
.faultTolerant().skipPolicy(new AlwaysSkipItemSkipPolicy()).build();
Step step = new StepBuilder("step", jobRepository).<Integer, Integer>chunk(5, transactionManager)
.reader(itemReader).processor(itemProcessor).writer(itemWriter).faultTolerant()
.skipPolicy(new AlwaysSkipItemSkipPolicy()).build();
// When
StepExecution stepExecution = execute(step);