From 08c4cb16b854b773f974eeb2073a04c56a0eb6ab Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Fri, 23 May 2025 16:42:07 +0200 Subject: [PATCH] Move core partitioning APIs under org.springframework.batch.core.partition Resolves #4849 --- .../core/configuration/xml/StepParserStepFactoryBean.java | 5 ++--- .../partition/{support => }/PartitionNameProvider.java | 7 +++++-- .../batch/core/partition/{support => }/PartitionStep.java | 7 +++---- .../batch/core/partition/{support => }/Partitioner.java | 5 +++-- .../partition/{support => }/StepExecutionAggregator.java | 7 ++++--- .../partition/support/DefaultStepExecutionAggregator.java | 1 + .../core/partition/support/MultiResourcePartitioner.java | 1 + .../partition/support/RemoteStepExecutionAggregator.java | 1 + .../batch/core/partition/support/SimplePartitioner.java | 1 + .../partition/support/SimpleStepExecutionSplitter.java | 2 ++ .../batch/core/step/builder/PartitionStepBuilder.java | 6 +++--- .../batch/core/step/builder/StepBuilder.java | 2 +- .../batch/core/configuration/xml/spring-batch.xsd | 4 ++-- .../core/configuration/xml/PartitionStepParserTests.java | 6 +++--- .../configuration/xml/StepParserStepFactoryBeanTests.java | 2 +- .../core/partition/{support => }/PartitionStepTests.java | 7 +++++-- .../support/DefaultStepExecutionAggregatorTests.java | 3 ++- .../support/SimpleStepExecutionSplitterTests.java | 4 +++- .../batch/core/partition/launch-context.xml | 2 +- .../partition/RemotePartitioningManagerStepBuilder.java | 4 ++-- .../partition/RemotePartitioningWorkerStepBuilder.java | 2 +- .../RemotePartitioningManagerStepBuilderTests.java | 6 +++--- .../batch/samples/common/ColumnRangePartitioner.java | 4 ++-- ...rationForRunningPartitionedStepsWithVirtualThreads.java | 4 ++-- 24 files changed, 54 insertions(+), 39 deletions(-) rename spring-batch-core/src/main/java/org/springframework/batch/core/partition/{support => }/PartitionNameProvider.java (87%) rename spring-batch-core/src/main/java/org/springframework/batch/core/partition/{support => }/PartitionStep.java (94%) rename spring-batch-core/src/main/java/org/springframework/batch/core/partition/{support => }/Partitioner.java (91%) rename spring-batch-core/src/main/java/org/springframework/batch/core/partition/{support => }/StepExecutionAggregator.java (83%) rename spring-batch-core/src/test/java/org/springframework/batch/core/partition/{support => }/PartitionStepTests.java (95%) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java index 187bda9a3..3b0009292 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java @@ -35,8 +35,8 @@ import org.springframework.batch.core.StepListener; import org.springframework.batch.core.job.flow.Flow; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.partition.PartitionHandler; -import org.springframework.batch.core.partition.support.Partitioner; -import org.springframework.batch.core.partition.support.StepExecutionAggregator; +import org.springframework.batch.core.partition.Partitioner; +import org.springframework.batch.core.partition.StepExecutionAggregator; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.AbstractStep; import org.springframework.batch.core.step.builder.AbstractTaskletStepBuilder; @@ -61,7 +61,6 @@ import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.repeat.CompletionPolicy; import org.springframework.batch.repeat.policy.SimpleCompletionPolicy; -import org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.FactoryBean; import org.springframework.classify.BinaryExceptionClassifier; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionNameProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionNameProvider.java similarity index 87% rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionNameProvider.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionNameProvider.java index 6198b3a1d..745111eb5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionNameProvider.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionNameProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009 the original author or authors. + * Copyright 2006-2025 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. @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.springframework.batch.core.partition.support; +package org.springframework.batch.core.partition; + +import org.springframework.batch.core.partition.support.SimplePartitioner; import java.util.Collection; @@ -33,6 +35,7 @@ import java.util.Collection; *

