Review process. Split step package into item and tasklet.

spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStepFactoryBean.java

@@ -17,6 +17,8 @@ package org.springframework.batch.core.step;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.item.ItemOrientedStep;
+import org.springframework.batch.core.step.item.SimpleItemHandler;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.beans.factory.BeanNameAware;

spring-batch-core/src/main/java/org/springframework/batch/core/step/TaskletStep.java

@@ -27,7 +27,7 @@ import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AlwaysSkipItemSkipPolicy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BackportConcurrentStepExecutionSynchronizer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepExecution;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchListenerFactoryHelper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.ArrayList;
 import java.util.List;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/DefaultItemFailureHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ExitStatusExceptionClassifier.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.support.ExceptionClassifier;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.item.ClearFailedException;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.Date;
 
@@ -27,7 +27,8 @@ import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.core.listener.CompositeStepListener;
 import org.springframework.batch.core.repository.JobRepository;
-import org.springframework.batch.core.tasklet.Tasklet;
+import org.springframework.batch.core.step.AbstractStep;
+import org.springframework.batch.core.step.tasklet.Tasklet;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 import org.springframework.batch.core.StepContribution;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/JdkConcurrentStepExecutionSynchronizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.concurrent.Semaphore;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/LimitCheckingItemSkipPolicy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.io.FileNotFoundException;
 import java.util.Collections;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/NeverSkipItemSkipPolicy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.ItemSkipPolicy;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBean.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
+import org.springframework.batch.core.step.AbstractStepFactoryBean;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleExitStatusExceptionClassifier.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleItemHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.item.ClearFailedException;
@@ -72,7 +72,7 @@ public class SimpleItemHandler implements ItemHandler {
 	 * Get the next item from {@link #read(StepContribution)} and if not null
 	 * pass the item to {@link #write(Object, StepContribution)}.
 	 * 
-	 * @see org.springframework.batch.core.step.ItemHandler#handle(org.springframework.batch.core.StepContribution)
+	 * @see org.springframework.batch.core.step.item.ItemHandler#handle(org.springframework.batch.core.StepContribution)
 	 */
 	public ExitStatus handle(StepContribution contribution) throws Exception {
 		Object item = read(contribution);

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.exception.ExceptionHandler;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.BatchListener;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepListener;
 import org.springframework.batch.core.listener.MulticasterBatchListener;
+import org.springframework.batch.core.step.AbstractStepFactoryBean;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitExceededException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.UnexpectedJobExecutionException;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import java.util.Arrays;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBean.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepContribution;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSynchronizer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.StepExecution;
 

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepExecutionSyncronizerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.core.JdkVersion;
 import org.springframework.util.ClassUtils;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/StepInterruptionPolicy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.Step;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ThreadStepInterruptionPolicy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.step;
+package org.springframework.batch.core.step.item;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/package.html

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+Specific implementations of step concerns for item-oriented approach.
+</p>
+</body>
+</html>

spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/Tasklet.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;

spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletAdapter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.core.tasklet;
+package org.springframework.batch.core.step.tasklet;
 
 import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator;
 import org.springframework.batch.repeat.ExitStatus;
@@ -38,7 +38,7 @@ public class TaskletAdapter extends AbstractMethodInvokingDelegator implements T
 	 * delegate method should not be void, otherwise there is no way to
 	 * determine when the result indicates a finished job.
 	 * 
-	 * @see org.springframework.batch.core.tasklet.Tasklet#execute()
+	 * @see org.springframework.batch.core.step.tasklet.Tasklet#execute()
 	 */
 	public ExitStatus execute() throws Exception {
 		return mapResult(invokeDelegateMethod());