spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Juergen Hoeller
2026-07-31 16:28:17 +02:00
parent 7c2fdcc1fb f5564e7e31
commit 0376dd9a78
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-core/src/main/java/org/springframework/core/retry/RetryPolicy.java
+28 -24
View File
@@ -157,6 +157,12 @@ public interface RetryPolicy {
*/
public static final long DEFAULT_DELAY = 1000;
/**
* The default {@linkplain #jitter(Duration) jitter}: {@value}.
* @since 7.0.9
*/
public static final long DEFAULT_JITTER = 0;
/**
* The default {@linkplain #multiplier(double) multiplier}: {@value}.
*/
@@ -179,8 +185,6 @@ public interface RetryPolicy {
private @Nullable Long maxRetries;
private Duration timeout = Duration.ZERO;
private @Nullable Duration delay;
private @Nullable Duration jitter;
@@ -189,6 +193,8 @@ public interface RetryPolicy {
private @Nullable Duration maxDelay;
private Duration timeout = DEFAULT_TIMEOUT;
private final Set<Class<? extends Throwable>> includes = new LinkedHashSet<>();
private final Set<Class<? extends Throwable>> excludes = new LinkedHashSet<>();
@@ -240,24 +246,6 @@ public interface RetryPolicy {
return this;
}
/**
* Specify a timeout for the maximum amount of elapsed time allowed for
* the initial invocation and any subsequent retry attempts, including
* delays.
* <p>The default is {@link Duration#ZERO}, which signals that no timeout
* should be applied.
* <p>The supplied value will override any previously configured value.
* @param timeout the timeout, typically in milliseconds or seconds;
* must be greater than or equal to zero
* @return this {@code Builder} instance for chained method invocations
* @since 7.0.2
*/
public Builder timeout(Duration timeout) {
assertIsNotNegative("timeout", timeout);
this.timeout = timeout;
return this;
}
/**
* Specify the base delay after the initial invocation.
* <p>If a {@linkplain #multiplier(double) multiplier} is specified, this
@@ -353,6 +341,24 @@ public interface RetryPolicy {
return this;
}
/**
* Specify a timeout for the maximum amount of elapsed time allowed for
* the initial invocation and any subsequent retry attempts, including
* delays.
* <p>The default is {@link Duration#ZERO}, which signals that no timeout
* should be applied.
* <p>The supplied value will override any previously configured value.
* @param timeout the timeout, typically in milliseconds or seconds;
* must be greater than or equal to zero
* @return this {@code Builder} instance for chained method invocations
* @since 7.0.2
*/
public Builder timeout(Duration timeout) {
assertIsNotNegative("timeout", timeout);
this.timeout = timeout;
return this;
}
/**
* Specify the types of exceptions for which the {@link RetryPolicy}
* should retry a failed operation.
@@ -483,11 +489,9 @@ public interface RetryPolicy {
ExponentialBackOff exponentialBackOff = new ExponentialBackOff();
exponentialBackOff.setMaxAttempts(this.maxRetries != null ? this.maxRetries : DEFAULT_MAX_RETRIES);
exponentialBackOff.setInitialInterval(this.delay != null ? this.delay.toMillis() : DEFAULT_DELAY);
exponentialBackOff.setMaxInterval(this.maxDelay != null ? this.maxDelay.toMillis() : DEFAULT_MAX_DELAY);
exponentialBackOff.setJitter(this.jitter != null ? this.jitter.toMillis() : DEFAULT_JITTER);
exponentialBackOff.setMultiplier(this.multiplier != null ? this.multiplier : DEFAULT_MULTIPLIER);
if (this.jitter != null) {
exponentialBackOff.setJitter(this.jitter.toMillis());
}
exponentialBackOff.setMaxInterval(this.maxDelay != null ? this.maxDelay.toMillis() : DEFAULT_MAX_DELAY);
backOff = exponentialBackOff;
}
return new DefaultRetryPolicy(this.includes, this.excludes, this.predicate, this.timeout, backOff);