From ecdf4816ecf12d9629c9bfdd9015d4bb4c9e95ff Mon Sep 17 00:00:00 2001 From: robokaso Date: Wed, 23 Jul 2008 08:21:27 +0000 Subject: [PATCH] IN PROGRESS - BATCH-711: Upgrade ItemWriter and implementations to use parameterized types --- .../AbstractTransactionalResourceItemWriter.java | 12 ++++++------ .../item/database/BatchSqlUpdateItemWriter.java | 6 +++--- .../item/database/HibernateAwareItemWriter.java | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractTransactionalResourceItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractTransactionalResourceItemWriter.java index 0eb82720a..c5b314249 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractTransactionalResourceItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractTransactionalResourceItemWriter.java @@ -37,9 +37,9 @@ import org.springframework.util.Assert; * @author Dave Syer * @author Robert Kasanicky */ -public abstract class AbstractTransactionalResourceItemWriter implements ItemWriter { +public abstract class AbstractTransactionalResourceItemWriter implements ItemWriter { - private Set failed = new HashSet(); + private Set failed = new HashSet(); /** * Flushing delegated to subclass surrounded by binding and unbinding of @@ -73,7 +73,7 @@ public abstract class AbstractTransactionalResourceItemWriter implements ItemWri * * @see org.springframework.batch.item.ItemWriter#write(Object) */ - public void write(Object output) throws Exception { + public void write(T output) throws Exception { bindTransactionResources(); getProcessed().add(output); doWrite(output); @@ -123,7 +123,7 @@ public abstract class AbstractTransactionalResourceItemWriter implements ItemWri /** * Callback method of {@link #write(Object)}. */ - protected abstract void doWrite(Object output) throws Exception; + protected abstract void doWrite(T item) throws Exception; /** * @return Key for items processed in the current transaction @@ -159,10 +159,10 @@ public abstract class AbstractTransactionalResourceItemWriter implements ItemWri * @return the processed */ @SuppressWarnings("unchecked") - protected Set getProcessed() { + protected Set getProcessed() { Assert.state(TransactionSynchronizationManager.hasResource(getResourceKey()), "Processed items not bound to transaction."); - Set processed = (Set) TransactionSynchronizationManager.getResource(getResourceKey()); + Set processed = (Set) TransactionSynchronizationManager.getResource(getResourceKey()); return processed; } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java index 0a4649521..f76c07493 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java @@ -56,7 +56,7 @@ import org.springframework.util.Assert; * @author Dave Syer * */ -public class BatchSqlUpdateItemWriter extends AbstractTransactionalResourceItemWriter implements InitializingBean { +public class BatchSqlUpdateItemWriter extends AbstractTransactionalResourceItemWriter implements InitializingBean { /** * Key for items processed in the current transaction {@link RepeatContext}. @@ -122,7 +122,7 @@ public class BatchSqlUpdateItemWriter extends AbstractTransactionalResourceItemW */ protected void doFlush() throws EmptyResultDataAccessException { - final List processed = new ArrayList(getProcessed()); + final List processed = new ArrayList(getProcessed()); if (!processed.isEmpty()) { @@ -158,7 +158,7 @@ public class BatchSqlUpdateItemWriter extends AbstractTransactionalResourceItemW /** * No-op. */ - protected void doWrite(Object output) { + protected void doWrite(T item) { } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java index 8e82c0e99..8a41fc3ba 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java @@ -44,14 +44,14 @@ import org.springframework.util.Assert; * @author Dave Syer * */ -public class HibernateAwareItemWriter extends AbstractTransactionalResourceItemWriter implements InitializingBean { +public class HibernateAwareItemWriter extends AbstractTransactionalResourceItemWriter implements InitializingBean { /** * Key for items processed in the current transaction {@link RepeatContext}. */ private static final String ITEMS_PROCESSED = HibernateAwareItemWriter.class.getName() + ".ITEMS_PROCESSED"; - private ItemWriter delegate; + private ItemWriter delegate; private HibernateOperations hibernateTemplate; @@ -60,7 +60,7 @@ public class HibernateAwareItemWriter extends AbstractTransactionalResourceItemW * * @param delegate the delegate to set */ - public void setDelegate(ItemWriter delegate) { + public void setDelegate(ItemWriter delegate) { this.delegate = delegate; } @@ -114,8 +114,8 @@ public class HibernateAwareItemWriter extends AbstractTransactionalResourceItemW return ITEMS_PROCESSED; } - protected void doWrite(Object output) throws Exception { - delegate.write(output); + protected void doWrite(T item) throws Exception { + delegate.write(item); } }