Move job and step APIs in their dedicated packages

Resolves #4877

spring-batch-core/src/main/java/org/springframework/batch/core/annotation/AfterJob.java

@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.listener.JobExecutionListener;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/annotation/AfterStep.java

@@ -22,8 +22,8 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.listener.StepExecutionListener;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/annotation/BeforeJob.java

@@ -21,10 +21,10 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.listener.JobExecutionListener;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 import org.springframework.beans.factory.annotation.Qualifier;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/annotation/BeforeStep.java

@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.listener.StepExecutionListener;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/aot/CoreRuntimeHints.java

@@ -51,12 +51,12 @@ import org.springframework.aot.hint.SerializationHints;
 import org.springframework.aot.hint.TypeReference;
 import org.springframework.batch.core.Entity;
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.StepContribution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.scope.context.JobContext;
 import org.springframework.batch.core.scope.context.StepContext;
 import org.springframework.batch.item.Chunk;

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

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.configuration;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Checked exception that indicates a name clash when registering {@link Job} instances.

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.configuration;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 
 /**
  * Strategy for creating a single job.

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.configuration;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.launch.NoSuchJobException;
 import org.springframework.lang.Nullable;
 

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

@@ -17,7 +17,7 @@ package org.springframework.batch.core.configuration;
 
 import java.util.Collection;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.launch.NoSuchJobException;
 
 /**

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

@@ -15,15 +15,15 @@
  */
 package org.springframework.batch.core.configuration;
 
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.launch.NoSuchJobException;
 import org.springframework.batch.core.step.NoSuchStepException;
 
 import java.util.Collection;
 
 /**
- * Registry keeping track of all the {@link Step} instances defined in a
- * {@link org.springframework.batch.core.Job}.
+ * Registry keeping track of all the {@link Step} instances defined in a {@link Job}.
  *
  * @author Sebastien Gerard
  * @author Stephane Nicoll

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextFactory.java

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.core.configuration.support;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.configuration.support;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.configuration.JobFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/AutomaticJobRegistrar.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.configuration.DuplicateJobException;
 import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.beans.factory.InitializingBean;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.batch.core.configuration.support;
 
-import org.springframework.batch.core.DefaultJobKeyGenerator;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobKeyGenerator;
+import org.springframework.batch.core.job.DefaultJobKeyGenerator;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.JobKeyGenerator;
 import org.springframework.batch.core.configuration.BatchConfigurationException;
 import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.converter.DefaultJobParametersConverter;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java

@@ -24,8 +24,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.configuration.DuplicateJobException;
 import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.configuration.StepRegistry;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java

@@ -15,10 +15,10 @@
  */
 package org.springframework.batch.core.configuration.support;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
