[BATCH-430] Rearranged package structure to remove technical packages

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

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.item;
 
-import org.springframework.batch.common.AbstractExceptionTests;
+import org.springframework.batch.support.AbstractExceptionTests;
 
 public class ItemStreamExceptionTests extends AbstractExceptionTests {
 

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

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.item;
 
-import org.springframework.batch.common.AbstractExceptionTests;
+import org.springframework.batch.support.AbstractExceptionTests;
 
 public class MarkFailedExceptionTests extends AbstractExceptionTests {
 

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

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.item;
 
-import org.springframework.batch.common.AbstractExceptionTests;
+import org.springframework.batch.support.AbstractExceptionTests;
 
 public class ResetFailedExceptionTests extends AbstractExceptionTests {
 

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

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.item;
 
-import org.springframework.batch.repeat.exception.AbstractExceptionTests;
+import org.springframework.batch.repeat.AbstractExceptionTests;
 
 public class UnexpectedInputExceptionTests extends AbstractExceptionTests {
 

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

@@ -1,7 +1,9 @@
-package org.springframework.batch.support;
+package org.springframework.batch.item.adapter;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator;
+import org.springframework.batch.item.adapter.DynamicMethodInvocationException;
 import org.springframework.batch.item.sample.Foo;
 import org.springframework.batch.item.sample.FooService;
 import org.springframework.util.Assert;

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

@@ -13,13 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.support;
+package org.springframework.batch.item.database.support;
 
 import javax.sql.DataSource;
 
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
+import org.springframework.batch.item.database.support.DefaultDataFieldMaxValueIncrementerFactory;
 import org.springframework.jdbc.support.incrementer.DB2SequenceMaxValueIncrementer;
 import org.springframework.jdbc.support.incrementer.DerbyMaxValueIncrementer;
 import org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer;

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

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.item.file;
 
-import org.springframework.batch.common.AbstractExceptionTests;
+import org.springframework.batch.support.AbstractExceptionTests;
 
 
 public class FlatFileParseExceptionTests extends AbstractExceptionTests {

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

@@ -16,7 +16,7 @@
 
 package org.springframework.batch.item.validator;
 
-import org.springframework.batch.repeat.exception.AbstractExceptionTests;
+import org.springframework.batch.repeat.AbstractExceptionTests;
 
 public class ValidationExceptionTests extends AbstractExceptionTests {
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.exception;
+package org.springframework.batch.repeat;
 
 import junit.framework.TestCase;
 

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.exception;
+package org.springframework.batch.repeat;
+
+import org.springframework.batch.repeat.RepeatException;
 
 public class RepeatExceptionTests extends AbstractExceptionTests {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.exception.handler;
+package org.springframework.batch.repeat.exception;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,6 +22,8 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.springframework.batch.repeat.RepeatContext;
+import org.springframework.batch.repeat.exception.CompositeExceptionHandler;
+import org.springframework.batch.repeat.exception.ExceptionHandler;
 
 public class CompositeExceptionHandlerTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/DefaultExceptionHandlerTests.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.exception.handler;
+package org.springframework.batch.repeat.exception;
 
 import junit.framework.TestCase;
 
 import org.springframework.batch.repeat.RepeatContext;
-import org.springframework.batch.repeat.exception.RepeatException;
+import org.springframework.batch.repeat.RepeatException;
+import org.springframework.batch.repeat.exception.DefaultExceptionHandler;
 
 public class DefaultExceptionHandlerTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.exception.handler;
+package org.springframework.batch.repeat.exception;
 
 import java.io.StringWriter;
 
@@ -24,9 +24,10 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
 import org.apache.log4j.WriterAppender;
-import org.springframework.batch.common.ExceptionClassifierSupport;
 import org.springframework.batch.repeat.RepeatContext;
-import org.springframework.batch.repeat.exception.RepeatException;
+import org.springframework.batch.repeat.RepeatException;
+import org.springframework.batch.repeat.exception.LogOrRethrowExceptionHandler;
+import org.springframework.batch.support.ExceptionClassifierSupport;
 
 public class LogOrRethrowExceptionHandlerTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java

@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.exception.handler;
+package org.springframework.batch.repeat.exception;
 
 import java.util.Collections;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.common.ExceptionClassifierSupport;
 import org.springframework.batch.repeat.RepeatContext;
+import org.springframework.batch.repeat.RepeatException;
 import org.springframework.batch.repeat.context.RepeatContextCounter;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
-import org.springframework.batch.repeat.exception.RepeatException;
+import org.springframework.batch.repeat.exception.RethrowOnThresholdExceptionHandler;
+import org.springframework.batch.support.ExceptionClassifierSupport;
 
 public class RethrowOnThresholdExceptionHandlerTests extends TestCase {
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.exception.handler;
+package org.springframework.batch.repeat.exception;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -23,6 +23,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.springframework.batch.repeat.context.RepeatContextSupport;
+import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler;
 
 /**
  * Unit tests for {@link SimpleLimitExceptionHandler}

spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.aop;
+package org.springframework.batch.repeat.interceptor;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
@@ -29,8 +29,9 @@ import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatCallback;
+import org.springframework.batch.repeat.RepeatException;
 import org.springframework.batch.repeat.RepeatOperations;
-import org.springframework.batch.repeat.exception.RepeatException;
+import org.springframework.batch.repeat.interceptor.RepeatOperationsInterceptor;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
 import org.springframework.batch.repeat.support.RepeatTemplate;
 

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

@@ -25,7 +25,7 @@ import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.callback.ItemReaderRepeatCallback;
 import org.springframework.batch.repeat.callback.NestedRepeatCallback;
 import org.springframework.batch.repeat.context.RepeatContextSupport;
-import org.springframework.batch.repeat.exception.handler.ExceptionHandler;
+import org.springframework.batch.repeat.exception.ExceptionHandler;
 import org.springframework.batch.repeat.policy.CompletionPolicySupport;
 import org.springframework.batch.repeat.policy.SimpleCompletionPolicy;
 import org.springframework.batch.repeat.synch.RepeatSynchronizationManager;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.repeat.exception;
+package org.springframework.batch.retry;
 
 import junit.framework.TestCase;
 

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.exception;
+package org.springframework.batch.retry;
+
+import org.springframework.batch.retry.backoff.BackOffInterruptedException;
 
 public class BackOffInterruptedExceptionTests extends AbstractExceptionTests {
 

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.exception;
+package org.springframework.batch.retry;
+
+import org.springframework.batch.retry.ExhaustedRetryException;
 
 public class ExhaustedRetryExceptionTests extends AbstractExceptionTests {
 

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.exception;
+package org.springframework.batch.retry;
+
+import org.springframework.batch.retry.RetryException;
 
 public class RetryExceptionTests extends AbstractExceptionTests {
 

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.exception;
+package org.springframework.batch.retry;
+
+import org.springframework.batch.retry.TerminatedRetryException;
 
 public class TerminatedRetryExceptionTests extends AbstractExceptionTests {
 

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

@@ -25,9 +25,9 @@ import junit.framework.TestCase;
 import org.springframework.batch.item.AbstractItemWriter;
 import org.springframework.batch.retry.ListItemReaderRecoverer;
 import org.springframework.batch.retry.RetryContext;
+import org.springframework.batch.retry.RetryException;
+import org.springframework.batch.retry.TerminatedRetryException;
 import org.springframework.batch.retry.context.RetryContextSupport;
-import org.springframework.batch.retry.exception.RetryException;
-import org.springframework.batch.retry.exception.TerminatedRetryException;
 import org.springframework.batch.retry.policy.NeverRetryPolicy;
 import org.springframework.batch.retry.support.RetryTemplate;
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryOperationsInterceptorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.retry.aop;
+package org.springframework.batch.retry.interceptor;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;
@@ -28,6 +28,7 @@ import org.aopalliance.intercept.MethodInvocation;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.aop.target.SingletonTargetSource;
+import org.springframework.batch.retry.interceptor.RetryOperationsInterceptor;
 import org.springframework.batch.retry.policy.NeverRetryPolicy;
 import org.springframework.batch.retry.policy.SimpleRetryPolicy;
 import org.springframework.batch.retry.support.RetryTemplate;

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java

@@ -24,7 +24,7 @@ import junit.framework.TestCase;
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.RetryListener;
-import org.springframework.batch.retry.exception.TerminatedRetryException;
+import org.springframework.batch.retry.TerminatedRetryException;
 import org.springframework.batch.retry.policy.NeverRetryPolicy;
 import org.springframework.batch.retry.support.RetryTemplate;
 

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

@@ -23,7 +23,7 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.RetryPolicy;
-import org.springframework.batch.retry.exception.TerminatedRetryException;
+import org.springframework.batch.retry.TerminatedRetryException;
 import org.springframework.batch.retry.synch.RetrySynchronizationManager;
 
 public class CompositeRetryPolicyTests extends TestCase {

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

@@ -22,9 +22,9 @@ import java.util.Map;
 
 import junit.framework.TestCase;
 
-import org.springframework.batch.common.ExceptionClassifierSupport;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.synch.RetrySynchronizationManager;
+import org.springframework.batch.support.ExceptionClassifierSupport;
 
 public class ExceptionClassifierRetryPolicyTests extends TestCase {
 

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

@@ -22,8 +22,8 @@ import junit.framework.TestCase;
 
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;
+import org.springframework.batch.retry.TerminatedRetryException;
 import org.springframework.batch.retry.context.RetryContextSupport;
-import org.springframework.batch.retry.exception.TerminatedRetryException;
 import org.springframework.batch.retry.support.RetryTemplate;
 
 public class ExternalRetryPolicyTests extends TestCase {

spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java

@@ -18,13 +18,13 @@ package org.springframework.batch.retry.support;
 
 import junit.framework.TestCase;
 
+import org.springframework.batch.retry.ExhaustedRetryException;
 import org.springframework.batch.retry.RetryCallback;
 import org.springframework.batch.retry.RetryContext;
 import org.springframework.batch.retry.backoff.BackOffContext;
+import org.springframework.batch.retry.backoff.BackOffInterruptedException;
 import org.springframework.batch.retry.backoff.BackOffPolicy;
 import org.springframework.batch.retry.backoff.StatelessBackOffPolicy;
-import org.springframework.batch.retry.exception.BackOffInterruptedException;
-import org.springframework.batch.retry.exception.ExhaustedRetryException;
 import org.springframework.batch.retry.policy.NeverRetryPolicy;
 import org.springframework.batch.retry.policy.SimpleRetryPolicy;
 import org.springframework.batch.retry.synch.RetrySynchronizationManager;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.common;
+package org.springframework.batch.support;
 
 import junit.framework.TestCase;
 

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.common;
+package org.springframework.batch.support;
+
+import org.springframework.batch.support.BinaryExceptionClassifier;
 
 import junit.framework.TestCase;
 

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

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.common;
+package org.springframework.batch.support;
+
+import org.springframework.batch.support.ExceptionClassifierSupport;
 
 import junit.framework.TestCase;
 

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

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.common;
+package org.springframework.batch.support;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
 
+import org.springframework.batch.support.SubclassExceptionClassifier;
+
 import junit.framework.TestCase;
 
 public class SubclassExceptionClassifierTests extends TestCase {