From 9e91cf4629437b320c95bab4913164f54dd3042c Mon Sep 17 00:00:00 2001 From: lucasward Date: Tue, 29 Jan 2008 17:15:29 +0000 Subject: [PATCH] BATCH-325:Added close() to readers and writers. --- .../springframework/batch/jms/ExternalRetryInBatchTests.java | 3 ++- .../springframework/batch/retry/jms/ExternalRetryTests.java | 5 +++-- .../springframework/batch/retry/jms/SynchronousTests.java | 3 ++- .../java/org/springframework/retry/jms/SynchronousTests.java | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java index 117f52ba6..79c6aa01d 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java @@ -24,6 +24,7 @@ import javax.sql.DataSource; import org.springframework.batch.item.AbstractItemReaderRecoverer; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; +import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; @@ -114,7 +115,7 @@ public class ExternalRetryInBatchTests extends AbstractDependencyInjectionSpring retryTemplate.setRetryPolicy(new ItemReaderRetryPolicy(new SimpleRetryPolicy(1))); - final ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() { + final ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new AbstractItemWriter() { public void write(final Object text) { // No need for transaction here: the whole batch will roll // back. When it comes back for recovery this code is not diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java index b719651ba..d5d9c7031 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java @@ -24,6 +24,7 @@ import javax.sql.DataSource; import org.springframework.batch.item.AbstractItemReaderRecoverer; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; +import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.retry.callback.ItemReaderRetryCallback; import org.springframework.batch.retry.policy.ItemReaderRetryPolicy; import org.springframework.batch.retry.support.RetryTemplate; @@ -104,7 +105,7 @@ public class ExternalRetryTests extends AbstractDependencyInjectionSpringContext retryTemplate.setRetryPolicy(new ItemReaderRetryPolicy()); - final ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() { + final ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new AbstractItemWriter() { public void write(final Object text) { jdbcTemplate.update("INSERT into T_FOOS (id,name,foo_date) values (?,?,null)", new Object[] { Integer.valueOf(list.size()), text }); @@ -169,7 +170,7 @@ public class ExternalRetryTests extends AbstractDependencyInjectionSpringContext retryTemplate.setRetryPolicy(new ItemReaderRetryPolicy()); - final ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new ItemWriter() { + final ItemReaderRetryCallback callback = new ItemReaderRetryCallback(provider, new AbstractItemWriter() { public void write(final Object text) { jdbcTemplate.update("INSERT into T_FOOS (id,name,foo_date) values (?,?,null)", new Object[] { Integer.valueOf(list.size()), text }); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java index 1ee074edd..fd48ccb09 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java @@ -21,6 +21,7 @@ import java.util.List; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.reader.JmsItemReader; +import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.callback.ItemReaderRetryCallback; @@ -147,7 +148,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte provider.setJmsTemplate(jmsTemplate); jmsTemplate.setDefaultDestinationName("queue"); - retryTemplate.execute(new ItemReaderRetryCallback(provider, new ItemWriter() { + retryTemplate.execute(new ItemReaderRetryCallback(provider, new AbstractItemWriter() { public void write(final Object text) { TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager); diff --git a/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java index 3e065836b..4ff97a6bd 100644 --- a/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java @@ -21,6 +21,7 @@ import java.util.List; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.reader.JmsItemReader; +import org.springframework.batch.item.writer.AbstractItemWriter; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.callback.ItemReaderRetryCallback; @@ -143,7 +144,7 @@ public class SynchronousTests extends AbstractTransactionalDataSourceSpringConte provider.setJmsTemplate(jmsTemplate); jmsTemplate.setDefaultDestinationName("queue"); - retryTemplate.execute(new ItemReaderRetryCallback(provider, new ItemWriter() { + retryTemplate.execute(new ItemReaderRetryCallback(provider, new AbstractItemWriter() { public void write(final Object text) { TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager);