From 89e0a0cd86d9072473338813d7d63d5c5a5f26b3 Mon Sep 17 00:00:00 2001 From: Henning Poettker Date: Tue, 21 Nov 2023 20:53:08 +0100 Subject: [PATCH] Deprecate overrides of StepBuilderHelper#repository for removal --- .../chunk/RemoteChunkingManagerStepBuilder.java | 9 +++++++++ .../partition/RemotePartitioningManagerStepBuilder.java | 9 +++++++++ .../partition/RemotePartitioningWorkerStepBuilder.java | 9 +++++++++ .../chunk/RemoteChunkingManagerStepBuilderTests.java | 1 - 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java index 6d2f8ef25..9629eb237 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java @@ -227,7 +227,16 @@ public class RemoteChunkingManagerStepBuilder extends FaultTolerantStepBui return this; } + /** + * Set the job repository + * @param jobRepository the repository to set + * @return this to enable fluent chaining + * @deprecated use + * {@link RemoteChunkingManagerStepBuilder#RemoteChunkingManagerStepBuilder(String, JobRepository)} + */ @Override + @SuppressWarnings("removal") + @Deprecated(since = "5.1", forRemoval = true) public RemoteChunkingManagerStepBuilder repository(JobRepository jobRepository) { super.repository(jobRepository); return this; diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java index 089f3eee8..9f1e95187 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java @@ -242,7 +242,16 @@ public class RemotePartitioningManagerStepBuilder extends PartitionStepBuilder { return this.inputChannel == null; } + /** + * Set the job repository + * @param jobRepository the repository to set + * @return this to enable fluent chaining + * @deprecated use + * {@link RemotePartitioningManagerStepBuilder#RemotePartitioningManagerStepBuilder(String, JobRepository)} + */ @Override + @SuppressWarnings("removal") + @Deprecated(since = "5.1", forRemoval = true) public RemotePartitioningManagerStepBuilder repository(JobRepository jobRepository) { super.repository(jobRepository); return this; diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java index 0b8e88967..16fda8232 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java @@ -157,7 +157,16 @@ public class RemotePartitioningWorkerStepBuilder extends StepBuilder { return this; } + /** + * Set the job repository + * @param jobRepository the repository to set + * @return this to enable fluent chaining + * @deprecated use + * {@link RemotePartitioningWorkerStepBuilder#RemotePartitioningWorkerStepBuilder(String, JobRepository)} + */ @Override + @SuppressWarnings("removal") + @Deprecated(since = "5.1", forRemoval = true) public RemotePartitioningWorkerStepBuilder repository(JobRepository jobRepository) { super.repository(jobRepository); return this; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java index 097083fa8..bb531b8f2 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java @@ -190,7 +190,6 @@ class RemoteChunkingManagerStepBuilderTests { .reader(this.itemReader) .writer(items -> { }) - .repository(this.jobRepository) .transactionManager(this.transactionManager) .inputChannel(this.inputChannel) .outputChannel(this.outputChannel)