diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java index 28936f79e..615d163dd 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandler.java @@ -16,7 +16,7 @@ package org.springframework.batch.execution.step.support; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.exception.handler.ExceptionHandler; +import org.springframework.batch.repeat.exception.ExceptionHandler; import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java index 0b24f9afa..04c95b4c6 100644 --- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/TaskletAdapter.java @@ -16,8 +16,8 @@ package org.springframework.batch.execution.tasklet; import org.springframework.batch.core.tasklet.Tasklet; +import org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator; import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.support.AbstractMethodInvokingDelegator; /** * A {@link Tasklet} that wraps a method in a POJO. By default the diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java index 9552a2a72..6db3446b5 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/SimpleJobTests.java @@ -46,7 +46,7 @@ import org.springframework.batch.item.AbstractItemReader; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.repeat.exception.handler.ExceptionHandler; +import org.springframework.batch.repeat.exception.ExceptionHandler; import org.springframework.batch.retry.RetryPolicy; import org.springframework.transaction.PlatformTransactionManager; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java index e7cc561e6..40bdb47a4 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/JobRepositoryFactoryBeanTests.java @@ -20,7 +20,7 @@ import javax.sql.DataSource; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.support.DataFieldMaxValueIncrementerFactory; +import org.springframework.batch.item.database.support.DataFieldMaxValueIncrementerFactory; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java index 8020023fe..aac474287 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/DefaultStepFactoryBeanTests.java @@ -40,7 +40,7 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.reader.ListItemReader; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.exception.handler.ExceptionHandler; +import org.springframework.batch.repeat.exception.ExceptionHandler; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java index a90e04484..dbdcf48a5 100644 --- a/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/support/SimpleRetryExceptionHandlerTests.java @@ -19,7 +19,7 @@ import junit.framework.TestCase; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.exception.handler.SimpleLimitExceptionHandler; +import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler; import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/package.html deleted file mode 100644 index 789feb3d7..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/package.html +++ /dev/null @@ -1,7 +0,0 @@ - -
--Infrastructure implementations of common concerns. -
- - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AbstractMethodInvokingDelegator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java similarity index 99% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AbstractMethodInvokingDelegator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java index 0058469f9..dfb3f041c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AbstractMethodInvokingDelegator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.support; +package org.springframework.batch.item.adapter; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DynamicMethodInvocationException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java similarity index 92% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DynamicMethodInvocationException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java index a8f5ad838..2886c1742 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DynamicMethodInvocationException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java @@ -1,4 +1,4 @@ -package org.springframework.batch.support; +package org.springframework.batch.item.adapter; import org.springframework.util.MethodInvoker; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java index 136ea9360..5ad110967 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java @@ -21,7 +21,6 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemStreamException; import org.springframework.batch.item.MarkFailedException; import org.springframework.batch.item.ResetFailedException; -import org.springframework.batch.support.AbstractMethodInvokingDelegator; /** * Invokes a custom method on a delegate plain old Java object which itself diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java index e9dbd2494..d4f22e134 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java @@ -19,7 +19,6 @@ package org.springframework.batch.item.adapter; import org.springframework.batch.item.ClearFailedException; import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.support.AbstractMethodInvokingDelegator; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java index 17dd0c2e4..3da2765fd 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java @@ -19,7 +19,6 @@ package org.springframework.batch.item.adapter; import org.springframework.batch.item.ClearFailedException; import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; -import org.springframework.batch.support.AbstractMethodInvokingDelegator; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DataFieldMaxValueIncrementerFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DataFieldMaxValueIncrementerFactory.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DataFieldMaxValueIncrementerFactory.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DataFieldMaxValueIncrementerFactory.java index d43bb3623..79743b250 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DataFieldMaxValueIncrementerFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DataFieldMaxValueIncrementerFactory.java @@ -13,7 +13,7 @@ * 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 org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultDataFieldMaxValueIncrementerFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultDataFieldMaxValueIncrementerFactory.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java index 879ea7baf..6dbf8407b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultDataFieldMaxValueIncrementerFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java @@ -13,7 +13,7 @@ * 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; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatException.java similarity index 94% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatException.java index cfbacca4d..ff148168b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.repeat.exception; +package org.springframework.batch.repeat; import org.springframework.core.NestedRuntimeException; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java index 5adc82ef5..202326d4b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java @@ -41,6 +41,6 @@ public interface RepeatOperations { * indication of whether the {@link RepeatOperations} can continue * processing if this method is called again. */ - ExitStatus iterate(RepeatCallback callback); + ExitStatus iterate(RepeatCallback callback) throws RepeatException; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java index 9654dfd59..a0f4c5be0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.repeat.exception.handler; +package org.springframework.batch.repeat.exception; import org.springframework.batch.repeat.RepeatContext; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java similarity index 73% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java index 2798ad31c..8c2a2684a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.repeat.exception.handler; - +package org.springframework.batch.repeat.exception; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.exception.RepeatException; +import org.springframework.batch.repeat.RepeatException; /** - * Default implementation of {@link ExceptionHandler} - just re-throws the first - * exception it encounters. + * Default implementation of {@link ExceptionHandler} - just re-throws the first exception it encounters. * * @author Dave Syer * @@ -30,12 +28,11 @@ import org.springframework.batch.repeat.exception.RepeatException; public class DefaultExceptionHandler implements ExceptionHandler { /** - * Rethrow the throwable in the collection's iterator. Wrap in a - * {@link RepeatException} if the first instance is not a - * {@link RuntimeException}. + * Rethrow the throwable in the collection's iterator. Wrap in a {@link RepeatException} if the first instance is + * not a {@link RuntimeException}. * - * @see org.springframework.batch.repeat.exception.handler.ExceptionHandler#handleException(RepeatContext, - * Throwable) + * @see org.springframework.batch.repeat.exception.ExceptionHandler#handleException(RepeatContext, + * Throwable) */ public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException { @@ -44,18 +41,17 @@ public class DefaultExceptionHandler implements ExceptionHandler { } /** - * Convenience method to rethrow the Throwable instance. Wraps it in a - * {@link RepeatException} if it is not a {@link Exception}. + * Convenience method to rethrow the Throwable instance. Wraps it in a {@link RepeatException} if it is not a + * {@link Exception}. * * @param throwable a Throwable. - * @throws RuntimeException if the throwable is a {@link RuntimeException} just - * rethrow, otherwise wrap in a {@link RepeatException} + * @throws RuntimeException if the throwable is a {@link RuntimeException} just rethrow, otherwise wrap in a + * {@link RepeatException} */ public static void rethrow(Throwable throwable) throws RuntimeException { if (throwable instanceof RuntimeException) { throw (RuntimeException) throwable; - } - else { + } else { throw new RepeatException("Exception in batch process", throwable); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/ExceptionHandler.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/ExceptionHandler.java index ab307ea11..cdb672e73 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/ExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.repeat.exception.handler; +package org.springframework.batch.repeat.exception; import org.springframework.batch.repeat.CompletionPolicy; import org.springframework.batch.repeat.RepeatContext; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java similarity index 69% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java index 5c321f70f..d1cfd7653 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java @@ -14,20 +14,19 @@ * limitations under the License. */ -package org.springframework.batch.repeat.exception.handler; +package org.springframework.batch.repeat.exception; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.common.ExceptionClassifier; -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.support.ExceptionClassifier; +import org.springframework.batch.support.ExceptionClassifierSupport; /** - * Implementation of {@link ExceptionHandler} based on an - * {@link ExceptionClassifier}. The classifier determines whether to log the - * exception or rethrow it. The keys in the classifier must be the same as the - * static contants in this class. + * Implementation of {@link ExceptionHandler} based on an {@link ExceptionClassifier}. The classifier determines + * whether to log the exception or rethrow it. The keys in the classifier must be the same as the static contants in + * this class. * * @author Dave Syer * @@ -35,32 +34,27 @@ import org.springframework.batch.repeat.exception.RepeatException; public class LogOrRethrowExceptionHandler implements ExceptionHandler { /** - * Key for {@link ExceptionClassifier} signalling that the throwable should - * be rethrown. If the throwable is not a RuntimeException it is wrapped in - * a {@link RepeatException}. + * Key for {@link ExceptionClassifier} signalling that the throwable should be rethrown. If the throwable is not a + * RuntimeException it is wrapped in a {@link RepeatException}. */ public static final String RETHROW = "rethrow"; /** - * Key for {@link ExceptionClassifier} signalling that the throwable should - * be logged at debug level. + * Key for {@link ExceptionClassifier} signalling that the throwable should be logged at debug level. */ public static final String DEBUG = "debug"; /** - * Key for {@link ExceptionClassifier} signalling that the throwable should - * be logged at warn level. + * Key for {@link ExceptionClassifier} signalling that the throwable should be logged at warn level. */ public static final String WARN = "warn"; /** - * Key for {@link ExceptionClassifier} signalling that the throwable should - * be logged at error level. + * Key for {@link ExceptionClassifier} signalling that the throwable should be logged at error level. */ public static final String ERROR = "error"; - protected final Log logger = LogFactory - .getLog(LogOrRethrowExceptionHandler.class); + protected final Log logger = LogFactory.getLog(LogOrRethrowExceptionHandler.class); private ExceptionClassifier exceptionClassifier = new ExceptionClassifierSupport() { public Object classify(Throwable throwable) { @@ -69,8 +63,8 @@ public class LogOrRethrowExceptionHandler implements ExceptionHandler { }; /** - * Setter for the {@link ExceptionClassifier} used by this handler. The - * default is to map all throwable instances to {@value #RETHROW}. + * Setter for the {@link ExceptionClassifier} used by this handler. The default is to map all throwable instances to + * {@value #RETHROW}. * * @param exceptionClassifier */ @@ -79,15 +73,13 @@ public class LogOrRethrowExceptionHandler implements ExceptionHandler { } /** - * Classify the throwables and decide whether to rethrow based on the - * result. The context is not used. + * Classify the throwables and decide whether to rethrow based on the result. The context is not used. * * @throws RuntimeException * * @see {@link ExceptionHandler#handleException(RepeatContext, Throwable)} */ - public void handleException(RepeatContext context, Throwable throwable) - throws RuntimeException { + public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException { Object key = exceptionClassifier.classify(throwable); if (ERROR.equals(key)) { @@ -100,8 +92,7 @@ public class LogOrRethrowExceptionHandler implements ExceptionHandler { DefaultExceptionHandler.rethrow(throwable); } else { throw new IllegalStateException( - "Unclassified exception encountered. Did you mean to classifiy this as 'rethrow'?", - throwable); + "Unclassified exception encountered. Did you mean to classifiy this as 'rethrow'?", throwable); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java index 5c357b28e..187a9f17f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.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.HashMap; import java.util.Iterator; @@ -22,10 +22,10 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.batch.common.ExceptionClassifier; -import org.springframework.batch.common.ExceptionClassifierSupport; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextCounter; +import org.springframework.batch.support.ExceptionClassifier; +import org.springframework.batch.support.ExceptionClassifierSupport; import org.springframework.util.Assert; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java similarity index 92% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java index d5c9e6f0d..0254f657b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.batch.repeat.exception.handler; +package org.springframework.batch.repeat.exception; import java.util.HashMap; -import org.springframework.batch.common.ExceptionClassifierSupport; import org.springframework.batch.repeat.RepeatContext; +import org.springframework.batch.support.ExceptionClassifierSupport; /** * Simple implementation of exception handler which looks for one exception @@ -83,7 +83,7 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler { * @see #setType(Class) * @see #setLimit(int) * - * @see org.springframework.batch.repeat.exception.handler.ExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, + * @see org.springframework.batch.repeat.exception.ExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, * Throwable) */ public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html deleted file mode 100644 index edbc051c8..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - --Infrastructure implementations of repeat exception handler concerns. -
- - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html index cf291e781..edbc051c8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html @@ -1,7 +1,7 @@-Infrastructure implementations of repeat exception concerns. +Infrastructure implementations of repeat exception handler concerns.
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java index 9efef8391..4f6da25ce 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.repeat.aop; +package org.springframework.batch.repeat.interceptor; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; @@ -22,8 +22,8 @@ import org.springframework.aop.ProxyMethodInvocation; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; +import org.springframework.batch.repeat.RepeatException; import org.springframework.batch.repeat.RepeatOperations; -import org.springframework.batch.repeat.exception.RepeatException; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html similarity index 100% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java index 57c2b6bd2..6db097acf 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java @@ -27,11 +27,11 @@ import org.springframework.batch.repeat.CompletionPolicy; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; +import org.springframework.batch.repeat.RepeatException; import org.springframework.batch.repeat.RepeatListener; import org.springframework.batch.repeat.RepeatOperations; -import org.springframework.batch.repeat.exception.RepeatException; -import org.springframework.batch.repeat.exception.handler.DefaultExceptionHandler; -import org.springframework.batch.repeat.exception.handler.ExceptionHandler; +import org.springframework.batch.repeat.exception.DefaultExceptionHandler; +import org.springframework.batch.repeat.exception.ExceptionHandler; import org.springframework.batch.repeat.policy.DefaultResultCompletionPolicy; import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java index 2eec6de6d..c34528876 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java @@ -21,8 +21,8 @@ import java.util.List; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; +import org.springframework.batch.repeat.RepeatException; import org.springframework.batch.repeat.RepeatOperations; -import org.springframework.batch.repeat.exception.RepeatException; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.core.task.TaskExecutor; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/ExhaustedRetryException.java similarity index 94% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/ExhaustedRetryException.java index abdfae126..82c658114 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/ExhaustedRetryException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.retry.exception; +package org.springframework.batch.retry; public class ExhaustedRetryException extends RetryException { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryException.java similarity index 94% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryException.java index 50772f96c..8f436f629 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.retry.exception; +package org.springframework.batch.retry; import org.springframework.core.NestedRuntimeException; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryListener.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryListener.java index 52af358c1..16d6ad105 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryListener.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryListener.java @@ -16,7 +16,6 @@ package org.springframework.batch.retry; -import org.springframework.batch.retry.exception.TerminatedRetryException; /** * Interface for listener that can be used to add behaviour to a retry. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java index fb37b0358..f8072df2f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java @@ -16,7 +16,6 @@ package org.springframework.batch.retry; -import org.springframework.batch.retry.exception.TerminatedRetryException; /** * A {@link RetryPolicy} is responsible for allocating and managing resources @@ -81,5 +80,5 @@ public interface RetryPolicy { * * @throws Exception if there is no recovery path. */ - Object handleRetryExhausted(RetryContext context) throws Exception; + Object handleRetryExhausted(RetryContext context) throws Exception, ExhaustedRetryException; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/TerminatedRetryException.java similarity index 94% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/TerminatedRetryException.java index a79816e37..65d376ec0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/TerminatedRetryException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.retry.exception; +package org.springframework.batch.retry; public class TerminatedRetryException extends RetryException { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffInterruptedException.java similarity index 90% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffInterruptedException.java index 72907b4cb..b52977821 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffInterruptedException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.batch.retry.exception; +package org.springframework.batch.retry.backoff; -import org.springframework.batch.retry.backoff.BackOffPolicy; +import org.springframework.batch.retry.RetryException; /** * Exception class signifiying that an attempt to back off using a diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java index fbed4521a..8200d506c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java @@ -17,7 +17,6 @@ package org.springframework.batch.retry.backoff; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.exception.BackOffInterruptedException; /** * Strategy interface to control back off between attempts in a single diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java index bbb770ae6..e32acd755 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java @@ -17,7 +17,6 @@ package org.springframework.batch.retry.backoff; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.exception.BackOffInterruptedException; import org.springframework.util.ClassUtils; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java index ec534dae5..8f2cb2295 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java @@ -16,7 +16,6 @@ package org.springframework.batch.retry.backoff; -import org.springframework.batch.retry.exception.BackOffInterruptedException; /** * Implementation of {@link BackOffPolicy} that pauses for a fixed period of diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java index 594f8146a..ae85ccc2f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java @@ -16,7 +16,6 @@ package org.springframework.batch.retry.backoff; -import org.springframework.batch.retry.exception.BackOffInterruptedException; /** * Implementation of {@link BackOffPolicy} that performs a no-op and as such all diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java index 8146fa4d7..bf5f610fc 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java @@ -17,7 +17,6 @@ package org.springframework.batch.retry.backoff; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.exception.BackOffInterruptedException; /** * Simple base class for {@link BackOffPolicy} implementations that maintain no diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java index ec6bf7301..89477adc7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java @@ -22,11 +22,11 @@ import org.springframework.batch.item.ItemKeyGenerator; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemRecoverer; import org.springframework.batch.item.ItemWriter; +import org.springframework.batch.retry.ExhaustedRetryException; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; +import org.springframework.batch.retry.RetryException; import org.springframework.batch.retry.RetryPolicy; -import org.springframework.batch.retry.exception.ExhaustedRetryException; -import org.springframework.batch.retry.exception.RetryException; import org.springframework.batch.retry.policy.ItemReaderRetryPolicy; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html deleted file mode 100644 index 91c6d6288..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - --Infrastructure implementations of retry exception concerns. -
- - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryOperationsInterceptor.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryOperationsInterceptor.java index ea0a247f9..de76282a3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryOperationsInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.retry.aop; +package org.springframework.batch.retry.interceptor; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html similarity index 100% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java index 9bd74e891..54a056a75 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java @@ -16,9 +16,9 @@ package org.springframework.batch.retry.policy; +import org.springframework.batch.retry.ExhaustedRetryException; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; -import org.springframework.batch.retry.exception.ExhaustedRetryException; /** * Base class for "normal" retry policies: those that operate in the context of @@ -49,7 +49,7 @@ public abstract class AbstractStatelessRetryPolicy implements RetryPolicy { * * @see org.springframework.batch.retry.RetryPolicy#handleRetryExhausted(org.springframework.batch.retry.RetryContext) */ - public Object handleRetryExhausted(RetryContext context) throws Exception { + public Object handleRetryExhausted(RetryContext context) throws Exception, ExhaustedRetryException { throw new ExhaustedRetryException("Retry exhausted after last attempt with no recovery path.", context .getLastThrowable()); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java index 7cce15821..0de071f8a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java @@ -22,8 +22,8 @@ import java.util.List; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; +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.synch.RetrySynchronizationManager; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java index 909cc5df3..4dbfcc708 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java @@ -20,14 +20,14 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import org.springframework.batch.common.ExceptionClassifier; -import org.springframework.batch.common.ExceptionClassifierSupport; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; +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.synch.RetrySynchronizationManager; +import org.springframework.batch.support.ExceptionClassifier; +import org.springframework.batch.support.ExceptionClassifierSupport; import org.springframework.util.Assert; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java index 66e2da20f..c8ce52e07 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java @@ -26,9 +26,9 @@ import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; +import org.springframework.batch.retry.TerminatedRetryException; import org.springframework.batch.retry.callback.ItemReaderRetryCallback; import org.springframework.batch.retry.context.RetryContextSupport; -import org.springframework.batch.retry.exception.TerminatedRetryException; import org.springframework.batch.retry.synch.RetrySynchronizationManager; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java index e9e12fbc6..5bad61406 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java @@ -19,8 +19,8 @@ package org.springframework.batch.retry.policy; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; +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.synch.RetrySynchronizationManager; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java index cac2f5cf4..9daea11b5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java @@ -16,12 +16,12 @@ package org.springframework.batch.retry.policy; -import org.springframework.batch.common.BinaryExceptionClassifier; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.context.RetryContextSupport; import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.support.BinaryExceptionClassifier; /** * diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java index ac1b4574e..a64f12ae4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java @@ -19,8 +19,8 @@ package org.springframework.batch.retry.policy; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; +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.synch.RetrySynchronizationManager; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java index 13f2053ae..383a5b03f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java @@ -27,11 +27,11 @@ import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryListener; import org.springframework.batch.retry.RetryOperations; import org.springframework.batch.retry.RetryPolicy; +import org.springframework.batch.retry.TerminatedRetryException; 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.NoBackOffPolicy; -import org.springframework.batch.retry.exception.BackOffInterruptedException; -import org.springframework.batch.retry.exception.TerminatedRetryException; import org.springframework.batch.retry.policy.SimpleRetryPolicy; import org.springframework.batch.retry.synch.RetrySynchronizationManager; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/BinaryExceptionClassifier.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/BinaryExceptionClassifier.java index 628f1a718..601b67458 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/BinaryExceptionClassifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.common; +package org.springframework.batch.support; import java.util.HashMap; import java.util.Map; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifier.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifier.java index d26705e11..7d8a60792 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.common; +package org.springframework.batch.support; /** * Interface for a classifier of exceptions. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifierSupport.java similarity index 85% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifierSupport.java index 123c24602..4768297e8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifierSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.common; +package org.springframework.batch.support; /** * Base class for {@link ExceptionClassifier} implementations. Provides default @@ -33,7 +33,7 @@ public class ExceptionClassifierSupport implements ExceptionClassifier { /** * Always returns the value of {@value #DEFAULT}. * - * @see org.springframework.batch.common.ExceptionClassifier#classify(java.lang.Throwable) + * @see org.springframework.batch.support.ExceptionClassifier#classify(java.lang.Throwable) */ public Object classify(Throwable throwable) { return DEFAULT; @@ -42,7 +42,7 @@ public class ExceptionClassifierSupport implements ExceptionClassifier { /** * Wrapper for a call to {@link #classify(Throwable)} with argument null. * - * @see org.springframework.batch.common.ExceptionClassifier#getDefault() + * @see org.springframework.batch.support.ExceptionClassifier#getDefault() */ public Object getDefault() { return classify(null); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SubclassExceptionClassifier.java similarity index 95% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SubclassExceptionClassifier.java index f2776a410..40db10299 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SubclassExceptionClassifier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.common; +package org.springframework.batch.support; import java.util.Comparator; import java.util.HashMap; @@ -53,7 +53,7 @@ public class SubclassExceptionClassifier extends ExceptionClassifierSupport { * Return the value from the type map whose key is the class of the given * Throwable, or its nearest ancestor if a subclass. * - * @see org.springframework.batch.common.ExceptionClassifierSupport#classify(java.lang.Throwable) + * @see org.springframework.batch.support.ExceptionClassifierSupport#classify(java.lang.Throwable) */ public Object classify(Throwable throwable) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java index 4b86ee4c9..d530508df 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/MarkFailedExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/MarkFailedExceptionTests.java index 456ad386c..427ec0967 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/MarkFailedExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ResetFailedExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ResetFailedExceptionTests.java index 6fab892fb..c0c05dcbc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ResetFailedExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java index b9891e6ff..5a41ddc84 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AbstractDelegatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AbstractDelegatorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/AbstractDelegatorTests.java index 571bf5ca0..ab2af4969 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AbstractDelegatorTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java index 07c5f898e..39e1e14a7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileParseExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileParseExceptionTests.java index c3a0941f6..40f31e679 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileParseExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidationExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidationExceptionTests.java index 3fbef212c..06edcc78e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidationExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/AbstractExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/AbstractExceptionTests.java similarity index 96% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/AbstractExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/AbstractExceptionTests.java index f432c03f7..a7c8c4e9d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/AbstractExceptionTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RepeatExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/RepeatExceptionTests.java similarity index 90% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RepeatExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/RepeatExceptionTests.java index c08653ed0..57c7c6858 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RepeatExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java similarity index 89% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java index 662407e8e..f35c022ab 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandlerTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/DefaultExceptionHandlerTests.java similarity index 88% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/DefaultExceptionHandlerTests.java index 8617f5751..40dc88c94 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandlerTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java similarity index 93% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java index 2ccac73f3..969c5d8a3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandlerTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java similarity index 94% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandlerTests.java index 7a2109e6c..deb2d3634 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandlerTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java similarity index 97% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java index fe6723f5e..16c017bdc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java +++ b/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} diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java similarity index 96% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java index 614f342f2..06cd78309 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptorTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java index 00f903270..2eeaa210b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/AbstractExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/AbstractExceptionTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/AbstractExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/AbstractExceptionTests.java index efbadfdb5..1112a0ae6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/AbstractExceptionTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/BackOffInterruptedExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/BackOffInterruptedExceptionTests.java similarity index 89% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/BackOffInterruptedExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/BackOffInterruptedExceptionTests.java index 08a4658e7..38e283fc1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/BackOffInterruptedExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/ExhaustedRetryExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ExhaustedRetryExceptionTests.java similarity index 90% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/ExhaustedRetryExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/ExhaustedRetryExceptionTests.java index 653ed60a0..ad6023c87 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/ExhaustedRetryExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/RetryExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/RetryExceptionTests.java similarity index 91% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/RetryExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/RetryExceptionTests.java index a0b62fcf1..a8187316d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/RetryExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/TerminatedRetryExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/TerminatedRetryExceptionTests.java similarity index 90% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/TerminatedRetryExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/TerminatedRetryExceptionTests.java index 42c24389e..02df933a9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/TerminatedRetryExceptionTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java index f9ee46689..119c66bac 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemReaderRetryCallbackTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/aop/RetryOperationsInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryOperationsInterceptorTests.java similarity index 97% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/aop/RetryOperationsInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryOperationsInterceptorTests.java index 0c303873a..de2829516 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/aop/RetryOperationsInterceptorTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java index e77ced424..7e0289534 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/listener/RetryListenerTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java index 2fc039524..c3dbc7e2c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java index d72322be6..7229f780a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExternalRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExternalRetryPolicyTests.java index c896ec349..7283069ee 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExternalRetryPolicyTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java index 277e61708..67f44a6f4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/AbstractExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AbstractExceptionTests.java similarity index 96% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/common/AbstractExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AbstractExceptionTests.java index e6828d386..e6343a9cb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/AbstractExceptionTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/BinaryExceptionClassifierTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/BinaryExceptionClassifierTests.java similarity index 91% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/common/BinaryExceptionClassifierTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/BinaryExceptionClassifierTests.java index 9640a103f..13c37cfa7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/BinaryExceptionClassifierTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/ExceptionClassifierSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/ExceptionClassifierSupportTests.java similarity index 90% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/common/ExceptionClassifierSupportTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/ExceptionClassifierSupportTests.java index eb6e7ecaf..9692ab585 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/ExceptionClassifierSupportTests.java +++ b/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; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/SubclassExceptionClassifierTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SubclassExceptionClassifierTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/common/SubclassExceptionClassifierTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SubclassExceptionClassifierTests.java index 3fd08b671..478384260 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/SubclassExceptionClassifierTests.java +++ b/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 { diff --git a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/interceptor/retry-transaction-test.xml similarity index 87% rename from spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/interceptor/retry-transaction-test.xml index 0a147b4a5..077286a47 100644 --- a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml +++ b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/interceptor/retry-transaction-test.xml @@ -18,10 +18,10 @@