OPEN - issue BATCH-789: Remove mark/reset from ItemReader

Shift chunk iteration into StepHandler - had to sacrifice interrupted check inside chunk

spring-batch-integration/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Thu Jul 24 14:51:08 CEST 2008
+#Wed Aug 20 13:59:46 BST 2008
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -7,12 +7,13 @@ org.eclipse.jdt.core.compiler.compliance=1.5
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -26,9 +27,21 @@ org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=default
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java

@@ -7,9 +7,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.listener.StepExecutionListenerSupport;
-import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemStreamException;
 import org.springframework.batch.item.ItemWriter;
@@ -78,20 +76,6 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
 
 	}
 
-	/**
-	 * No-op.
-	 * @see org.springframework.batch.item.ItemWriter#flush()
-	 */
-	public void flush() throws FlushFailedException {
-	}
-
-	/**
-	 * No-op.
-	 * @see org.springframework.batch.item.ItemWriter#clear()
-	 */
-	public void clear() throws ClearFailedException {
-	}
-
 	@Override
 	public void beforeStep(StepExecution stepExecution) {
 		localState.setStepExecution(stepExecution);
@@ -169,6 +153,7 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
 			Assert.state(jobInstanceId.equals(localState.getJobId()), "Message contained wrong job instance id ["
 					+ jobInstanceId + "] should have been [" + localState.getJobId() + "].");
 			localState.actual++;
+			// TODO: apply the skip count
 			ExitStatus result = payload.getExitStatus();
 			// TODO: check it can never be ExitStatus.FINISHED?
 			if (!result.isContinuable()) {

spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java

@@ -53,7 +53,7 @@ public class ChunkMessageItemWriterIntegrationTests {
 	@Qualifier("replies")
 	private PollableChannel replies;
 
-	private SimpleStepFactoryBean<Object,Object> factory;
+	private SimpleStepFactoryBean<Object,Object> factory = new SimpleStepFactoryBean<Object,Object>();
 
 	private SimpleJobRepository jobRepository;
 
@@ -63,7 +63,6 @@ public class ChunkMessageItemWriterIntegrationTests {
 	@Before
 	public void setUp() {
 
-		factory = new SimpleStepFactoryBean<Object,Object>();
 		jobRepository = new SimpleJobRepository(new MapJobInstanceDao(),
 				new MapJobExecutionDao(), new MapStepExecutionDao(), new MapExecutionContextDao());
 		factory.setJobRepository(jobRepository);

spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java

@@ -53,10 +53,6 @@ public class MessageChannelItemWriterTests {
 		assertEquals(Required.class, annotations[0].annotationType());
 	}
 
-	/**
-	 * Test method for {@link org.springframework.batch.integration.item.MessageChannelItemWriter#write(java.lang.Object)}.
-	 * @throws Exception 
-	 */
 	@Test
 	public void testWrite() throws Exception {
 		DirectChannel channel = new DirectChannel();
@@ -70,10 +66,6 @@ public class MessageChannelItemWriterTests {
 		assertEquals("foo", message.getPayload());
 	}
 
-	/**
-	 * Test method for {@link org.springframework.batch.integration.item.MessageChannelItemWriter#write(java.lang.Object)}.
-	 * @throws Exception 
-	 */
 	@Test
 	public void testWriteWithRollback() throws Exception {
 		DirectChannel channel = new DirectChannel();
@@ -93,10 +85,6 @@ public class MessageChannelItemWriterTests {
 		}
 	}
 
-	/**
-	 * Test method for {@link org.springframework.batch.integration.item.MessageChannelItemWriter#write(java.lang.Object)}.
-	 * @throws Exception 
-	 */
 	@Test
 	public void testWriteWithRollbackOnEndpoint() throws Exception {
 		DirectChannel channel = new DirectChannel();

spring-batch-integration/src/test/java/org/springframework/batch/integration/job/MessageOrientedStepTests.java

@@ -39,7 +39,6 @@ import org.springframework.integration.channel.ThreadLocalChannel;
 import org.springframework.integration.message.BlockingSource;
 import org.springframework.integration.message.GenericMessage;
 import org.springframework.integration.message.Message;
-import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.MessageTarget;
 import org.springframework.util.ReflectionUtils;
 
@@ -85,10 +84,6 @@ public class MessageOrientedStepTests {
 		assertEquals(Required.class, annotations[0].annotationType());
 	}
 
-	/**
-	 * Test method for
-	 * {@link org.springframework.batch.integration.job.MessageOrientedStep#setSource(MessageSource)}.
-	 */
 	@Test
 	public void testSetReplyChannel() {
 		Method method = ReflectionUtils.findMethod(MessageOrientedStep.class, "setSource",