Move job and step APIs in their dedicated packages

Resolves #4877

Author: fmbenhassine

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

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