Move specific reader/writer to subpackages

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.batch.item;
 
+import org.springframework.batch.item.support.AbstractItemReader;
+
 import junit.framework.TestCase;
 
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java

@@ -1,6 +1,8 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.file;
 
-import org.springframework.batch.item.file.FlatFileItemReader;
+import org.springframework.batch.item.CommonItemStreamItemReaderTests;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.sample.Foo;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java

@@ -1,8 +1,8 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.file;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.file.FlatFileItemReader;
+import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.PassThroughFieldSetMapper;
 import org.springframework.core.io.ByteArrayResource;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java

@@ -1,10 +1,13 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.file;
 
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.Attribute;
 import javax.xml.stream.events.StartElement;
 
+import org.springframework.batch.item.CommonItemStreamItemReaderTests;
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.sample.Foo;
 import org.springframework.batch.item.xml.EventReaderDeserializer;
 import org.springframework.batch.item.xml.StaxEventItemReader;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/SortedMultiResourceItemReaderTests.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.file;
 
 import java.util.Comparator;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemReaderTests.java

@@ -18,7 +18,6 @@ package org.springframework.batch.item.support;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/ExecutionContextUserSupportTests.java

@@ -1,4 +1,6 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.util;
+
+import org.springframework.batch.item.util.ExecutionContextUserSupport;
 
 import junit.framework.TestCase;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidatingItemReaderTests.java

@@ -18,8 +18,8 @@ package org.springframework.batch.item.validator;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.support.AbstractItemReader;
 
 /**
  * @author Lucas Ward

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemReaderRepeatCallbackTests.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.item.support.ListItemReader;
 
 public class ItemReaderRepeatCallbackTests extends TestCase {

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java

@@ -18,11 +18,11 @@ package org.springframework.batch.repeat.support;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java

@@ -16,8 +16,8 @@
 
 package org.springframework.batch.repeat.support;
 
-import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.support.AbstractItemReader;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatCallback;
 import org.springframework.batch.repeat.RepeatContext;