@@ -74,7 +74,7 @@ public class GroupAwareJob implements Job {
 	/**
 	 * Concatenates the group name and the delegate job name (joining with a ".").
 	 *
-	 * @see org.springframework.batch.core.Job#getName()
+	 * @see Job#getName()
 	 */
 	@Override
 	public String getName() {

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobLoader.java

@@ -17,7 +17,7 @@ package org.springframework.batch.core.configuration.support;
 
 import java.util.Collection;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.configuration.DuplicateJobException;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistrySmartInitializingSingleton.java

@@ -21,7 +21,7 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.configuration.DuplicateJobException;
 import org.springframework.batch.core.configuration.JobLocator;
 import org.springframework.batch.core.configuration.JobRegistry;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java

@@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.configuration.DuplicateJobException;
 import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.launch.NoSuchJobException;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java

@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.configuration.DuplicateJobException;
 import org.springframework.batch.core.configuration.StepRegistry;
 import org.springframework.batch.core.launch.NoSuchJobException;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.configuration.support;
 
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.configuration.JobFactory;
 
 /**

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

@@ -20,6 +20,7 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import org.springframework.batch.core.listener.StepListenerMetaData;
+import org.springframework.batch.core.step.Step;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -35,9 +36,9 @@ import org.springframework.util.xml.DomUtils;
 
 /**
  * Internal parser for the <step/> elements inside a job. A step element references
- * a bean definition for a {@link org.springframework.batch.core.Step} and goes on to
- * (optionally) list a set of transitions from that step to others with <next
- * on="pattern" to="stepName"/>. Used by the {@link JobParser}.
+ * a bean definition for a {@link Step} and goes on to (optionally) list a set of
+ * transitions from that step to others with <next on="pattern" to="stepName"/>.
+ * Used by the {@link JobParser}.
  *
  * @author Dave Syer
  * @author Thomas Risberg

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

@@ -18,6 +18,7 @@ package org.springframework.batch.core.configuration.xml;
 import java.util.Collection;
 
 import org.springframework.batch.core.job.flow.support.state.StepState;
+import org.springframework.batch.core.step.Step;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
@@ -27,9 +28,9 @@ import org.w3c.dom.Element;
 
 /**
  * Internal parser for the <step/> elements inside a job. A step element references
- * a bean definition for a {@link org.springframework.batch.core.Step} and goes on to
- * (optionally) list a set of transitions from that step to others with <next
- * on="pattern" to="stepName"/>. Used by the {@link JobParser}.
+ * a bean definition for a {@link Step} and goes on to (optionally) list a set of
+ * transitions from that step to others with <next on="pattern" to="stepName"/>.
+ * Used by the {@link JobParser}.
  *
  * @see JobParser
  * @author Dave Syer

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

@@ -18,6 +18,7 @@ package org.springframework.batch.core.configuration.xml;
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.batch.core.job.Job;
 import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -33,7 +34,7 @@ import org.w3c.dom.Element;
 
 /**
  * Parser for the <job/> element in the Batch namespace. Sets up and returns a bean
- * definition for a {@link org.springframework.batch.core.Job}.
+ * definition for a {@link Job}.
  *
  * @author Dave Syer
  * @author Mahmoud Ben Hassine

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

@@ -16,8 +16,8 @@
 package org.springframework.batch.core.configuration.xml;
 
 import org.springframework.batch.core.listener.JobExecutionListener;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
 import org.springframework.batch.core.job.flow.Flow;
 import org.springframework.batch.core.job.flow.FlowJob;
 import org.springframework.batch.core.repository.JobRepository;

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

@@ -15,13 +15,14 @@
  */
 package org.springframework.batch.core.configuration.xml;
 
+import org.springframework.batch.core.step.Step;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
 /**
  * Internal parser for the <step/> elements for a job. A step element references a
- * bean definition for a {@link org.springframework.batch.core.Step}.
+ * bean definition for a {@link Step}.
  *
  * @author Dave Syer
  * @author Thomas Risberg

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

@@ -27,9 +27,9 @@ import org.springframework.batch.core.listener.ChunkListener;
 import org.springframework.batch.core.listener.ItemProcessListener;
 import org.springframework.batch.core.listener.ItemReadListener;
 import org.springframework.batch.core.listener.ItemWriteListener;
-import org.springframework.batch.core.Job;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.listener.SkipListener;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.listener.StepExecutionListener;
 import org.springframework.batch.core.listener.StepListener;
 import org.springframework.batch.core.job.flow.Flow;

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.batch.core.configuration.xml;
 
+import org.springframework.batch.core.step.Step;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -22,7 +23,7 @@ import org.w3c.dom.Element;
 
 /**
  * Parser for the <step/> top level element in the Batch namespace. Sets up and
- * returns a bean definition for a {@link org.springframework.batch.core.Step}.
+ * returns a bean definition for a {@link Step}.
  *
  * @author Thomas Risberg
  *

spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java

@@ -19,9 +19,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.lang.NonNull;
@@ -108,7 +108,7 @@ public class DefaultJobParametersConverter implements JobParametersConverter {
 	}
 
 	/**
-	 * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters)
+	 * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(JobParameters)
 	 */
 	@Override
 	public Properties getProperties(@Nullable JobParameters jobParameters) {

spring-batch-core/src/main/java/org/springframework/batch/core/converter/JobParametersConverter.java

@@ -18,8 +18,8 @@ package org.springframework.batch.core.converter;
 
 import java.util.Properties;
 
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java

@@ -18,8 +18,8 @@ package org.springframework.batch.core.converter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
 
 /**
  * Converter for {@link JobParameters} instances that uses a JSON naming convention for

spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java

@@ -32,17 +32,13 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
 import org.springframework.batch.core.listener.JobExecutionListener;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
 import org.springframework.batch.core.SpringBatchVersion;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.launch.NoSuchJobException;
 import org.springframework.batch.core.launch.support.ExitCodeMapper;
 import org.springframework.batch.core.listener.CompositeJobExecutionListener;

spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobKeyGenerator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -21,6 +21,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.util.Assert;
 import org.springframework.util.DigestUtils;
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/Job.java

@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
-import org.springframework.batch.core.job.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.DefaultJobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecution.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -28,6 +28,9 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.springframework.batch.core.*;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.lang.Nullable;
 
@@ -302,11 +305,10 @@ public class JobExecution extends Entity {
 	}
 
 	/**
-	 * Package-private method for re-constituting the step executions from existing
-	 * instances.
+	 * Add a step execution from an existing instance.
 	 * @param stepExecution The {@code stepExecution} execution to be added.
 	 */
-	void addStepExecution(StepExecution stepExecution) {
+	public void addStepExecution(StepExecution stepExecution) {
 		stepExecutions.add(stepExecution);
 	}
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/JobExecutionException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
 /**
  * Root of exception hierarchy for checked exceptions in job and step execution. Clients

spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInstance.java

@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
+import org.springframework.batch.core.Entity;
+import org.springframework.batch.core.job.parameters.JobParameters;
 import org.springframework.util.Assert;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/job/JobInterruptedException.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
+
+import org.springframework.batch.core.BatchStatus;
 
 /**
  * Exception to indicate the job has been interrupted. The exception state indicated is

spring-batch-core/src/main/java/org/springframework/batch/core/job/JobKeyGenerator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
 /**
  * Strategy interface for the generation of the key used in identifying unique

spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java

@@ -21,12 +21,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.repository.JobRestartException;
 import org.springframework.batch.core.step.StepLocator;
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java

@@ -19,12 +19,8 @@ package org.springframework.batch.core.job;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.JobRestartException;
 import org.springframework.batch.item.ExecutionContext;
@@ -179,8 +175,7 @@ public class SimpleStepHandler implements StepHandler, InitializingBean {
 	 * Detect whether a step execution belongs to this job execution.
 	 * @param jobExecution the current job execution
 	 * @param stepExecution an existing step execution
-	 * @return true if the {@link org.springframework.batch.core.StepExecution} is part of
-	 * the {@link org.springframework.batch.core.JobExecution}
+	 * @return true if the {@link StepExecution} is part of the {@link JobExecution}
 	 */
 	private boolean stepExecutionPartOfExistingJobExecution(JobExecution jobExecution, StepExecution stepExecution) {
 		return stepExecution != null && stepExecution.getJobExecutionId() != null

spring-batch-core/src/main/java/org/springframework/batch/core/job/StartLimitExceededException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
 /**
  * Indicates the step's start limit has been exceeded.

spring-batch-core/src/main/java/org/springframework/batch/core/job/StepHandler.java

@@ -16,12 +16,8 @@
 
 package org.springframework.batch.core.job;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.repository.JobRestartException;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/job/UnexpectedJobExecutionException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job;
 
 /**
  * Indicates to the framework that a critical error has occurred and processing should

spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java

@@ -25,7 +25,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.flow.Flow;
 import org.springframework.batch.core.job.flow.FlowExecutionStatus;
 import org.springframework.batch.core.job.flow.JobExecutionDecider;

spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowJobBuilder.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.job.builder;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.flow.Flow;
 import org.springframework.batch.core.job.flow.FlowJob;
 import org.springframework.batch.core.job.flow.JobExecutionDecider;

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

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.job.builder;
 
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.flow.Flow;
 import org.springframework.batch.core.job.flow.JobExecutionDecider;
 import org.springframework.batch.core.repository.JobRepository;

spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobBuilderHelper.java

@@ -28,8 +28,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.batch.core.listener.JobExecutionListener;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersValidator;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersValidator;
 import org.springframework.batch.core.annotation.AfterJob;
 import org.springframework.batch.core.annotation.BeforeJob;
 import org.springframework.batch.core.job.AbstractJob;

spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.job.builder;
 
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.flow.Flow;
 import org.springframework.batch.core.job.flow.JobExecutionDecider;
 import org.springframework.beans.factory.InitializingBean;

spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/SimpleJobBuilder.java

@@ -18,8 +18,8 @@ package org.springframework.batch.core.job.builder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.SimpleJob;
 import org.springframework.batch.core.job.flow.JobExecutionDecider;
 import org.springframework.core.task.TaskExecutor;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutor.java

@@ -15,11 +15,11 @@
  */
 package org.springframework.batch.core.job.flow;
 
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.StartLimitExceededException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.repository.JobRestartException;
 import org.springframework.lang.Nullable;
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java

@@ -19,10 +19,10 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.AbstractJob;
 import org.springframework.batch.core.job.SimpleStepHandler;
 import org.springframework.batch.core.step.StepHolder;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowStep.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.batch.core.job.flow;
 
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.job.SimpleStepHandler;
 import org.springframework.batch.core.job.StepHandler;
 import org.springframework.batch.core.repository.JobRepository;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.job.flow;
 
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java

@@ -18,11 +18,11 @@ package org.springframework.batch.core.job.flow;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInterruptedException;
-import org.springframework.batch.core.StartLimitExceededException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInterruptedException;
+import org.springframework.batch.core.job.StartLimitExceededException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.job.StepHandler;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.JobRestartException;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java

@@ -29,8 +29,8 @@ import java.util.TreeSet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.job.flow.Flow;
 import org.springframework.batch.core.job.flow.FlowExecution;
 import org.springframework.batch.core.job.flow.FlowExecutionException;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java

@@ -17,7 +17,7 @@
 package org.springframework.batch.core.job.flow.support.state;
 
 import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.job.flow.FlowExecutionStatus;
 import org.springframework.batch.core.job.flow.FlowExecutor;
 import org.springframework.batch.core.job.flow.State;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java

@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.job.flow.FlowExecutionStatus;
 import org.springframework.batch.core.job.flow.FlowExecutor;
 import org.springframework.batch.core.job.flow.State;

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/CompositeJobParametersValidator.java

@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.job;
+package org.springframework.batch.core.job.parameters;
 
 import java.util.List;
 
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.JobParametersValidator;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/DefaultJobParametersValidator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.job;
+package org.springframework.batch.core.job.parameters;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,9 +23,6 @@ import java.util.Set;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.JobParametersValidator;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
 
 import java.io.Serializable;
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParameters.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
 
 import java.io.Serializable;
 import java.time.LocalDate;

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -23,6 +23,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
 import org.springframework.batch.core.repository.explore.JobExplorer;
 import org.springframework.lang.NonNull;
 import org.springframework.util.Assert;

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersIncrementer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
 
 import org.springframework.lang.Nullable;
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersInvalidException.java

@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
+
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Exception for {@link Job} to signal that some {@link JobParameters} are invalid.

spring-batch-core/src/main/java/org/springframework/batch/core/job/parameters/JobParametersValidator.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core;
+package org.springframework.batch.core.job.parameters;
 
+import org.springframework.batch.core.job.Job;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotFailedException.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Checked exception to indicate that user asked for a job execution to be resumed when

spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotRunningException.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Checked exception indicating that a JobExecution that is not currently running has been

spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobExecutionNotStoppedException.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Checked exception to indicate that user asked for a job execution to be aborted when

spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsException.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Checked exception to indicate that a required {@link Job} is not available.

spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobLauncher.java

@@ -15,10 +15,10 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
 import org.springframework.batch.core.repository.JobRestartException;
@@ -34,8 +34,8 @@ import org.springframework.batch.core.repository.JobRestartException;
  * @author Dave Syer
  * @author Taeik Lim
  * @author Mahmoud Ben Hassine
- *
- * @deprecated since 6.0 in favor of {@link JobOperator}. Scheduled for removal in 6.2 or later.
+ * @deprecated since 6.0 in favor of {@link JobOperator}. Scheduled for removal in 6.2 or
+ * later.
  */
 @FunctionalInterface
 @Deprecated(since = "6.0", forRemoval = true)

spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobOperator.java

@@ -20,14 +20,14 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersIncrementer;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
 import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
 import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;

spring-batch-core/src/main/java/org/springframework/batch/core/launch/JobParametersNotFoundException.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
 
 /**
  * Checked exception to indicate that a required {@link JobParametersIncrementer} is not

spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobException.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Checked exception to indicate that a required {@link Job} is not available.

spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobExecutionException.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobExecutionException;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobExecutionException;
 
 /**
  * Checked exception to indicate that a required {@link JobExecution} is not available.

spring-batch-core/src/main/java/org/springframework/batch/core/launch/NoSuchJobInstanceException.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.launch;
 
-import org.springframework.batch.core.JobExecutionException;
-import org.springframework.batch.core.JobInstance;
+import org.springframework.batch.core.job.JobExecutionException;
+import org.springframework.batch.core.job.JobInstance;
 
 /**
  * Exception that signals that the user requested an operation on a non-existent

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/CommandLineJobRunner.java

@@ -31,12 +31,12 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
 import org.springframework.batch.core.configuration.JobLocator;
 import org.springframework.batch.core.configuration.JobRegistry;
 import org.springframework.batch.core.converter.DefaultJobParametersConverter;
@@ -169,7 +169,6 @@ import org.springframework.util.StringUtils;
  * @author Mahmoud Ben Hassine
  * @author Minsoo Kim
  * @since 1.0
- *
  * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
  */
 @Deprecated(since = "6.0", forRemoval = true)

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java

@@ -15,9 +15,9 @@
  */
 package org.springframework.batch.core.launch.support;
 
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java

@@ -23,7 +23,6 @@ package org.springframework.batch.core.launch.support;
  *
  * @author Lucas Ward
  * @author Dave Syer
- *
  * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
  */
 @Deprecated(since = "6.0", forRemoval = true)

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java

@@ -15,10 +15,10 @@
  */
 package org.springframework.batch.core.launch.support;
 
-import org.springframework.batch.core.JobParameter;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.job.parameters.JobParameter;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersIncrementer;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java

@@ -21,7 +21,6 @@ import org.aopalliance.intercept.MethodInvocation;
 /**
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
- *
  * @deprecated since 6.0 with no replacement, for removal in 6.2 or later.
  */
 @Deprecated(since = "6.0", forRemoval = true)

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java

@@ -29,17 +29,16 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.batch.core.BatchStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.UnexpectedJobExecutionException;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersBuilder;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
+import org.springframework.batch.core.job.UnexpectedJobExecutionException;
 import org.springframework.batch.core.configuration.JobRegistry;
-import org.springframework.batch.core.configuration.ListableJobLocator;
 import org.springframework.batch.core.converter.DefaultJobParametersConverter;
 import org.springframework.batch.core.converter.JobParametersConverter;
 import org.springframework.batch.core.launch.JobExecutionNotRunningException;

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SystemExiter.java

@@ -21,7 +21,6 @@ package org.springframework.batch.core.launch.support;
  * unit test would cause the entire jvm to finish.
  *
  * @author Lucas Ward
- *
  * @deprecated since 6.0 with no replacement. Scheduled for removal in 6.2 or later.
  */
 @Deprecated(since = "6.0", forRemoval = true)

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java

@@ -25,12 +25,12 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.core.JobInstance;
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.JobParametersInvalidException;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
+import org.springframework.batch.core.job.JobInstance;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.job.parameters.JobParametersInvalidException;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.batch.core.observability.BatchMetrics;
 import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
@@ -65,8 +65,8 @@ import org.springframework.util.Assert;
  * @since 1.0
  * @see JobRepository
  * @see TaskExecutor
- *
- * @deprecated since 6.0 in favor of {@link TaskExecutorJobOperator}. Scheduled for removal in 6.2 or later.
+ * @deprecated since 6.0 in favor of {@link TaskExecutorJobOperator}. Scheduled for
+ * removal in 6.2 or later.
  */
 @Deprecated(since = "6.0", forRemoval = true)
 public class TaskExecutorJobLauncher implements JobLauncher, InitializingBean {

spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java

@@ -18,7 +18,7 @@ package org.springframework.batch.core.listener;
 import java.util.Iterator;
 import java.util.List;
 
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
 import org.springframework.core.Ordered;
 
 /**
@@ -50,7 +50,7 @@ public class CompositeJobExecutionListener implements JobExecutionListener {
 	/**
 	 * Call the registered listeners in reverse order, respecting and prioritising those
 	 * that implement {@link Ordered}.
-	 * @see JobExecutionListener#afterJob(org.springframework.batch.core.JobExecution)
+	 * @see JobExecutionListener#afterJob(JobExecution)
 	 */
 	@Override
 	public void afterJob(JobExecution jobExecution) {
@@ -63,7 +63,7 @@ public class CompositeJobExecutionListener implements JobExecutionListener {
 	/**
 	 * Call the registered listeners in order, respecting and prioritising those that
 	 * implement {@link Ordered}.
-	 * @see JobExecutionListener#beforeJob(org.springframework.batch.core.JobExecution)
+	 * @see JobExecutionListener#beforeJob(JobExecution)
 	 */
 	@Override
 	public void beforeJob(JobExecution jobExecution) {

spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java

@@ -19,7 +19,7 @@ import java.util.Arrays;
 import java.util.Iterator;
 
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.core.Ordered;
 import org.springframework.lang.Nullable;
 

spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java

@@ -16,9 +16,9 @@
 package org.springframework.batch.core.listener;
 
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.support.PatternMatcher;
 import org.springframework.beans.factory.InitializingBean;

spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListener.java

@@ -15,8 +15,8 @@
  */
 package org.springframework.batch.core.listener;
 
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.Job;
+import org.springframework.batch.core.job.JobExecution;
 
 /**
  * Provide callbacks at specific points in the lifecycle of a {@link Job}. Implementations

spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java

@@ -19,7 +19,7 @@ import java.lang.annotation.Annotation;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
 import org.springframework.batch.core.annotation.AfterJob;
 import org.springframework.batch.core.annotation.BeforeJob;
 import org.springframework.lang.Nullable;

spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobParameterExecutionContextCopyListener.java

@@ -18,9 +18,9 @@ package org.springframework.batch.core.listener;
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.springframework.batch.core.JobParameters;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.job.parameters.JobParameters;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.item.ExecutionContext;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java

@@ -21,6 +21,7 @@ import java.util.Set;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.batch.core.ExitStatus;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.support.MethodInvoker;
 
 /**
@@ -28,8 +29,7 @@ import org.springframework.batch.support.MethodInvoker;
  * will execute all methods tied to a particular method name, with the provided arguments.
  * The only possible return value that is handled is of type ExitStatus, since the only
  * StepListener implementation that isn't void is
- * {@link StepExecutionListener#afterStep(org.springframework.batch.core.StepExecution)} ,
- * which returns ExitStatus.
+ * {@link StepExecutionListener#afterStep(StepExecution)} , which returns ExitStatus.
  *
  * @author Lucas Ward
  * @author Mahmoud Ben Hassine

spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java

@@ -19,7 +19,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemStream;
@@ -155,7 +155,7 @@ public class MulticasterBatchListener<T, S> implements StepExecutionListener, Ch
 	}
 
 	/**
-	 * @see org.springframework.batch.core.listener.CompositeStepExecutionListener#beforeStep(org.springframework.batch.core.StepExecution)
+	 * @see org.springframework.batch.core.listener.CompositeStepExecutionListener#beforeStep(StepExecution)
 	 */
 	@Override
 	public void beforeStep(StepExecution stepExecution) {

spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListener.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.listener;
 
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.step.Step;
 
 /**
  * Interface for listener to skipped items. Callbacks are called by {@link Step}

spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListener.java

@@ -16,8 +16,8 @@
 package org.springframework.batch.core.listener;
 
 import org.springframework.batch.core.ExitStatus;
-import org.springframework.batch.core.Step;
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.Step;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java

@@ -19,7 +19,7 @@ import java.lang.annotation.Annotation;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.core.annotation.AfterChunk;
 import org.springframework.batch.core.annotation.AfterChunkError;
 import org.springframework.batch.core.annotation.AfterProcess;

spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobContext.java

@@ -18,7 +18,7 @@ package org.springframework.batch.core.observability;
 
 import io.micrometer.observation.Observation;
 
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
 
 import java.util.function.Supplier;
 

spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepContext.java

@@ -18,7 +18,7 @@ package org.springframework.batch.core.observability;
 
 import io.micrometer.observation.Observation;
 
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 
 import java.util.function.Supplier;
 

spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java

@@ -17,7 +17,7 @@ package org.springframework.batch.core.observability;
 
 import io.micrometer.common.KeyValues;
 
-import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.job.JobExecution;
 
 /**
  * Default {@link BatchJobObservationConvention} implementation.

spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java

@@ -17,7 +17,7 @@ package org.springframework.batch.core.observability;
 
 import io.micrometer.common.KeyValues;
 
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 
 /**
  * Default {@link BatchStepObservationConvention} implementation.

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

@@ -18,7 +18,7 @@ package org.springframework.batch.core.partition;
 
 import java.util.Collection;
 
-import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.step.StepExecution;
 import org.springframework.batch.item.ExecutionContext;
 
 /**