From 894c9dc2cf9ffecd30258ccd35fd4a3109b046e0 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 26 Aug 2008 15:48:33 +0000
Subject: [PATCH] OPEN - issue BATCH-771: Refactor Listeners for chunk changes

Make CompositeItemWriteListener more correct generically
---
 .../listener/CompositeItemWriteListener.java   | 18 +++++++++---------
 .../listener/MulticasterBatchListener.java     |  2 +-
 .../CompositeItemWriteListenerTests.java       |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java
index 1b4336d4b..c54fecfd9 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java
@@ -28,14 +28,14 @@ import org.springframework.core.Ordered;
  */
 public class CompositeItemWriteListener<S> implements ItemWriteListener<S> {
 
-	private OrderedComposite<ItemWriteListener<S>> listeners = new OrderedComposite<ItemWriteListener<S>>();
+	private OrderedComposite<ItemWriteListener<? super S>> listeners = new OrderedComposite<ItemWriteListener<? super S>>();
 
 	/**
 	 * Public setter for the listeners.
 	 * 
 	 * @param itemWriteListeners
 	 */
-	public void setListeners(List<ItemWriteListener<S>> itemWriteListeners) {
+	public void setListeners(List<ItemWriteListener<? super S>> itemWriteListeners) {
 		this.listeners.setItems(itemWriteListeners);
 	}
 
@@ -44,7 +44,7 @@ public class CompositeItemWriteListener<S> implements ItemWriteListener<S> {
 	 * 
 	 * @param itemWriteListener
 	 */
-	public void register(ItemWriteListener<S> itemWriteListener) {
+	public void register(ItemWriteListener<? super S> itemWriteListener) {
 		listeners.add(itemWriteListener);
 	}
 
@@ -54,8 +54,8 @@ public class CompositeItemWriteListener<S> implements ItemWriteListener<S> {
 	 * @see ItemWriteListener#afterWrite(java.util.List)
 	 */
 	public void afterWrite(List<? extends S> items) {
-		for (Iterator<ItemWriteListener<S>> iterator = listeners.reverse(); iterator.hasNext();) {
-			ItemWriteListener<S> listener = iterator.next();
+		for (Iterator<ItemWriteListener<? super S>> iterator = listeners.reverse(); iterator.hasNext();) {
+			ItemWriteListener<? super S> listener = iterator.next();
 			listener.afterWrite(items);
 		}
 	}
@@ -66,8 +66,8 @@ public class CompositeItemWriteListener<S> implements ItemWriteListener<S> {
 	 * @see ItemWriteListener#beforeWrite(List)
 	 */
 	public void beforeWrite(List<? extends S> items) {
-		for (Iterator<ItemWriteListener<S>> iterator = listeners.iterator(); iterator.hasNext();) {
-			ItemWriteListener<S> listener = iterator.next();
+		for (Iterator<ItemWriteListener<? super S>> iterator = listeners.iterator(); iterator.hasNext();) {
+			ItemWriteListener<? super S> listener = iterator.next();
 			listener.beforeWrite(items);
 		}
 	}
@@ -78,8 +78,8 @@ public class CompositeItemWriteListener<S> implements ItemWriteListener<S> {
 	 * @see ItemWriteListener#onWriteError(Exception, List)
 	 */
 	public void onWriteError(Exception ex, List<? extends S> items) {
-		for (Iterator<ItemWriteListener<S>> iterator = listeners.reverse(); iterator.hasNext();) {
-			ItemWriteListener<S> listener = iterator.next();
+		for (Iterator<ItemWriteListener<? super S>> iterator = listeners.reverse(); iterator.hasNext();) {
+			ItemWriteListener<? super S> listener = iterator.next();
 			listener.onWriteError(ex, items);
 		}
 	}
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
index aafd03216..d344eb6ad 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
@@ -63,7 +63,7 @@ public class MulticasterBatchListener<S> implements StepExecutionListener, Chunk
 			register(listeners[i]);
 		}
 	}
-	
+
 	/**
 	 * Register the listener for callbacks on the appropriate interfaces
 	 * implemented. Any {@link StepListener} can be provided, or an
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java
index b5fca07f7..1b812810c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java
@@ -75,7 +75,7 @@ public class CompositeItemWriteListenerTests {
 
 	@Test
 	public void testSetListners() throws Exception {
-		compositeListener.setListeners(new ArrayList<ItemWriteListener<Object>>() {
+		compositeListener.setListeners(new ArrayList<ItemWriteListener<? super Object>>() {
 			{
 				add(listener);
 			}