Move core partitioning APIs under org.springframework.batch.core.partition

Resolves #4849

Author: fmbenhassine

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

@@ -35,8 +35,8 @@
 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.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;

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionNameProvider.java renamed to 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 @@
  * </p>
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * @since 2.1.3
  *
  */

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java renamed to 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;

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/Partitioner.java renamed to 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 @@
  *
  * @author Dave Syer
  * @author Taeik Lim
+ * @author Mahmoud Ben Hassine
  * @since 2.0
  */
 @FunctionalInterface

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/StepExecutionAggregator.java renamed to 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
  *
  */

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java

@@ -19,6 +19,7 @@
 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;

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java

@@ -20,6 +20,7 @@
 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;

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java

@@ -23,6 +23,7 @@
 
 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;

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java

@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.batch.core.partition.Partitioner;
 import org.springframework.batch.item.ExecutionContext;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java

@@ -29,6 +29,8 @@
 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;