Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

relaxed unnecessarily restrictive type parameters

Browse Source
This commit is contained in:
robokaso
2008-07-24 11:30:24 +00:00
parent e47df988ec
commit dc0365a965
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/AbstractStepFactoryBean.java
View File

@@ -50,9 +50,9 @@ public abstract class AbstractStepFactoryBean<T> implements FactoryBean, BeanNam
private boolean allowStartIfComplete;
private ItemReader<T> itemReader;
private ItemReader<? extends T> itemReader;
private ItemWriter<T> itemWriter;
private ItemWriter<? super T> itemWriter;
private PlatformTransactionManager transactionManager;
@@ -114,14 +114,14 @@ public abstract class AbstractStepFactoryBean<T> implements FactoryBean, BeanNam
/**
* @param itemReader the itemReader to set
*/
public void setItemReader(ItemReader<T> itemReader) {
public void setItemReader(ItemReader<? extends T> itemReader) {
this.itemReader = itemReader;
}
/**
* @param itemWriter the itemWriter to set
*/
public void setItemWriter(ItemWriter<T> itemWriter) {
public void setItemWriter(ItemWriter<? super T> itemWriter) {
this.itemWriter = itemWriter;
}
@@ -159,7 +159,7 @@ public abstract class AbstractStepFactoryBean<T> implements FactoryBean, BeanNam
* Protected getter for the {@link ItemReader} for subclasses to use.
* @return the itemReader
*/
protected ItemReader<T> getItemReader() {
protected ItemReader<? extends T> getItemReader() {
return itemReader;
}
@@ -167,7 +167,7 @@ public abstract class AbstractStepFactoryBean<T> implements FactoryBean, BeanNam
* Protected getter for the {@link ItemWriter} for subclasses to use
* @return the itemWriter
*/
protected ItemWriter<T> getItemWriter() {
protected ItemWriter<? super T> getItemWriter() {
return itemWriter;
}
@@ -238,8 +238,8 @@ public abstract class AbstractStepFactoryBean<T> implements FactoryBean, BeanNam
step.setStreams(streams);
ItemReader<T> itemReader = getItemReader();
ItemWriter<T> itemWriter = getItemWriter();
ItemReader<? extends T> itemReader = getItemReader();
ItemWriter<? super T> itemWriter = getItemWriter();
// Since we are going to wrap these things with listener callbacks we
// need to register them here because the step will not know we did

6
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleItemHandler.java
View File

@@ -42,15 +42,15 @@ public class SimpleItemHandler<T> implements ItemHandler {
protected final Log logger = LogFactory.getLog(getClass());
private ItemReader<T> itemReader;
private ItemReader<? extends T> itemReader;
private ItemWriter<T> itemWriter;
private ItemWriter<? super T> itemWriter;
/**
* @param itemReader
* @param itemWriter
*/
public SimpleItemHandler(ItemReader<T> itemReader, ItemWriter<T> itemWriter) {
public SimpleItemHandler(ItemReader<? extends T> itemReader, ItemWriter<? super T> itemWriter) {
super();
this.itemReader = itemReader;
this.itemWriter = itemWriter;

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBean.java
View File

@@ -301,7 +301,7 @@ public class SkipLimitStepFactoryBean<T> extends SimpleStepFactoryBean<T> {
* @param retryTemplate
* @param itemKeyGenerator
*/
public StatefulRetryItemHandler(ItemReader<T> itemReader, ItemWriter<T> itemWriter, RetryOperations retryTemplate,
public StatefulRetryItemHandler(ItemReader<? extends T> itemReader, ItemWriter<? super T> itemWriter, RetryOperations retryTemplate,
ItemKeyGenerator itemKeyGenerator, ItemSkipPolicy readSkipPolicy, ItemSkipPolicy writeSkipPolicy) {
super(itemReader, itemWriter);
this.retryOperations = retryTemplate;

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/DelegatingItemWriter.java
View File

@@ -20,7 +20,7 @@ import org.springframework.util.Assert;
*/
public class DelegatingItemWriter<I, O> implements ItemWriter<I>, InitializingBean {
private ItemWriter<O> delegate;
private ItemWriter<? super O> delegate;
/**
* Default constructor.
@@ -32,7 +32,7 @@ public class DelegatingItemWriter<I, O> implements ItemWriter<I>, InitializingBe
/**
* @param itemWriter
*/
public DelegatingItemWriter(ItemWriter<O> itemWriter) {
public DelegatingItemWriter(ItemWriter<? super O> itemWriter) {
this();
this.delegate = itemWriter;
}
@@ -62,7 +62,7 @@ public class DelegatingItemWriter<I, O> implements ItemWriter<I>, InitializingBe
/**
* Setter for {@link ItemWriter}.
*/
public void setDelegate(ItemWriter<O> writer) {
public void setDelegate(ItemWriter<? super O> writer) {
this.delegate = writer;
}