Move specific reader/writer to subpackages

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepIntegrationTests.java

@@ -33,9 +33,9 @@ import org.springframework.batch.core.repository.dao.MapJobExecutionDao;
 import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.JobRepositoryFactoryBean;
-import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
 import org.springframework.batch.repeat.support.RepeatTemplate;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java

@@ -41,8 +41,6 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.core.step.JobRepositorySupport;
 import org.springframework.batch.core.step.StepInterruptionPolicy;
-import org.springframework.batch.item.AbstractItemReader;
-import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
@@ -51,6 +49,8 @@ import org.springframework.batch.item.ItemStreamSupport;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.MarkFailedException;
 import org.springframework.batch.item.ResetFailedException;
+import org.springframework.batch.item.support.AbstractItemReader;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.policy.DefaultResultCompletionPolicy;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java

@@ -36,9 +36,9 @@ import org.springframework.batch.core.repository.dao.MapJobInstanceDao;
 import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.step.AbstractStep;
-import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.exception.ExceptionHandler;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java

@@ -38,10 +38,10 @@ import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.core.step.skip.SkipLimitExceededException;
-import org.springframework.batch.item.AbstractItemReader;
-import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemWriter;
+import org.springframework.batch.item.support.AbstractItemReader;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.item.support.ListItemReader;
 import org.springframework.batch.retry.RetryException;
 import org.springframework.batch.retry.policy.RetryCacheCapacityExceededException;

spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java

@@ -32,8 +32,8 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.step.StepExecutionSynchronizer;
 import org.springframework.batch.core.step.item.ItemOrientedStep;
 import org.springframework.batch.core.step.item.SimpleItemHandler;
-import org.springframework.batch.item.AbstractItemReader;
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemReader;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
 import org.springframework.batch.repeat.support.RepeatTemplate;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;

spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java

@@ -21,8 +21,8 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ItemRecoverer;
+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;

spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java

@@ -21,9 +21,9 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.item.AbstractItemReader;
-import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemRecoverer;
+import org.springframework.batch.item.support.AbstractItemReader;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.jms.ExternalRetryInBatchTests;
 import org.springframework.batch.retry.RecoveryCallback;
 import org.springframework.batch.retry.RetryCallback;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java

@@ -21,9 +21,9 @@ import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.StatelessSession;
-import org.springframework.batch.item.AbstractBufferedItemReaderItemStream;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
+import org.springframework.batch.item.support.AbstractBufferedItemReaderItemStream;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java

@@ -27,9 +27,9 @@ import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.item.AbstractBufferedItemReaderItemStream;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
+import org.springframework.batch.item.support.AbstractBufferedItemReaderItemStream;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.jdbc.SQLWarningException;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/IbatisKeyCollector.java

@@ -3,9 +3,9 @@ package org.springframework.batch.item.database.support;
 import java.util.List;
 
 import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ExecutionContextUserSupport;
 import org.springframework.batch.item.database.DrivingQueryItemReader;
 import org.springframework.batch.item.database.KeyCollector;
+import org.springframework.batch.item.util.ExecutionContextUserSupport;
 import org.springframework.orm.ibatis.SqlMapClientTemplate;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/MultipleColumnJdbcKeyCollector.java

@@ -20,10 +20,10 @@ import java.sql.SQLException;
 import java.util.List;
 
 import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ExecutionContextUserSupport;
 import org.springframework.batch.item.database.DrivingQueryItemReader;
 import org.springframework.batch.item.database.ItemPreparedStatementSetter;
 import org.springframework.batch.item.database.KeyCollector;
+import org.springframework.batch.item.util.ExecutionContextUserSupport;
 import org.springframework.jdbc.core.ColumnMapRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.PreparedStatementSetter;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SingleColumnJdbcKeyCollector.java

@@ -18,8 +18,8 @@ package org.springframework.batch.item.database.support;
 import java.util.List;
 
 import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ExecutionContextUserSupport;
 import org.springframework.batch.item.database.KeyCollector;
+import org.springframework.batch.item.util.ExecutionContextUserSupport;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.SingleColumnRowMapper;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java

@@ -18,12 +18,10 @@ package org.springframework.batch.item.file;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.item.AbstractBufferedItemReaderItemStream;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemReaderException;
 import org.springframework.batch.item.ItemStreamException;
 import org.springframework.batch.item.ReaderNotOpenException;
