Rename provider package as "reader"

spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java

@@ -1,7 +1,7 @@
 package org.springframework.batch.io.driving;
 
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.batch.restart.Restartable;
 import org.springframework.beans.factory.DisposableBean;

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

@@ -18,7 +18,7 @@ package org.springframework.batch.item;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 
 public class ItemProviderTests extends TestCase {
 

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 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.reader.AggregateItemReader;
 
 public class AggregateItemReaderTests extends TestCase {
 

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

@@ -1,9 +1,10 @@
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.batch.io.sample.domain.FooService;
+import org.springframework.batch.item.reader.ItemReaderAdapter;
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
 
 /**

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.Properties;
 
@@ -22,6 +22,8 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.io.Skippable;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
+import org.springframework.batch.item.reader.DelegatingItemReader;
 import org.springframework.batch.restart.GenericRestartData;
 import org.springframework.batch.restart.RestartData;
 import org.springframework.batch.restart.Restartable;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 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.reader.JmsItemReader;
 import org.springframework.jms.core.JmsOperations;
 
 public class JmsItemReaderTests extends TestCase {

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

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.batch.item.reader.ListItemReader;
+
 import junit.framework.TestCase;
 
 public class ListItemReaderTests extends TestCase {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 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.reader.ListItemReader;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.batch.support.transaction.TransactionAwareProxyFactory;
 import org.springframework.transaction.PlatformTransactionManager;

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

@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item.provider;
+package org.springframework.batch.item.reader;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
 import org.springframework.batch.io.exception.ValidationException;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
+import org.springframework.batch.item.reader.ValidatingItemReader;
 import org.springframework.batch.item.validator.Validator;
 
 /**

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.ItemProcessor;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 
 public class ItemReaderRepeatCallbackTests extends TestCase {
 

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

@@ -22,7 +22,7 @@ import org.springframework.batch.io.file.SimpleFlatFileItemReader;
 import org.springframework.batch.io.file.mapping.FieldSet;
 import org.springframework.batch.io.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.DelegatingItemReader;
+import org.springframework.batch.item.reader.DelegatingItemReader;
 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

@@ -17,7 +17,7 @@
 package org.springframework.batch.repeat.support;
 
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.AbstractItemReader;
+import org.springframework.batch.item.reader.AbstractItemReader;
 import org.springframework.batch.repeat.RepeatCallback;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.ExitStatus;

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.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 
 public class ListItemReaderRecoverer extends ListItemReader implements ItemReader, ItemRecoverer {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java

@@ -23,7 +23,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.retry.ListItemReaderRecoverer;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.context.RetryContextSupport;

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java

@@ -26,7 +26,7 @@ import junit.framework.TestCase;
 import org.springframework.batch.item.FailedItemIdentifier;
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.item.provider.ListItemReader;
+import org.springframework.batch.item.reader.ListItemReader;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
 import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;