diff --git a/spring-batch-docs/modules/ROOT/pages/common-patterns.adoc b/spring-batch-docs/modules/ROOT/pages/common-patterns.adoc index 130eb779c..d5442d1dd 100644 --- a/spring-batch-docs/modules/ROOT/pages/common-patterns.adoc +++ b/spring-batch-docs/modules/ROOT/pages/common-patterns.adoc @@ -756,10 +756,10 @@ The following example shows how to promote a step to the `Job` `ExecutionContext [source, java] ---- @Bean -public Job job1(JobRepository jobRepository) { +public Job job1(JobRepository jobRepository, Step step1, Step step2) { return new JobBuilder("job1", jobRepository) - .start(step1()) - .next(step1()) + .start(step1) + .next(step2) .build(); } diff --git a/spring-batch-docs/modules/ROOT/pages/processor.adoc b/spring-batch-docs/modules/ROOT/pages/processor.adoc index c4aa0635f..02993846d 100644 --- a/spring-batch-docs/modules/ROOT/pages/processor.adoc +++ b/spring-batch-docs/modules/ROOT/pages/processor.adoc @@ -92,9 +92,9 @@ Java:: [source, java] ---- @Bean -public Job ioSampleJob(JobRepository jobRepository) { +public Job ioSampleJob(JobRepository jobRepository, Step step1) { return new JobBuilder("ioSampleJob", jobRepository) - .start(step1()) + .start(step1) .build(); } @@ -196,9 +196,9 @@ Java:: [source, java] ---- @Bean -public Job ioSampleJob(JobRepository jobRepository) { +public Job ioSampleJob(JobRepository jobRepository, Step step1) { return new JobBuilder("ioSampleJob", jobRepository) - .start(step1()) + .start(step1) .build(); } diff --git a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/delegate-pattern-registering.adoc b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/delegate-pattern-registering.adoc index ea69b8af8..c89e4f249 100644 --- a/spring-batch-docs/modules/ROOT/pages/readers-and-writers/delegate-pattern-registering.adoc +++ b/spring-batch-docs/modules/ROOT/pages/readers-and-writers/delegate-pattern-registering.adoc @@ -21,9 +21,9 @@ The following example shows how to inject a delegate as a stream in Java: [source, java] ---- @Bean -public Job ioSampleJob(JobRepository jobRepository) { +public Job ioSampleJob(JobRepository jobRepository, Step step1) { return new JobBuilder("ioSampleJob", jobRepository) - .start(step1()) + .start(step1) .build(); } diff --git a/spring-batch-docs/modules/ROOT/pages/scalability.adoc b/spring-batch-docs/modules/ROOT/pages/scalability.adoc index c08c5dafb..5836fddf5 100644 --- a/spring-batch-docs/modules/ROOT/pages/scalability.adoc +++ b/spring-batch-docs/modules/ROOT/pages/scalability.adoc @@ -426,8 +426,8 @@ as follows: [source, java] ---- @Bean -public Step step1Manager() { - return stepBuilderFactory.get("step1.manager") +public Step step1Manager(JobRepository jobRepository) { + return new StepBuilder("step1.manager", jobRepository) .partitioner("step1", partitioner()) .partitionHandler(partitionHandler()) .build(); diff --git a/spring-batch-docs/modules/ROOT/pages/spring-batch-integration/sub-elements.adoc b/spring-batch-docs/modules/ROOT/pages/spring-batch-integration/sub-elements.adoc index d4ee6bcc9..eac14f4e7 100644 --- a/spring-batch-docs/modules/ROOT/pages/spring-batch-integration/sub-elements.adoc +++ b/spring-batch-docs/modules/ROOT/pages/spring-batch-integration/sub-elements.adoc @@ -140,13 +140,15 @@ The following example shows the how to add a step-level listener in Java: .Java Configuration [source, java] ---- -public Job importPaymentsJob(JobRepository jobRepository) { +public Job importPaymentsJob(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("importPayments", jobRepository) - .start(stepBuilderFactory.get("step1") - .chunk(200) + .start(new StepBuilder("step1", jobRepository) + .chunk(200, transactionManager) .listener(notificationExecutionsListener()) - ... + // ... + .build(); ) + .build(); } ---- @@ -320,10 +322,10 @@ following in Java: .Java Configuration [source, java] ---- -public Job chunkJob(JobRepository jobRepository) { +public Job chunkJob(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("personJob", jobRepository) - .start(stepBuilderFactory.get("step1") - .chunk(200) + .start(new StepBuilder("step1", jobRepository) + .chunk(200, transactionManager) .reader(itemReader()) .writer(itemWriter()) .build()) @@ -915,7 +917,7 @@ Java: ---- public Job personJob(JobRepository jobRepository) { return new JobBuilder("personJob", jobRepository) - .start(stepBuilderFactory.get("step1.manager") + .start(new StepBuilder("step1.manager", jobRepository) .partitioner("step1.worker", partitioner()) .partitionHandler(partitionHandler()) .build()) diff --git a/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/commit-interval.adoc b/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/commit-interval.adoc index 5edc96343..60528a2c2 100644 --- a/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/commit-interval.adoc +++ b/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/commit-interval.adoc @@ -20,9 +20,9 @@ value of 10 as it would be defined in Java: [source, java] ---- @Bean -public Job sampleJob(JobRepository jobRepository) { +public Job sampleJob(JobRepository jobRepository, Step step1) { return new JobBuilder("sampleJob", jobRepository) - .start(step1()) + .start(step1) .build(); } diff --git a/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/restart.adoc b/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/restart.adoc index 90402cc81..8f4af6f71 100644 --- a/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/restart.adoc +++ b/spring-batch-docs/modules/ROOT/pages/step/chunk-oriented-processing/restart.adoc @@ -121,11 +121,11 @@ restarted: [source, java] ---- @Bean -public Job footballJob(JobRepository jobRepository) { +public Job footballJob(JobRepository jobRepository, Step playerLoad, Step gameLoad, Step playerSummarization) { return new JobBuilder("footballJob", jobRepository) - .start(playerLoad()) - .next(gameLoad()) - .next(playerSummarization()) + .start(playerLoad) + .next(gameLoad) + .next(playerSummarization) .build(); } diff --git a/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc b/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc index 006d521f1..2613e3487 100644 --- a/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc +++ b/spring-batch-docs/modules/ROOT/pages/step/tasklet.adoc @@ -160,9 +160,9 @@ The following example shows how to reference the `tasklet` from the `step` in Ja [source, java] ---- @Bean -public Job taskletJob(JobRepository jobRepository) { +public Job taskletJob(JobRepository jobRepository, Step deleteFilesInDir) { return new JobBuilder("taskletJob", jobRepository) - .start(deleteFilesInDir()) + .start(deleteFilesInDir) .build(); }