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

Deprecate methods

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

@@ -126,7 +126,6 @@ public class ItemOrientedStepHandler<T, S> implements StepHandler {
 
 	/**
 	 * @throws MarkFailedException
-	 * @see org.springframework.batch.item.ItemReader#mark()
 	 */
 	public void mark() throws MarkFailedException {
 		itemReader.mark();
@@ -134,7 +133,6 @@ public class ItemOrientedStepHandler<T, S> implements StepHandler {
 
 	/**
 	 * @throws ResetFailedException
-	 * @see org.springframework.batch.item.ItemReader#reset()
 	 */
 	public void reset() throws ResetFailedException {
 		itemReader.reset();

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

@@ -48,14 +48,12 @@ public interface StepHandler {
 	/**
 	 * Implementations should delegate to an {@link ItemReader}.
 	 * 
-	 * @see org.springframework.batch.item.ItemReader#mark()
 	 */
 	void mark() throws MarkFailedException;
 
 	/**
 	 * Implementations should delegate to an {@link ItemReader}.
 	 * 
-	 * @see org.springframework.batch.item.ItemReader#reset()
 	 */
 	void reset() throws ResetFailedException;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemReader.java

@@ -58,6 +58,8 @@ public interface ItemReader<T> {
 	 * @throws MarkFailedException if there is a problem with the mark. If a
 	 * mark fails inside a transaction, it would be worrying, but not normally
 	 * fatal.
+	 * 
+	 * @deprecated
 	 */
 	void mark() throws MarkFailedException;
 
@@ -70,6 +72,8 @@ public interface ItemReader<T> {
 	 * reset fails inside a transaction, it would normally be fatal, and would
 	 * leave the stream in an inconsistent state. So while this is an unchecked
 	 * exception, it may be important for a client to catch it explicitly.
+	 * 
+	 * @deprecated
 	 */
 	void reset() throws ResetFailedException;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/DrivingQueryItemReader.java

@@ -182,8 +182,6 @@ public class DrivingQueryItemReader<T> implements ItemReader<T>, InitializingBea
 	 * single-threaded environment. The state backing the mark is a single
 	 * counter, keeping track of the current position, so multiple threads
 	 * cannot be accommodated.
-	 * 
-	 * @see org.springframework.batch.item.ItemReader#mark()
 	 */
 	public void mark() {
 		lastCommitIndex = currentIndex;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java

@@ -125,8 +125,6 @@ public class HibernateCursorItemReader<T> extends AbstractBufferedItemReaderItem
 	 * single-threaded environment. The state backing the mark is a single
 	 * counter, keeping track of the current position, so multiple threads
 	 * cannot be accommodated.
-	 * 
-	 * @see org.springframework.batch.item.ItemReader#mark()
 	 */
 	public void mark() {
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java

@@ -167,8 +167,6 @@ public class MultiResourceItemReader<T> extends ExecutionContextUserSupport impl
 
 	/**
 	 * Switches to 'read from buffer' state.
-	 * 
-	 * @see ItemReader#reset()
 	 */
 	public void reset() throws ResetFailedException {
 		if (!itemBuffer.isEmpty()) {

spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java

@@ -206,8 +206,6 @@ public class StagingItemReader<T> extends JdbcDaoSupport implements ItemStream,
 	 * resources (using
 	 * {@link TransactionSynchronizationManager#bindResource(Object, Object)}),
 	 * so they are thread bound.
-	 * 
-	 * @see org.springframework.batch.item.ItemReader#mark()
 	 */
 	public void mark() {
 		getBuffer().commit();