From 05e08040209c70f6df76fa7c4a43da97626bb819 Mon Sep 17 00:00:00 2001 From: dsyer Date: Tue, 5 Feb 2008 11:37:03 +0000 Subject: [PATCH] Removed the close() method from ItemWriter - it shadows ItemStream so use that interface if needed. --- .../io/support/HibernateAwareItemWriter.java | 4 --- .../batch/item/ItemWriter.java | 6 ----- .../batch/item/writer/AbstractItemWriter.java | 2 -- .../item/writer/DelegatingItemWriter.java | 5 ---- .../item/writer/CompositeItemWriterTests.java | 27 ------------------- 5 files changed, 44 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java index 169b6bec4..5f564e8c1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java @@ -287,8 +287,4 @@ public class HibernateAwareItemWriter implements ItemWriter, RepeatInterceptor, } - public void close() throws Exception { - delegate.close(); - } - } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java index d94dc96b2..78c1d5150 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemWriter.java @@ -38,10 +38,4 @@ public interface ItemWriter { */ public void write(Object item) throws Exception; - /** - * Close the writer, allowing all allocated resources to be cleaned up. - * - * @throws Exception - */ - void close() throws Exception; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java index faab36072..cd602786f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/AbstractItemWriter.java @@ -26,6 +26,4 @@ import org.springframework.batch.item.ItemWriter; */ public abstract class AbstractItemWriter implements ItemWriter{ - public void close() throws Exception { - } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java index 99ca1a98f..2742a8de6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java @@ -53,9 +53,4 @@ public class DelegatingItemWriter implements ItemWriter, Skippable, Initializing Assert.notNull(writer); } - // YODO: remove - public void close() throws Exception { - writer.close(); - } - } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemWriterTests.java index bce2b4807..2a0a95f19 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemWriterTests.java @@ -51,32 +51,5 @@ public class CompositeItemWriterTests extends TestCase { control.verify(); } } - - public void testClose() throws Exception { - - final int NUMBER_OF_PROCESSORS = 10; - - List processors = new ArrayList(NUMBER_OF_PROCESSORS); - final List list = new ArrayList(NUMBER_OF_PROCESSORS); - - for (int i = 0; i < NUMBER_OF_PROCESSORS; i++) { - ItemWriter processor = new AbstractItemWriter() { - public void write(Object item) throws Exception { - throw new IllegalStateException("No way!"); - } - public void close() throws Exception { - list.add(this); - } - }; - processor.close(); - processors.add(processor); - } - - itemProcessor.setDelegates(processors); - itemProcessor.close(); - - assertEquals(NUMBER_OF_PROCESSORS, list.size()); - - } }