Skip to content

Commit e1ebf23

Browse files
committed
Revert "GH-264: Docs and Javadocs"
This reverts commit 0c1fa82.
1 parent da577cf commit e1ebf23

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

README.md

-6
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@ Foo foo = template.execute(new RetryCallback<Foo>() {
200200
If the business logic does not succeed before the template decides to abort, the client is
201201
given the chance to do some alternate processing through the recovery callback.
202202

203-
Version 1.3.3 added the `noRecoveryForNotRetryable` property to the template.
204-
When `true`, the recovery callback is not invoked if the retry policy is configured with a not-retryable exception and one is thrown.
205-
By default, the recovery callback is always called, regardless of whether the exception is retryable or not.
206-
207203
## Stateless Retry
208204

209205
In the simplest case, a retry is just a while loop: the `RetryTemplate` can keep trying
@@ -580,8 +576,6 @@ Expressions can contain property placeholders, such as `#{${max.delay}}` or
580576
during initialization. There is no root object for the evaluation but they can reference
581577
other beans in the context.
582578

583-
Version 1.3.3 added the `rethrow` attribute to `@Retryable`; when `true` any exceptions that are not retryable are thrown unchanged to the caller and the `@Recover` method is not called.
584-
585579
#### <a name="Additional_Dependencies"></a> Additional Dependencies
586580

587581
The declarative approach to applying retry handling by using the `@Retryable` annotation

src/main/java/org/springframework/retry/support/RetryTemplate.java

-5
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@ public void setThrowLastExceptionOnExhausted(boolean throwLastExceptionOnExhaust
127127
}
128128

129129
/**
130-
* Set to true to not call the recovery callback (if any) when a not-retryable
131-
* exception is thrown by the target code in
132-
* {@link #execute(RetryCallback, RecoveryCallback)}. By default, the callback is
133-
* invoked when retries are exhausted, or immediately for not-retryable exceptions.
134130
* @param noRecoveryForNotRetryable the noRecoveryForNotRetryable to set
135131
* @since 1.3.3
136132
*/
@@ -546,7 +542,6 @@ protected <T> T handleRetryExhausted(RecoveryCallback<T> recoveryCallback, Retry
546542
if (state != null && !context.hasAttribute(GLOBAL_STATE)) {
547543
this.retryContextCache.remove(state.getKey());
548544
}
549-
// TODO: In 2.0 add retryForException() to the interface.
550545
if (this.noRecoveryForNotRetryable && retryPolicy instanceof SimpleRetryPolicy
551546
&& !((SimpleRetryPolicy) retryPolicy).retryForException(context.getLastThrowable())) {
552547
throw context.getLastThrowable();

0 commit comments

Comments
 (0)