From 9f9b3c72eb382990ec485bd46707bc2695129797 Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Thu, 24 Jul 2008 13:31:53 +0000
Subject: [PATCH] relaxed unnecessarily restrictive type parameters

---
 .../springframework/batch/item/file/FlatFileItemReader.java   | 4 ++--
 .../springframework/batch/item/file/FlatFileItemWriter.java   | 4 ++--
 .../springframework/batch/item/xml/StaxEventItemReader.java   | 4 ++--
 .../springframework/batch/item/xml/StaxEventItemWriter.java   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java
index 89804454d..e2fb38543 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java
@@ -83,7 +83,7 @@ public class FlatFileItemReader<T> extends AbstractBufferedItemReaderItemStream<
 
 	private LineTokenizer tokenizer = new DelimitedLineTokenizer();
 
-	private FieldSetMapper<T> fieldSetMapper;
+	private FieldSetMapper<? extends T> fieldSetMapper;
 
 	/**
 	 * Encapsulates the state of the input source. If it is null then we are
@@ -186,7 +186,7 @@ public class FlatFileItemReader<T> extends AbstractBufferedItemReaderItemStream<
 	 * 
 	 * @param fieldSetMapper
 	 */
-	public void setFieldSetMapper(FieldSetMapper<T> fieldSetMapper) {
+	public void setFieldSetMapper(FieldSetMapper<? extends T> fieldSetMapper) {
 		this.fieldSetMapper = fieldSetMapper;
 	}
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java
index 3ccb48695..a51a09315 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java
@@ -82,7 +82,7 @@ public class FlatFileItemWriter<T> extends ExecutionContextUserSupport implement
 
 	private LineAggregator lineAggregator = new DelimitedLineAggregator();
 
-	private FieldSetCreator<T> fieldSetCreator;
+	private FieldSetCreator<? super T> fieldSetCreator;
 
 	private boolean saveState = true;
 
@@ -137,7 +137,7 @@ public class FlatFileItemWriter<T> extends ExecutionContextUserSupport implement
 	 * 
 	 * @param fieldSetCreator the {@link FieldSetCreator} to set
 	 */
-	public void setFieldSetCreator(FieldSetCreator<T> fieldSetCreator) {
+	public void setFieldSetCreator(FieldSetCreator<? super T> fieldSetCreator) {
 		this.fieldSetCreator = fieldSetCreator;
 	}
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
index de6846ca6..8bf6b9a79 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
@@ -37,7 +37,7 @@ public class StaxEventItemReader<T> extends AbstractBufferedItemReaderItemStream
 
 	private XMLEventReader eventReader;
 
-	private EventReaderDeserializer<T> eventReaderDeserializer;
+	private EventReaderDeserializer<? extends T> eventReaderDeserializer;
 
 	private Resource resource;
 
@@ -57,7 +57,7 @@ public class StaxEventItemReader<T> extends AbstractBufferedItemReaderItemStream
 	 * @param eventReaderDeserializer maps xml fragments corresponding to
 	 * records to objects
 	 */
-	public void setFragmentDeserializer(EventReaderDeserializer<T> eventReaderDeserializer) {
+	public void setFragmentDeserializer(EventReaderDeserializer<? extends T> eventReaderDeserializer) {
 		this.eventReaderDeserializer = eventReaderDeserializer;
 	}
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java
index ea2ee7bc3..b963b315e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java
@@ -69,7 +69,7 @@ public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implemen
 	private Resource resource;
 
 	// xml serializer
-	private EventWriterSerializer<T> serializer;
+	private EventWriterSerializer<? super T> serializer;
 
 	// encoding to be used while reading from the resource
 	private String encoding = DEFAULT_ENCODING;
@@ -135,7 +135,7 @@ public class StaxEventItemWriter<T> extends ExecutionContextUserSupport implemen
 	 * 
 	 * @param serializer the Object to XML serializer
 	 */
-	public void setSerializer(EventWriterSerializer<T> serializer) {
+	public void setSerializer(EventWriterSerializer<? super T> serializer) {
 		this.serializer = serializer;
 	}