* * @author Dave Syer + * @author Mahmoud Ben Hassine * @since 2.1.3 * */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionStep.java similarity index 94% rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionStep.java index 2b84033c8..14785ff33 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/PartitionStep.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2022 the original author or authors. + * Copyright 2006-2025 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. @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.core.partition.support; +package org.springframework.batch.core.partition; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecutionException; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; -import org.springframework.batch.core.partition.PartitionHandler; -import org.springframework.batch.core.partition.StepExecutionSplitter; +import org.springframework.batch.core.partition.support.DefaultStepExecutionAggregator; import org.springframework.batch.core.step.AbstractStep; import org.springframework.batch.item.ExecutionContext; import org.springframework.util.Assert; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/Partitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/Partitioner.java similarity index 91% rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/Partitioner.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/Partitioner.java index 2df66d1ad..5943450de 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/Partitioner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/Partitioner.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2022 the original author or authors. + * Copyright 2006-2025 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.partition.support; +package org.springframework.batch.core.partition; import java.util.Map; @@ -28,6 +28,7 @@ import org.springframework.batch.item.ExecutionContext; * * @author Dave Syer * @author Taeik Lim + * @author Mahmoud Ben Hassine * @since 2.0 */ @FunctionalInterface diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/StepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionAggregator.java similarity index 83% rename from spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/StepExecutionAggregator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionAggregator.java index bffa64ade..722e3f9dc 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/StepExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/StepExecutionAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2022 the original author or authors. + * Copyright 2008-2025 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. @@ -13,18 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.partition.support; +package org.springframework.batch.core.partition; import java.util.Collection; import org.springframework.batch.core.StepExecution; /** - * Strategy for a aggregating step executions, usually when they are the result of + * Strategy for aggregating step executions, usually when they are the result of * partitioned or remote execution. * * @author Dave Syer * @author Taeik Lim + * @author Mahmoud Ben Hassine * @since 2.1 * */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java index 27ba91b01..682489931 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java @@ -19,6 +19,7 @@ package org.springframework.batch.core.partition.support; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.partition.StepExecutionAggregator; import org.springframework.util.Assert; import java.util.Collection; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java index 32cfe6f06..6ed5de1c3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.item.ExecutionContext; import org.springframework.core.io.Resource; import org.springframework.util.Assert; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java index 5f8bc62f8..aa0d91399 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.partition.StepExecutionAggregator; import org.springframework.batch.core.repository.explore.JobExplorer; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java index de0b44f7b..6f7230225 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java @@ -19,6 +19,7 @@ package org.springframework.batch.core.partition.support; import java.util.HashMap; import java.util.Map; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.item.ExecutionContext; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java index 699e95fc1..28f6afcfd 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java @@ -29,6 +29,8 @@ import org.springframework.batch.core.JobExecutionException; import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.partition.PartitionNameProvider; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.core.partition.StepExecutionSplitter; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.item.ExecutionContext; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java index cd4ffa0cb..f39bb6076 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java @@ -18,10 +18,10 @@ package org.springframework.batch.core.step.builder; import org.springframework.batch.core.Step; import org.springframework.batch.core.partition.PartitionHandler; import org.springframework.batch.core.partition.StepExecutionSplitter; -import org.springframework.batch.core.partition.support.PartitionStep; -import org.springframework.batch.core.partition.support.Partitioner; +import org.springframework.batch.core.partition.PartitionStep; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.core.partition.support.SimpleStepExecutionSplitter; -import org.springframework.batch.core.partition.support.StepExecutionAggregator; +import org.springframework.batch.core.partition.StepExecutionAggregator; import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.core.task.TaskExecutor; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java index 9ae5289a2..0f8f038f8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/StepBuilder.java @@ -18,7 +18,7 @@ package org.springframework.batch.core.step.builder; 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.partition.Partitioner; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.tasklet.Tasklet; import org.springframework.batch.repeat.CompletionPolicy; diff --git a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd index 7656c4585..ca1211c2b 100644 --- a/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd +++ b/spring-batch-core/src/main/resources/org/springframework/batch/core/configuration/xml/spring-batch.xsd @@ -549,7 +549,7 @@ - + @@ -561,7 +561,7 @@ - + diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java index 263a59b70..cadf8f3d8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 the original author or authors. + * Copyright 2006-2025 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. @@ -34,8 +34,8 @@ import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.partition.PartitionHandler; import org.springframework.batch.core.partition.StepExecutionSplitter; -import org.springframework.batch.core.partition.support.PartitionStep; -import org.springframework.batch.core.partition.support.StepExecutionAggregator; +import org.springframework.batch.core.partition.PartitionStep; +import org.springframework.batch.core.partition.StepExecutionAggregator; import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.tasklet.TaskletStep; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java index 91f4963ea..da1784ffe 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java @@ -28,7 +28,7 @@ import org.springframework.batch.core.StepListener; import org.springframework.batch.core.job.flow.FlowStep; import org.springframework.batch.core.job.flow.support.SimpleFlow; import org.springframework.batch.core.partition.PartitionHandler; -import org.springframework.batch.core.partition.support.PartitionStep; +import org.springframework.batch.core.partition.PartitionStep; import org.springframework.batch.core.partition.support.SimplePartitioner; import org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler; import org.springframework.batch.core.step.JobRepositorySupport; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/PartitionStepTests.java similarity index 95% rename from spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/partition/PartitionStepTests.java index 72ca7ea76..d7cd4c74f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/PartitionStepTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2023 the original author or authors. + * Copyright 2006-2025 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.partition.support; +package org.springframework.batch.core.partition; import java.time.LocalDateTime; import java.util.Arrays; @@ -29,6 +29,9 @@ import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.partition.support.DefaultStepExecutionAggregator; +import org.springframework.batch.core.partition.support.SimplePartitioner; +import org.springframework.batch.core.partition.support.SimpleStepExecutionSplitter; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean; import org.springframework.jdbc.support.JdbcTransactionManager; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregatorTests.java index 83b422f17..879b64e05 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregatorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2022 the original author or authors. + * Copyright 2009-2025 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. @@ -20,6 +20,7 @@ import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.partition.StepExecutionAggregator; import java.util.Arrays; import java.util.Collections; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java index c7489a9c4..aea264103 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2023 the original author or authors. + * Copyright 2008-2025 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. @@ -32,6 +32,8 @@ import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.partition.PartitionNameProvider; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.JdbcJobRepositoryFactoryBean; import org.springframework.batch.core.step.tasklet.TaskletStep; diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/partition/launch-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/partition/launch-context.xml index de23f6843..a1f727863 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/partition/launch-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/partition/launch-context.xml @@ -8,7 +8,7 @@ + class="org.springframework.batch.core.partition.PartitionStep"> 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 191374d7d..3ea378b5d 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 @@ -21,8 +21,8 @@ import org.springframework.batch.core.StepExecutionListener; import org.springframework.batch.core.repository.explore.JobExplorer; import org.springframework.batch.core.partition.PartitionHandler; import org.springframework.batch.core.partition.StepExecutionSplitter; -import org.springframework.batch.core.partition.support.Partitioner; -import org.springframework.batch.core.partition.support.StepExecutionAggregator; +import org.springframework.batch.core.partition.Partitioner; +import org.springframework.batch.core.partition.StepExecutionAggregator; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.builder.PartitionStepBuilder; import org.springframework.batch.core.step.builder.StepBuilder; 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 ad044dbbf..31eaeaac9 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 @@ -24,7 +24,7 @@ import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecutionListener; import org.springframework.batch.core.repository.explore.JobExplorer; import org.springframework.batch.core.job.flow.Flow; -import org.springframework.batch.core.partition.support.Partitioner; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.StepLocator; import org.springframework.batch.core.step.builder.FlowStepBuilder; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java index 035bfedaa..4bbcf1247 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2022 the original author or authors. + * Copyright 2018-2025 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. @@ -24,8 +24,8 @@ import org.mockito.Mockito; import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.partition.PartitionHandler; -import org.springframework.batch.core.partition.support.Partitioner; -import org.springframework.batch.core.partition.support.StepExecutionAggregator; +import org.springframework.batch.core.partition.Partitioner; +import org.springframework.batch.core.partition.StepExecutionAggregator; import org.springframework.batch.core.repository.JobRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java index 0707873df..d6556e798 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2014 the original author or authors. + * Copyright 2009-2025 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. @@ -20,7 +20,7 @@ import java.util.Map; import javax.sql.DataSource; -import org.springframework.batch.core.partition.support.Partitioner; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.item.ExecutionContext; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java index be2032345..6ce9b9d60 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/loom/JobConfigurationForRunningPartitionedStepsWithVirtualThreads.java @@ -1,5 +1,5 @@ /* - * Copyright 2023 the original author or authors. + * Copyright 2023-2025 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. @@ -23,7 +23,7 @@ import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing; import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.core.job.builder.JobBuilder; -import org.springframework.batch.core.partition.support.Partitioner; +import org.springframework.batch.core.partition.Partitioner; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.step.builder.StepBuilder; import org.springframework.batch.core.step.tasklet.Tasklet;