-Infrastructure implementations of item provider concerns. -
- - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/package.html deleted file mode 100644 index ed777249f..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - --Generic implementations of ItemStream -
- - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AggregateItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemReader.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AggregateItemReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemReader.java index c17c46478..16d223e8f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/AggregateItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AggregateItemReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.support; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/CompositeItemStream.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/CompositeItemStream.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java index 6531f8337..68cce88eb 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/stream/CompositeItemStream.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.stream; +package org.springframework.batch.item.support; import java.util.ArrayList; import java.util.Arrays; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/CompositeItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java similarity index 93% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/CompositeItemWriter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java index 83afbdc3c..1c0b1298c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/CompositeItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java @@ -1,4 +1,4 @@ -package org.springframework.batch.item.writer; +package org.springframework.batch.item.support; import java.util.Iterator; import java.util.List; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/DelegatingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/DelegatingItemReader.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/DelegatingItemReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/DelegatingItemReader.java index dfaa3cf82..f463a95f0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/DelegatingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/DelegatingItemReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.support; import org.springframework.batch.item.AbstractItemReader; import org.springframework.batch.item.ItemReader; 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/support/DelegatingItemWriter.java similarity index 97% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/DelegatingItemWriter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/DelegatingItemWriter.java index a262fd563..65cb1baaa 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/support/DelegatingItemWriter.java @@ -1,4 +1,4 @@ -package org.springframework.batch.item.writer; +package org.springframework.batch.item.support; import org.springframework.batch.item.ClearFailedException; import org.springframework.batch.item.FlushFailedException; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ListItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ListItemReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java index 30a2149d5..20120e795 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/reader/ListItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.support; import java.util.ArrayList; import java.util.List; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java index baf45b39f..9ee2456dd 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/transform/ItemTransformerItemWriter.java @@ -1,7 +1,7 @@ package org.springframework.batch.item.transform; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.writer.DelegatingItemWriter; +import org.springframework.batch.item.support.DelegatingItemWriter; import org.springframework.util.Assert; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/FileUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/util/FileUtils.java similarity index 97% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/FileUtils.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/util/FileUtils.java index b516a0b3a..e0bddd591 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/FileUtils.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/util/FileUtils.java @@ -1,4 +1,4 @@ -package org.springframework.batch.item.support; +package org.springframework.batch.item.util; import java.io.File; import java.io.IOException; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemReader.java index fb661b5fd..48751a6ed 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemReader.java @@ -15,7 +15,7 @@ */ package org.springframework.batch.item.validator; -import org.springframework.batch.item.reader.DelegatingItemReader; +import org.springframework.batch.item.support.DelegatingItemReader; import org.springframework.util.Assert; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/package.html deleted file mode 100644 index 62d1077f5..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/writer/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - --Specific implementations of item processing concerns. -
- - 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 80a89a3f0..8c722e44b 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 @@ -21,7 +21,7 @@ import org.springframework.batch.item.ExecutionContextUserSupport; import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.item.support.FileUtils; +import org.springframework.batch.item.util.FileUtils; import org.springframework.batch.item.xml.stax.NoStartEndDocumentStreamWriter; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.io.Resource; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java similarity index 98% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java index 41167602b..cef265d6a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/JmsItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/JmsItemReaderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.jms; import java.util.Date; @@ -25,6 +25,7 @@ import javax.jms.Queue; import junit.framework.TestCase; import org.easymock.MockControl; +import org.springframework.batch.item.jms.JmsItemReader; import org.springframework.jms.core.JmsOperations; public class JmsItemReaderTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java similarity index 92% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java index c2965e46b..54a8f8eab 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/AggregateItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AggregateItemReaderTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.support; import java.util.Collection; import java.util.Iterator; @@ -7,6 +7,7 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.item.ItemReader; +import org.springframework.batch.item.support.AggregateItemReader; public class AggregateItemReaderTests extends TestCase { 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/support/CompositeItemWriterTests.java similarity index 91% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/CompositeItemWriterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemWriterTests.java index fc153c0db..fa648177a 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/support/CompositeItemWriterTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.item.writer; +package org.springframework.batch.item.support; import java.util.ArrayList; import java.util.Iterator; @@ -8,6 +8,7 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.item.ItemWriter; +import org.springframework.batch.item.support.CompositeItemWriter; /** * Tests for {@link CompositeItemWriter} diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemReaderTests.java similarity index 96% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemReaderTests.java index c609ecb30..66d707bc4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/DelegatingItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemReaderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.support; import junit.framework.TestCase; @@ -23,6 +23,7 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.Skippable; +import org.springframework.batch.item.support.DelegatingItemReader; /** * Unit test for {@link DelegatingItemReader} diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/DelegatingItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/DelegatingItemWriterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java index 48aba9040..ae7e11046 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/writer/DelegatingItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.writer; +package org.springframework.batch.item.support; import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.item.ItemWriter; +import org.springframework.batch.item.support.DelegatingItemWriter; /** * @author Lucas Ward diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java similarity index 92% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java index dba07faaa..93d8a0965 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/ListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ListItemReaderTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.support; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.springframework.batch.item.support.ListItemReader; + import junit.framework.TestCase; public class ListItemReaderTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/stream/SimpleStreamManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SimpleStreamManagerTests.java similarity index 77% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/stream/SimpleStreamManagerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SimpleStreamManagerTests.java index f2541151a..a0a9af1d1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/stream/SimpleStreamManagerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/SimpleStreamManagerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.item.stream; +package org.springframework.batch.item.support; import java.util.ArrayList; import java.util.List; @@ -24,6 +24,7 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.ItemStream; import org.springframework.batch.item.ItemStreamException; import org.springframework.batch.item.ItemStreamSupport; +import org.springframework.batch.item.support.CompositeItemStream; /** * @author Dave Syer @@ -37,7 +38,7 @@ public class SimpleStreamManagerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. + * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. */ public void testRegisterAndOpen() { ItemStreamSupport stream = new ItemStreamSupport() { @@ -52,7 +53,7 @@ public class SimpleStreamManagerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. + * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. */ public void testRegisterTwice() { ItemStreamSupport stream = new ItemStreamSupport() { @@ -68,7 +69,7 @@ public class SimpleStreamManagerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. + * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. */ public void testMark() { manager.register(new ItemStreamSupport() { @@ -82,7 +83,7 @@ public class SimpleStreamManagerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. + * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. */ public void testClose() { manager.register(new ItemStreamSupport() { @@ -96,7 +97,7 @@ public class SimpleStreamManagerTests extends TestCase { /** * Test method for - * {@link org.springframework.batch.item.stream.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. + * {@link org.springframework.batch.item.support.CompositeItemStream#commit(org.springframework.transaction.TransactionStatus)}. */ public void testCloseDoesNotUnregister() { manager.setStreams(new ItemStream[] { new ItemStreamSupport() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java similarity index 97% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java index 413c6c214..c7e653d21 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/reader/TransactionAwareListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.item.reader; +package org.springframework.batch.item.support; import java.util.ArrayList; import java.util.Arrays; @@ -22,6 +22,7 @@ import java.util.List; import junit.framework.TestCase; +import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; import org.springframework.transaction.PlatformTransactionManager; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/FileUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java similarity index 96% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/FileUtilsTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java index 19223df3c..12cfb26b2 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/FileUtilsTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.item.support; +package org.springframework.batch.item.util; import java.io.BufferedWriter; import java.io.File; @@ -7,6 +7,7 @@ import java.io.IOException; import junit.framework.TestCase; +import org.springframework.batch.item.util.FileUtils; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java index c15aeaf37..f641f3bd3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java @@ -23,7 +23,7 @@ import java.util.List; import junit.framework.TestCase; import org.springframework.batch.item.AbstractItemWriter; -import org.springframework.batch.item.reader.ListItemReader; +import org.springframework.batch.item.support.ListItemReader; public class ItemReaderRepeatCallbackTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java index f8a001463..34a538d19 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ListItemReaderRecoverer.java @@ -20,7 +20,7 @@ import java.util.List; import org.springframework.batch.item.ItemKeyGenerator; import org.springframework.batch.item.ItemRecoverer; -import org.springframework.batch.item.reader.ListItemReader; +import org.springframework.batch.item.support.ListItemReader; public class ListItemReaderRecoverer extends ListItemReader implements ItemRecoverer, ItemKeyGenerator { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java index ee2efd483..bed706b74 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java @@ -27,7 +27,7 @@ import org.springframework.batch.item.AbstractItemWriter; import org.springframework.batch.item.FailedItemIdentifier; import org.springframework.batch.item.ItemKeyGenerator; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.item.reader.ListItemReader; +import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; 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 5f24c1495..9d0e7fb9b 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 @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.batch.item.AbstractItemWriter; -import org.springframework.batch.item.reader.JmsItemReader; +import org.springframework.batch.item.jms.JmsItemReader; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.callback.ItemReaderRetryCallback; 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 cc7bdde62..2ae1bbf2b 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 @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.batch.item.AbstractItemWriter; -import org.springframework.batch.item.reader.JmsItemReader; +import org.springframework.batch.item.jms.JmsItemReader; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.callback.ItemReaderRetryCallback; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java index 2e88cdbd0..4a4074373 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java @@ -16,8 +16,8 @@ package org.springframework.batch.sample.dao; +import org.springframework.batch.item.support.DelegatingItemWriter; import org.springframework.batch.item.transform.ItemTransformer; -import org.springframework.batch.item.writer.DelegatingItemWriter; import org.springframework.batch.sample.item.writer.OrderWriter; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java index 1ea0ca915..09903a47d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/reader/OrderItemReader.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.item.reader.DelegatingItemReader; +import org.springframework.batch.item.support.DelegatingItemReader; import org.springframework.batch.sample.domain.Address; import org.springframework.batch.sample.domain.BillingInfo; import org.springframework.batch.sample.domain.Customer; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/OrderWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/OrderWriter.java index eda5e1aeb..f615b9a1d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/OrderWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/OrderWriter.java @@ -17,7 +17,7 @@ package org.springframework.batch.sample.item.writer; import org.springframework.batch.core.UnexpectedJobExecutionException; -import org.springframework.batch.item.writer.DelegatingItemWriter; +import org.springframework.batch.item.support.DelegatingItemWriter; import org.springframework.batch.sample.domain.Order; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java index a221e9964..c74728b26 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java @@ -18,7 +18,7 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.item.reader.AggregateItemReader; +import org.springframework.batch.item.support.AggregateItemReader; import org.springframework.batch.sample.domain.Trade; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxy.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxy.java index 73984904e..dfb82ba58 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxy.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxy.java @@ -19,7 +19,7 @@ package org.springframework.batch.sample.tasklet; import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.item.ItemReader; -import org.springframework.batch.item.reader.DelegatingItemReader; +import org.springframework.batch.item.support.DelegatingItemReader; /** * Hacked {@link ItemReader} that throws exception on a given record number diff --git a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml index 94204b05e..e5403f824 100644 --- a/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml @@ -23,7 +23,7 @@