diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java index 4dee0dc7e..aab5e37dc 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java @@ -25,7 +25,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.orm.ibatis.SqlMapClientCallback; -import org.springframework.orm.ibatis.SqlMapClientOperations; import org.springframework.orm.ibatis.SqlMapClientTemplate; import org.springframework.util.Assert; @@ -82,9 +81,9 @@ public class IbatisBatchItemWriter implements ItemWriter, InitializingBean } /** - * Public setter for the {@link SqlMapClientOperations}. + * Public setter for the {@link SqlMapClientTemplate}. * - * @param sqlMapClientTemplate the SqlMapClientOperations + * @param sqlMapClientTemplate the SqlMapClientTemplate */ public void setSqlMapClientTemplate(SqlMapClientTemplate sqlMapClientTemplate) { this.sqlMapClientTemplate = sqlMapClientTemplate; @@ -101,7 +100,7 @@ public class IbatisBatchItemWriter implements ItemWriter, InitializingBean } /** - * Check mandatory properties - there must be an SqlMapCLient and a statementId. + * Check mandatory properties - there must be an SqlMapClient and a statementId. */ public void afterPropertiesSet() throws Exception { Assert.notNull(sqlMapClientTemplate, "A SqlMapClient or a SqlMapClientTemplate is required."); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisBatchItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisBatchItemWriterTests.java index c2411fadf..df6205a35 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisBatchItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisBatchItemWriterTests.java @@ -23,10 +23,8 @@ import java.util.List; import javax.sql.DataSource; -import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.orm.ibatis.SqlMapClientTemplate; @@ -83,7 +81,7 @@ public class IbatisBatchItemWriterTests { if (this.bar.equals(compare.getBar())) { return true; } - return super.equals(obj); + return false; } @Override @@ -93,11 +91,6 @@ public class IbatisBatchItemWriterTests { } - /* - * (non-Javadoc) - * - * @see junit.framework.TestCase#setUp() - */ @Before public void setUp() throws Exception { smc = createMock(SqlMapClient.class); @@ -108,16 +101,6 @@ public class IbatisBatchItemWriterTests { writer.afterPropertiesSet(); } - /* - * (non-Javadoc) - * - * @see junit.framework.TestCase#tearDown() - */ - @After - public void tearDown() throws Exception { - RepeatSynchronizationManager.clear(); - } - /** * Test method for * {@link org.springframework.batch.item.database.JdbcBatchItemWriter#afterPropertiesSet()}