OPEN - issue BATCH-385: Merge user attributes in StepContext with ExecutionContext

http://jira.springframework.org/browse/BATCH-385

removed delegate calls to ItemStream in favour of direct registration

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/GeneratingItemReader.java

@@ -3,10 +3,8 @@ package org.springframework.batch.sample.item.reader;
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.exception.MarkFailedException;
 import org.springframework.batch.item.exception.ResetFailedException;
-import org.springframework.batch.item.exception.StreamException;
 import org.springframework.batch.item.reader.AbstractItemReaderRecoverer;
 import org.springframework.batch.sample.domain.Trade;
 
@@ -15,7 +13,7 @@ import org.springframework.batch.sample.domain.Trade;
  * 
  * @author Robert Kasanicky
  */
-public class GeneratingItemReader extends AbstractItemReaderRecoverer implements ItemStream {
+public class GeneratingItemReader extends AbstractItemReaderRecoverer {
 
 	private int limit = 1;
 	
@@ -58,14 +56,6 @@ public class GeneratingItemReader extends AbstractItemReaderRecoverer implements
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.item.ItemStream#close()
-	 */
-	public void close(ExecutionContext executionContext) throws StreamException {
-		// TODO Auto-generated method stub
-		
-	}
-
 	/* (non-Javadoc)
 	 * @see org.springframework.batch.item.ItemStream#mark()
 	 */
@@ -86,13 +76,4 @@ public class GeneratingItemReader extends AbstractItemReaderRecoverer implements
 	public void restoreFrom(ExecutionContext context) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.batch.item.ExecutionContextProvider#getExecutionContext()
-	 */
-	public void update(ExecutionContext executionContext) {
-	}
-
-	public void open(ExecutionContext context) throws StreamException {
-	}
-
 }

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/TradeWriter.java

@@ -64,10 +64,4 @@ public class TradeWriter extends AbstractItemWriter {
     public void setDao(TradeDao dao) {
         this.dao = dao;
     }
-
-	public void close() {
-	}
-
-	public void init() {
-	}
 }