Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nebhale
2008-03-07 14:56:10 +00:00
parent cce1b29f6d
commit c1887cdd9c
94 changed files with 163 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/common/package.html
View File

@@ -1,7 +0,0 @@
<html>
<body>
<p>
Infrastructure implementations of common concerns.
</p>
</body>
</html>

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AbstractMethodInvokingDelegator.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DynamicMethodInvocationException.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java
View File

@@ -1,4 +1,4 @@
package org.springframework.batch.support;
package org.springframework.batch.item.adapter;
import org.springframework.util.MethodInvoker;

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemReaderAdapter.java
View File

@@ -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

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java
View File

@@ -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;
/**

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DataFieldMaxValueIncrementerFactory.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DataFieldMaxValueIncrementerFactory.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultDataFieldMaxValueIncrementerFactory.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.repeat.exception;
package org.springframework.batch.repeat;
import org.springframework.core.NestedRuntimeException;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java
View File

@@ -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;
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java
View File

@@ -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;

28
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java
View File

@@ -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);
}
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/ExceptionHandler.java
View File

@@ -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;

45
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java
View File

@@ -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);
}
}

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java
View File

@@ -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;
/**

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java
View File

@@ -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 {

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html
View File

@@ -1,7 +0,0 @@
<html>
<body>
<p>
Infrastructure implementations of repeat exception handler concerns.
</p>
</body>
</html>

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html
View File

@@ -1,7 +1,7 @@
<html>
<body>
<p>
Infrastructure implementations of repeat exception concerns.
Infrastructure implementations of repeat exception handler concerns.
</p>
</body>
</html>

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java
View File

@@ -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;

0
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/package.html → spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html
View File

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/ExhaustedRetryException.java
View File

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

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryException.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.retry.exception;
package org.springframework.batch.retry;
import org.springframework.core.NestedRuntimeException;

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryListener.java
View File

@@ -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.

3
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java
View File

@@ -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;
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/TerminatedRetryException.java
View File

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

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffInterruptedException.java
View File

@@ -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

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java
View File

@@ -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

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java
View File

@@ -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;
/**

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java
View File

@@ -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

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java
View File

@@ -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

1
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java
View File

@@ -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

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemReaderRetryCallback.java
View File

@@ -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;
/**

7
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html
View File

@@ -1,7 +0,0 @@
<html>
<body>
<p>
Infrastructure implementations of retry exception concerns.
</p>
</body>
</html>

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryOperationsInterceptor.java
View File

@@ -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;

0
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/package.html → spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html
View File

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java
View File

@@ -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());
}

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java
View File

@@ -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;
/**

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java
View File

@@ -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;
/**

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java
View File

@@ -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;
/**

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java
View File

@@ -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;
/**
*

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java
View File

@@ -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;
/**

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/support/BinaryExceptionClassifier.java
View File

@@ -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;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifier.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.common;
package org.springframework.batch.support;
/**
* Interface for a classifier of exceptions.

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ExceptionClassifierSupport.java
View File

@@ -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);

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SubclassExceptionClassifier.java
View File

@@ -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) {