-import org.springframework.batch.item.ResourceAwareItemReaderItemStream;
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.separator.LineReader;
@@ -32,6 +30,7 @@ import org.springframework.batch.item.file.separator.ResourceLineReader;
 import org.springframework.batch.item.file.transform.AbstractLineTokenizer;
 import org.springframework.batch.item.file.transform.DelimitedLineTokenizer;
 import org.springframework.batch.item.file.transform.LineTokenizer;
+import org.springframework.batch.item.support.AbstractBufferedItemReaderItemStream;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java

@@ -30,7 +30,6 @@ import java.util.List;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.ExecutionContext;
-import org.springframework.batch.item.ExecutionContextUserSupport;
 import org.springframework.batch.item.FlushFailedException;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemStreamException;
@@ -41,6 +40,7 @@ import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetCreator;
 import org.springframework.batch.item.file.transform.DelimitedLineAggregator;
 import org.springframework.batch.item.file.transform.LineAggregator;
+import org.springframework.batch.item.util.ExecutionContextUserSupport;
 import org.springframework.batch.item.util.FileUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java

@@ -1,9 +1,19 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.file;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemStream;
+import org.springframework.batch.item.ItemStreamException;
+import org.springframework.batch.item.MarkFailedException;
+import org.springframework.batch.item.NoWorkFoundException;
+import org.springframework.batch.item.ParseException;
+import org.springframework.batch.item.ResetFailedException;
+import org.springframework.batch.item.UnexpectedInputException;
+import org.springframework.batch.item.util.ExecutionContextUserSupport;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourceAwareItemReaderItemStream.java

@@ -1,5 +1,7 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.file;
 
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemStream;
 import org.springframework.core.io.Resource;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SortedMultiResourceItemReader.java

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

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java

@@ -22,12 +22,12 @@ import javax.jms.Message;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.NewItemIdentifier;
 import org.springframework.batch.item.ItemKeyGenerator;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemRecoverer;
 import org.springframework.batch.item.UnexpectedInputException;
+import org.springframework.batch.item.support.AbstractItemReader;
 import org.springframework.jms.JmsException;
 import org.springframework.jms.core.JmsOperations;
 import org.springframework.jms.core.JmsTemplate;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractBufferedItemReaderItemStream.java

