diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java index ab9c9fa64..4b6230372 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java @@ -328,7 +328,7 @@ public class TaskletStep extends AbstractStep { } protected void close(ExecutionContext ctx) throws Exception { - stream.close(ctx); + stream.close(); } protected void open(ExecutionContext ctx) throws Exception { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java index e992a8979..1832c81e5 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java @@ -42,7 +42,7 @@ public class TestReader extends AbstractTestComponent implements ItemReader, ItemStream { return input[index++]; } - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { } public void open(ExecutionContext executionContext) throws ItemStreamException { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java index db0936a29..f07b9e2f1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java @@ -159,7 +159,7 @@ public class TaskletStepExceptionTests { final RuntimeException exception = new RuntimeException(); taskletStep.setStreams(new ItemStream[] { new ItemStreamSupport() { @Override - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { throw exception; } } }); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java index 0fdbb6f07..ef9242752 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java @@ -656,7 +656,7 @@ public class TaskletStepTests { step.setJobRepository(new JobRepositorySupport()); step.setStreams(new ItemStream[] { new ItemStreamSupport() { - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { throw new RuntimeException("Bar"); } } }); @@ -679,8 +679,8 @@ public class TaskletStepTests { public void testStatusForCloseFailedException() throws Exception { MockRestartableItemReader itemReader = new MockRestartableItemReader() { - public void close(ExecutionContext executionContext) throws ItemStreamException { - super.close(executionContext); + public void close() throws ItemStreamException { + super.close(); // Simulate failure on rollback when stream resets throw new RuntimeException("Bar"); } diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java index 60190daa6..d08268122 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java @@ -72,7 +72,7 @@ public abstract class AbstractStaxEventReaderItemReaderTests extends TestCase { } protected void tearDown() throws Exception { - source.close(null); + source.close(); } public void setResource(Resource resource) { diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java index 6e1789c9d..fa81fc542 100644 --- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java +++ b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java @@ -45,7 +45,7 @@ public abstract class AbstractStaxEventWriterItemWriterTests { @Test public void testWrite() throws Exception { writer.write(objects); - writer.close(null); + writer.close(); XMLUnit.setIgnoreWhitespace(true); XMLAssert.assertXMLEqual(new FileReader(expected.getFile()), new FileReader(resource.getFile())); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStream.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStream.java index 49c48e55a..7bfa163d9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStream.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStream.java @@ -47,8 +47,6 @@ public interface ItemStream { /** * If any resources are needed for the stream to operate they need to be destroyed here. Once this method has been * called all other methods (except open) may throw an exception. - * - * @param executionContext the current execution context in case it is needed */ - void close(ExecutionContext executionContext) throws ItemStreamException; + void close() throws ItemStreamException; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java index b8607d33d..623d6a44f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java @@ -26,9 +26,9 @@ public abstract class ItemStreamSupport implements ItemStream { /** * No-op. - * @see org.springframework.batch.item.ItemStream#close(ExecutionContext) + * @see org.springframework.batch.item.ItemStream#close() */ - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/DrivingQueryItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/DrivingQueryItemReader.java index d588cdcb9..5a111117b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/DrivingQueryItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/DrivingQueryItemReader.java @@ -126,7 +126,7 @@ public class DrivingQueryItemReader implements ItemReader, InitializingBea * Close the resource by setting the list of keys to null, allowing them to * be garbage collected. */ - public void close(ExecutionContext executionContext) { + public void close() { initialized = false; currentIndex = 0; keysIterator = null; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java index f5606b880..56916b12b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java @@ -181,7 +181,7 @@ public class JdbcCursorItemReader extends AbstractItemCountingItemStreamItemR handleWarnings(preparedStatement); } catch (SQLException se) { - close(null); + close(); throw getExceptionTranslator().translate("Executing query", sql, se); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java index 8b46d2f0c..9f23ae328 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java @@ -200,9 +200,9 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement } /** - * @see ItemStream#close(ExecutionContext) + * @see ItemStream#close() */ - public void close(ExecutionContext executionContext) { + public void close() { if (state != null) { try { if (footerCallback != null) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java index b74cb07ec..2cd8b161c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java @@ -95,7 +95,7 @@ public class MultiResourceItemReader implements ItemReader, ItemStream { return null; } - delegate.close(new ExecutionContext()); + delegate.close(); delegate.setResource(resources[index.currentResource]); delegate.open(new ExecutionContext()); @@ -109,9 +109,9 @@ public class MultiResourceItemReader implements ItemReader, ItemStream { * Close the {@link #setDelegate(ResourceAwareItemReaderItemStream)} reader * and reset instance variable values. */ - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { index = new MultiResourceIndex(); - delegate.close(new ExecutionContext()); + delegate.close(); noInput = false; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java index 3fd351a79..0834ab820 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java @@ -54,7 +54,7 @@ public class MultiResourceItemWriter extends ExecutionContextUserSupport impl public void write(List items) throws Exception { if (currentResourceItemCount >= itemCountLimitPerResource) { - delegate.close(new ExecutionContext()); + delegate.close(); resourceIndex++; currentResourceItemCount = 0; setResourceToDelegate(); @@ -101,10 +101,10 @@ public class MultiResourceItemWriter extends ExecutionContextUserSupport impl this.saveState = saveState; } - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { resourceIndex = 1; currentResourceItemCount = 0; - delegate.close(executionContext); + delegate.close(); } public void open(ExecutionContext executionContext) throws ItemStreamException { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java index 036e1da3b..952a1b5b3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java @@ -69,7 +69,7 @@ public abstract class AbstractItemCountingItemStreamItemReader implements Ite this.currentItemCount = count; } - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { currentItemCount = 0; try { doClose(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java index 30ee855dd..0acebc4b9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java @@ -80,10 +80,10 @@ public class CompositeItemStream implements ItemStream { * Broadcast the call to close. * @throws ItemStreamException */ - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { synchronized (streams) { for (ItemStream itemStream : streams) { - itemStream.close(executionContext); + itemStream.close(); } } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java index 916e1ef9f..8647b1908 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java @@ -374,9 +374,9 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen /** * Flush and close the output source. * - * @see org.springframework.batch.item.ItemStream#close(ExecutionContext) + * @see org.springframework.batch.item.ItemStream#close() */ - public void close(ExecutionContext executionContext) { + public void close() { // harmless event to close the root tag if there were no items XMLEventFactory factory = XMLEventFactory.newInstance(); diff --git a/spring-batch-infrastructure/src/test/java/MultiResourceItemWriterXmlTests.java b/spring-batch-infrastructure/src/test/java/MultiResourceItemWriterXmlTests.java index fe243c6d9..e42cc7227 100644 --- a/spring-batch-infrastructure/src/test/java/MultiResourceItemWriterXmlTests.java +++ b/spring-batch-infrastructure/src/test/java/MultiResourceItemWriterXmlTests.java @@ -86,7 +86,7 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr assertTrue(part2.exists()); tested.update(executionContext); - tested.close(executionContext); + tested.close(); assertEquals(xmlDocStart + "" + xmlDocEnd, readFile(part2)); assertEquals(xmlDocStart + "" + xmlDocEnd, @@ -100,7 +100,7 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr File part3 = new File(file.getAbsolutePath() + suffixCreator.getSuffix(3)); assertTrue(part3.exists()); - tested.close(executionContext); + tested.close(); assertEquals(xmlDocStart + "" + xmlDocEnd, readFile(part2)); assertEquals(xmlDocStart diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemStreamItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemStreamItemReaderTests.java index 92a3b7a0d..1b2b793fb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemStreamItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/CommonItemStreamItemReaderTests.java @@ -31,7 +31,7 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe @After public void tearDown() throws Exception { - testedAsStream().close(executionContext); + testedAsStream().close(); } /** @@ -104,7 +104,7 @@ public abstract class CommonItemStreamItemReaderTests extends CommonItemReaderTe testedAsStream().update(executionContext); // create new input source - testedAsStream().close(executionContext); + testedAsStream().close(); testedAsStream().open(executionContext); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDataSourceItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDataSourceItemReaderIntegrationTests.java index 6aff3679f..cc6ef72d8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDataSourceItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDataSourceItemReaderIntegrationTests.java @@ -50,7 +50,7 @@ public abstract class AbstractDataSourceItemReaderIntegrationTests { @AfterTransaction public void onTearDownAfterTransaction() throws Exception { - getAsItemStream(reader).close(null); + getAsItemStream(reader).close(); } /* diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractPagingItemReaderParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractPagingItemReaderParameterTests.java index a07a00b35..768bf704f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractPagingItemReaderParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractPagingItemReaderParameterTests.java @@ -28,7 +28,7 @@ public abstract class AbstractPagingItemReaderParameterTests { @After public void tearDown() { - ((ItemStream)tested).close(executionContext); + ((ItemStream)tested).close(); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java index eaf53f2ff..971aeb188 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooInputSource.java @@ -40,7 +40,7 @@ class FooItemReader implements ItemStream, ItemReader, DisposableBean, Init } public void destroy() throws Exception { - itemReader.close(null); + itemReader.close(); } public void setFooDao(FooDao fooDao) { @@ -54,8 +54,8 @@ class FooItemReader implements ItemStream, ItemReader, DisposableBean, Init itemReader.open(executionContext); } - public void close(ExecutionContext executionContext) { - itemReader.close(executionContext); + public void close() { + itemReader.close(); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java index a1e4959f1..1fb09978d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java @@ -41,7 +41,7 @@ public class HibernateCursorItemReaderCommonTests extends CommonDatabaseItemStre protected void pointToEmptyInput(ItemReader tested) throws Exception { HibernateCursorItemReader reader = (HibernateCursorItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); reader.setQueryString("from Foo foo where foo.id = -1"); reader.afterPropertiesSet(); reader.open(new ExecutionContext()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java index ebe4a3e88..58591054d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java @@ -46,7 +46,7 @@ public class HibernateCursorItemReaderStatefulIntegrationTests extends Hibernate replay(scrollableResults); itemReader.open(new ExecutionContext()); - itemReader.close(new ExecutionContext()); + itemReader.close(); verify(sessionFactory); verify(session); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java index 89ceca65b..0743e19f0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisItemReaderCommonTests.java @@ -45,7 +45,7 @@ public class IbatisItemReaderCommonTests extends CommonDatabaseItemStreamItemRea protected void pointToEmptyInput(ItemReader tested) throws Exception { IbatisDrivingQueryItemReader reader = (IbatisDrivingQueryItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); IbatisKeyCollector keyCollector = new IbatisKeyCollector(); keyCollector.setDrivingQueryId("getNoFoos"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java index 4f4e8573d..e684e6608 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java @@ -40,7 +40,7 @@ public class IbatisPagingItemReaderCommonTests extends CommonDatabaseItemStreamI protected void pointToEmptyInput(ItemReader tested) throws Exception { IbatisPagingItemReader reader = (IbatisPagingItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); reader.setQueryId("getNoFoos"); reader.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java index 0d2cccbb6..132c591aa 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java @@ -39,7 +39,7 @@ public class JdbcCursorItemReaderCommonTests extends CommonDatabaseItemStreamIte protected void pointToEmptyInput(ItemReader tested) throws Exception { JdbcCursorItemReader reader = (JdbcCursorItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); reader.setSql("select ID from T_FOOS where ID < 0"); reader.afterPropertiesSet(); reader.open(new ExecutionContext()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java index 7fd35524f..e612d3baa 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java @@ -51,7 +51,7 @@ public class JdbcPagingItemReaderCommonTests extends CommonItemStreamItemReaderT protected void pointToEmptyInput(ItemReader tested) throws Exception { JdbcPagingItemReader reader = (JdbcPagingItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); reader.setDataSource(dataSource); HsqlPagingQueryProvider queryProvider = new HsqlPagingQueryProvider(); queryProvider.setSelectClause("select ID, NAME, VALUE"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java index c2d2571dc..ac35f7786 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java @@ -34,7 +34,7 @@ public class JpaPagingItemReaderCommonTests extends CommonItemStreamItemReaderTe protected void pointToEmptyInput(ItemReader tested) throws Exception { JpaPagingItemReader reader = (JpaPagingItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); reader.setQueryString("select f from Foo f where f.id = -1"); reader.afterPropertiesSet(); reader.open(new ExecutionContext()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java index fe46f9e8f..5774c5f9f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleColumnJdbcDrivingQueryItemReaderCommonTests.java @@ -25,10 +25,10 @@ public class SingleColumnJdbcDrivingQueryItemReaderCommonTests extends CommonDat protected void pointToEmptyInput(ItemReader tested) throws Exception { FooItemReader fooReader = (FooItemReader) tested; - fooReader.close(new ExecutionContext()); + fooReader.close(); DrivingQueryItemReader reader = new DrivingQueryItemReader(); - reader.close(new ExecutionContext()); + reader.close(); JdbcTemplate jdbcTemplate = new JdbcTemplate(getDataSource()); SingleColumnJdbcKeyCollector keyCollector = new SingleColumnJdbcKeyCollector(jdbcTemplate, diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java index 3c62151ac..33e20ff71 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java @@ -36,7 +36,7 @@ public class FlatFileItemReaderCommonTests extends CommonItemStreamItemReaderTes @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { FlatFileItemReader reader = (FlatFileItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); reader.setResource(new ByteArrayResource("".getBytes())); reader.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java index 7bfbb4a11..31d98dea0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java @@ -62,7 +62,7 @@ public class FlatFileItemReaderTests { reader.update(executionContext); - reader.close(executionContext); + reader.close(); reader.open(executionContext); @@ -86,7 +86,7 @@ public class FlatFileItemReaderTests { assertEquals(2, executionContext.getInt(ClassUtils.getShortName(FlatFileItemReader.class) + ".read.count")); // close input - reader.close(executionContext); + reader.close(); reader .setResource(getInputResource("header\nignoreme\ntestLine1\ntestLine2\ntestLine3\ntestLine4\ntestLine5\ntestLine6")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java index 23ab09c93..f31ee0feb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java @@ -93,7 +93,7 @@ public class FlatFileItemWriterTests { if (reader != null) { reader.close(); } - writer.close(null); + writer.close(); outputFile.delete(); } @@ -138,7 +138,7 @@ public class FlatFileItemWriterTests { public void testWriteString() throws Exception { writer.open(executionContext); writer.write(Collections.singletonList(TEST_STRING)); - writer.close(null); + writer.close(); String lineFromFile = readLine(); assertEquals(TEST_STRING, lineFromFile); @@ -223,7 +223,7 @@ public class FlatFileItemWriterTests { // get restart data writer.update(executionContext); // close template - writer.close(executionContext); + writer.close(); // init with correct data writer.open(executionContext); @@ -232,7 +232,7 @@ public class FlatFileItemWriterTests { // get statistics writer.update(executionContext); // close template - writer.close(executionContext); + writer.close(); // verify what was written to the file for (int i = 1; i <= 8; i++) { @@ -303,7 +303,7 @@ public class FlatFileItemWriterTests { catch (ItemStreamException e) { assertTrue(e.getCause() instanceof UnsupportedCharsetException); } - writer.close(null); + writer.close(); } @Test @@ -328,7 +328,7 @@ public class FlatFileItemWriterTests { }); writer.open(executionContext); writer.write(Collections.singletonList(TEST_STRING)); - writer.close(executionContext); + writer.close(); assertEquals(TEST_STRING, readLine()); assertEquals("a", readLine()); assertEquals("b", readLine()); @@ -345,7 +345,7 @@ public class FlatFileItemWriterTests { }); writer.open(executionContext); writer.write(Collections.singletonList(TEST_STRING)); - writer.close(null); + writer.close(); String lineFromFile = readLine(); assertEquals("a", lineFromFile); lineFromFile = readLine(); @@ -365,10 +365,10 @@ public class FlatFileItemWriterTests { }); writer.open(executionContext); writer.write(Collections.singletonList(TEST_STRING)); - writer.close(executionContext); + writer.close(); writer.open(executionContext); writer.write(Collections.singletonList(TEST_STRING)); - writer.close(executionContext); + writer.close(); String lineFromFile = readLine(); assertEquals("a", lineFromFile); lineFromFile = readLine(); @@ -392,7 +392,7 @@ public class FlatFileItemWriterTests { writer.write(Collections.singletonList(TEST_STRING)); writer.update(executionContext); writer.write(Collections.singletonList(TEST_STRING)); - writer.close(executionContext); + writer.close(); String lineFromFile = readLine(); assertEquals("a", lineFromFile); lineFromFile = readLine(); @@ -401,7 +401,7 @@ public class FlatFileItemWriterTests { assertEquals(TEST_STRING, lineFromFile); writer.open(executionContext); writer.write(Collections.singletonList(TEST_STRING)); - writer.close(executionContext); + writer.close(); reader = null; lineFromFile = readLine(); assertEquals("a", lineFromFile); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java index 9d1aeb631..808346fce 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java @@ -53,7 +53,7 @@ public class MultiResourceItemReaderFlatFileTests extends protected void pointToEmptyInput(ItemReader tested) throws Exception { MultiResourceItemReader multiReader = (MultiResourceItemReader) tested; - multiReader.close(new ExecutionContext()); + multiReader.close(); multiReader.setResources(new Resource[] { new ByteArrayResource("" .getBytes()) }); multiReader.open(new ExecutionContext()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java index c7ff93b94..b848c1f2a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java @@ -64,7 +64,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { assertEquals("8", tested.read()); assertEquals(null, tested.read()); - tested.close(ctx); + tested.close(); } public void testRestartWhenStateNotSaved() throws Exception { @@ -80,7 +80,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { assertEquals("2", tested.read()); assertEquals("3", tested.read()); - tested.close(ctx); + tested.close(); tested.open(ctx); @@ -103,7 +103,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { assertEquals("2", tested.read()); assertEquals("3", tested.read()); - tested.close(ctx); + tested.close(); tested.open(ctx); @@ -111,7 +111,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { assertEquals("3", tested.read()); assertEquals("4", tested.read()); - tested.close(ctx); + tested.close(); tested.open(ctx); @@ -125,7 +125,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { assertEquals("6", tested.read()); assertEquals("7", tested.read()); - tested.close(ctx); + tested.close(); tested.open(ctx); @@ -135,7 +135,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { assertEquals("8", tested.read()); assertEquals(null, tested.read()); - tested.close(ctx); + tested.close(); } /** @@ -155,7 +155,7 @@ public class MultiResourceItemReaderIntegrationTests extends TestCase { assertEquals("5", tested.read()); assertEquals("6", tested.read()); - tested.close(ctx); + tested.close(); tested.open(ctx); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java index 0749122ce..ef7e00106 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java @@ -79,7 +79,7 @@ public class MultiResourceItemReaderXmlTests extends CommonItemStreamItemReaderT protected void pointToEmptyInput(ItemReader tested) throws Exception { MultiResourceItemReader multiReader = (MultiResourceItemReader) tested; - multiReader.close(new ExecutionContext()); + multiReader.close(); multiReader.setResources(new Resource[] { new ByteArrayResource("" .getBytes()) }); multiReader.open(new ExecutionContext()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java index a54c5feee..6c1ca3b6d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java @@ -64,7 +64,7 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI assertEquals("4", readFile(part2)); tested.update(executionContext); - tested.close(executionContext); + tested.close(); tested.open(executionContext); tested.write(Arrays.asList("5")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java index 7af1f1a35..7d0652d82 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java @@ -71,11 +71,11 @@ public class CompositeItemStreamTests extends TestCase { public void testClose() { manager.register(new ItemStreamSupport() { - public void close(ExecutionContext executionContext) throws ItemStreamException { + public void close() throws ItemStreamException { list.add("bar"); } }); - manager.close(null); + manager.close(); assertEquals(1, list.size()); } @@ -86,7 +86,7 @@ public class CompositeItemStreamTests extends TestCase { } } }); manager.open(null); - manager.close(null); + manager.close(); manager.open(null); assertEquals(2, list.size()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java index d8efed48b..decdd0ae5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java @@ -63,7 +63,7 @@ public class StaxEventItemReaderCommonTests extends CommonItemStreamItemReaderTe protected void pointToEmptyInput(ItemReader tested) throws Exception { StaxEventItemReader reader = (StaxEventItemReader) tested; - reader.close(new ExecutionContext()); + reader.close(); reader.setResource(new ByteArrayResource("".getBytes())); reader.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java index 1a30ebd6e..9519e65fb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java @@ -94,7 +94,7 @@ public class StaxEventItemReaderTests { assertNotNull(source.read()); assertNull(source.read()); // there are only two fragments - source.close(executionContext); + source.close(); } /** @@ -136,7 +136,7 @@ public class StaxEventItemReaderTests { @Test public void testRestoreWorksFromClosedStream() throws Exception { - source.close(executionContext); + source.close(); source.update(executionContext); } @@ -168,7 +168,7 @@ public class StaxEventItemReaderTests { @Test public void testCloseWithoutOpen() throws Exception { - source.close(null); + source.close(); // No error! } @@ -187,7 +187,7 @@ public class StaxEventItemReaderTests { assertNotNull(item); assertTrue(newSource.isOpenCalled()); - newSource.close(null); + newSource.close(); newSource.setOpenCalled(false); // calling read again should require re-initialization because of close try { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java index 14ac9107d..11e0723d5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java @@ -70,7 +70,7 @@ public class StaxEventItemWriterTests { public void testWriteAndFlush() throws Exception { writer.open(executionContext); writer.write(items); - writer.close(executionContext); + writer.close(); String content = outputFileContent(); assertTrue("Wrong content: " + content, content.contains(TEST_STRING)); } @@ -84,13 +84,13 @@ public class StaxEventItemWriterTests { // write item writer.write(items); writer.update(executionContext); - writer.close(executionContext); + writer.close(); // create new writer from saved restart data and continue writing writer = createItemWriter(); writer.open(executionContext); writer.write(items); - writer.close(executionContext); + writer.close(); // check the output is concatenation of 'before restart' and 'after // restart' writes. @@ -183,7 +183,7 @@ public class StaxEventItemWriterTests { writer.setRootTagName("testroot"); writer.setRootElementAttributes(Collections. singletonMap("attribute", "value")); writer.open(executionContext); - writer.close(null); + writer.close(); String content = outputFileContent(); assertTrue(content.contains("")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java index 6a8ec11a7..c051b4214 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java @@ -83,7 +83,7 @@ public class TransactionalStaxEventItemWriterTests { return null; } }); - writer.close(executionContext); + writer.close(); String content = outputFileContent(); assertTrue("Wrong content: " + content, content.contains(TEST_STRING)); } @@ -126,7 +126,7 @@ public class TransactionalStaxEventItemWriterTests { catch (RuntimeException e) { // expected } - writer.close(executionContext); + writer.close(); writer.open(executionContext); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { public Object doInTransaction(TransactionStatus status) { @@ -139,7 +139,7 @@ public class TransactionalStaxEventItemWriterTests { return null; } }); - writer.close(executionContext); + writer.close(); String content = outputFileContent(); assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, ("
"))); assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, TEST_STRING)); @@ -178,7 +178,7 @@ public class TransactionalStaxEventItemWriterTests { } }); writer.update(executionContext); - writer.close(executionContext); + writer.close(); writer.open(executionContext); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { @@ -197,7 +197,7 @@ public class TransactionalStaxEventItemWriterTests { catch (RuntimeException e) { // expected } - writer.close(executionContext); + writer.close(); String content = outputFileContent(); assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, ("
"))); assertEquals("Wrong content: " + content, 1, StringUtils.countOccurrencesOf(content, TEST_STRING)); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java index fcfc64913..a94303f06 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDao.java @@ -69,7 +69,7 @@ public class FlatFileCustomerCreditDao implements CustomerCreditDao, public void close() throws Exception { if (itemWriter instanceof ItemStream) { - ((ItemStream) itemWriter).close(null); + ((ItemStream) itemWriter).close(); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java index d8dba01c9..9cfa40739 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/CustomItemReaderTests.java @@ -104,7 +104,7 @@ public class CustomItemReaderTests extends TestCase { } } - public void close(ExecutionContext executionContext) throws ItemStreamException {} + public void close() throws ItemStreamException {} public void update(ExecutionContext executionContext) throws ItemStreamException { executionContext.putInt(CURRENT_INDEX, currentIndex); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java index ce2c294c1..a94d4af93 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/FlatFileCustomerCreditDaoTests.java @@ -63,7 +63,7 @@ public class FlatFileCustomerCreditDaoTests { public void testClose() throws Exception{ //set-up outputSource mock - output.close(null); + output.close(); replay(output); //call tested method diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemReader.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemReader.java index b1c1cd810..9d4ad95a9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemReader.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemReader.java @@ -66,8 +66,8 @@ public class MultiLineTradeItemReader implements ItemReader, ItemStream { this.delegate = delegate; } - public void close(ExecutionContext executionContext) throws ItemStreamException { - this.delegate.close(executionContext); + public void close() throws ItemStreamException { + this.delegate.close(); } public void open(ExecutionContext executionContext) throws ItemStreamException { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java index c41e0c5b6..b82df72f8 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/internal/MultiLineTradeItemWriter.java @@ -49,8 +49,8 @@ public class MultiLineTradeItemWriter implements ItemWriter, ItemStream { this.delegate = delegate; } - public void close(ExecutionContext executionContext) throws ItemStreamException { - this.delegate.close(executionContext); + public void close() throws ItemStreamException { + this.delegate.close(); } public void open(ExecutionContext executionContext) throws ItemStreamException {