@@ -1,9 +1,19 @@
-package org.springframework.batch.item;
+package org.springframework.batch.item.support;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 
+import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemStream;
+import org.springframework.batch.item.ItemStreamException;
+import org.springframework.batch.item.MarkFailedException;
+import org.springframework.batch.item.NoWorkFoundException;
+import org.springframework.batch.item.ParseException;
+import org.springframework.batch.item.ResetFailedException;
+import org.springframework.batch.item.UnexpectedInputException;
+import org.springframework.batch.item.util.ExecutionContextUserSupport;
 import org.springframework.util.Assert;
 
 /**
@@ -91,7 +101,7 @@ public abstract class AbstractBufferedItemReaderItemStream implements ItemReader
 	 * counter, keeping track of the current position, so multiple threads
 	 * cannot be accommodated.
 	 * 
-	 * @see org.springframework.batch.item.AbstractItemReader#mark()
+	 * @see org.springframework.batch.item.support.AbstractItemReader#mark()
 	 */
 	public void mark() throws MarkFailedException {
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemReader.java

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item;
+package org.springframework.batch.item.support;
+
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.MarkFailedException;
+import org.springframework.batch.item.ResetFailedException;
 
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemReader.java

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item;
+package org.springframework.batch.item.support;
+
+import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemStreamSupport;
 
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemWriter.java

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.item;
+package org.springframework.batch.item.support;
+
+import org.springframework.batch.item.ItemStreamSupport;
+import org.springframework.batch.item.ItemWriter;
 
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemWriter.java

@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item;
+package org.springframework.batch.item.support;
+
+import org.springframework.batch.item.ClearFailedException;
+import org.springframework.batch.item.FlushFailedException;
+import org.springframework.batch.item.ItemWriter;
 
 /**
  * Abstract {@link ItemWriter} that allows for base classes to only implement

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/DelegatingItemReader.java

@@ -16,7 +16,6 @@
 
 package org.springframework.batch.item.support;
 
-import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java

@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.aop.support.AopUtils;
-import org.springframework.batch.item.AbstractItemReader;
 import org.springframework.batch.item.ItemReader;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/util/ExecutionContextUserSupport.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.item;
+package org.springframework.batch.item.util;
 
+import org.springframework.batch.item.ExecutionContext;
 import org.springframework.util.Assert;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java

@@ -8,8 +8,8 @@ import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.StartElement;
 
-import org.springframework.batch.item.AbstractBufferedItemReaderItemStream;
-import org.springframework.batch.item.ResourceAwareItemReaderItemStream;
+import org.springframework.batch.item.file.ResourceAwareItemReaderItemStream;
+import org.springframework.batch.item.support.AbstractBufferedItemReaderItemStream;
 import org.springframework.batch.item.xml.stax.DefaultFragmentEventReader;
 import org.springframework.batch.item.xml.stax.FragmentEventReader;
 import org.springframework.beans.factory.InitializingBean;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java

@@ -18,10 +18,10 @@ import javax.xml.stream.XMLStreamException;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.ExecutionContext;
-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.util.ExecutionContextUserSupport;
 import org.springframework.batch.item.util.FileUtils;
 import org.springframework.batch.item.xml.stax.NoStartEndDocumentStreamWriter;
 import org.springframework.beans.factory.InitializingBean;

spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java

@@ -32,9 +32,9 @@ public class ExitStatus implements Serializable {
 
 	/**
 	 * Convenient constant value representing unknown state - assumed
-	 * continuable.
+	 * not continuable.
 	 */
-	public static final ExitStatus UNKNOWN = new ExitStatus(true, "UNKNOWN");
+	public static final ExitStatus UNKNOWN = new ExitStatus(false, "UNKNOWN");
 
 	/**
 	 * Convenient constant value representing unfinished processing.

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;

spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.integration.item;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.beans.factory.annotation.Required;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.message.GenericMessage;

spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java

@@ -9,7 +9,7 @@ import org.springframework.batch.core.step.skip.AlwaysSkipItemSkipPolicy;
 import org.springframework.batch.integration.chunk.ChunkRequest;
 import org.springframework.batch.integration.chunk.ChunkResponse;
 import org.springframework.batch.integration.chunk.ItemWriterChunkHandler;
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.util.StringUtils;
 

spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java

@@ -2,7 +2,7 @@ package org.springframework.batch.integration.chunk;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.stereotype.Component;
 
 @Component

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseWriter.java

@@ -2,7 +2,7 @@ package org.springframework.batch.sample.item.writer;
 
 import java.math.BigDecimal;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.CustomerCreditDao;
 import org.springframework.batch.sample.domain.CustomerCredit;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateWriter.java

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.item.writer;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.CustomerCreditDao;
 import org.springframework.batch.sample.domain.CustomerCredit;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/CustomerUpdateWriter.java

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.sample.item.writer;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.CustomerDebitDao;
 import org.springframework.batch.sample.dao.JdbcCustomerDebitDao;
 import org.springframework.batch.sample.domain.CustomerDebit;

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/DummyItemWriter.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.sample.item.writer;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 
 /**
  * @author Dave Syer

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/ItemTrackingItemWriter.java

@@ -3,7 +3,7 @@ package org.springframework.batch.sample.item.writer;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.item.validator.ValidationException;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PersonWriter.java

@@ -18,7 +18,7 @@ package org.springframework.batch.sample.item.writer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.domain.Person;
 
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/PlayerItemWriter.java

@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.item.writer;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.PlayerDao;
 import org.springframework.batch.sample.domain.Player;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriter.java

@@ -1,6 +1,6 @@
 package org.springframework.batch.sample.item.writer;
 
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 
 /**
  * Simulates temporary output trouble - requires to

spring-batch-samples/src/main/java/org/springframework/batch/sample/item/writer/TradeWriter.java

@@ -18,7 +18,7 @@ package org.springframework.batch.sample.item.writer;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.item.AbstractItemWriter;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.dao.TradeDao;
 import org.springframework.batch.sample.domain.Trade;
 

spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml

@@ -35,7 +35,7 @@
 
 	<!-- This input source is injected into the test case to verify the output - not used by the job at all -->
 	<bean id="testItemReader"
-		class="org.springframework.batch.item.SortedMultiResourceItemReader">
+		class="org.springframework.batch.item.file.SortedMultiResourceItemReader">
 		<property name="resources"
 			value="classpath:data/multiResourceJob/input/file-*.txt" />
 		<property name="delegate" ref="flatFileItemReader" />

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java

@@ -9,9 +9,9 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.file.transform.LineAggregator;
+import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.sample.StubLineAggregator;
 import org.springframework.batch.sample.domain.Address;
 import org.springframework.batch.sample.domain.BillingInfo;