diff --git a/spring-core/src/main/java/org/springframework/core/retry/RetryException.java b/spring-core/src/main/java/org/springframework/core/retry/RetryException.java index 1ae45e977ec..dc950b9bccd 100644 --- a/spring-core/src/main/java/org/springframework/core/retry/RetryException.java +++ b/spring-core/src/main/java/org/springframework/core/retry/RetryException.java @@ -44,7 +44,7 @@ import java.util.Objects; public class RetryException extends Exception { @Serial - private static final long serialVersionUID = 5439915454935047936L; + private static final long serialVersionUID = 1L; /** diff --git a/spring-core/src/main/java/org/springframework/core/retry/RetryTemplate.java b/spring-core/src/main/java/org/springframework/core/retry/RetryTemplate.java index f7d9aad5cb5..b04cb8da180 100644 --- a/spring-core/src/main/java/org/springframework/core/retry/RetryTemplate.java +++ b/spring-core/src/main/java/org/springframework/core/retry/RetryTemplate.java @@ -16,6 +16,7 @@ package org.springframework.core.retry; +import java.io.Serial; import java.util.ArrayDeque; import java.util.Deque; @@ -148,7 +149,7 @@ public class RetryTemplate implements RetryOperations { .formatted(retryableName)); // Retry process starts here BackOffExecution backOffExecution = this.retryPolicy.getBackOff().start(); - Deque exceptions = new ArrayDeque<>(); + Deque exceptions = new ArrayDeque<>(4); exceptions.add(initialException); Throwable lastException = initialException; @@ -200,8 +201,10 @@ public class RetryTemplate implements RetryOperations { } } + private static class RetryInterruptedException extends RetryException { + @Serial private static final long serialVersionUID = 1L; @@ -213,7 +216,6 @@ public class RetryTemplate implements RetryOperations { public int getRetryCount() { return (getSuppressed().length - 1); } - } } diff --git a/spring-core/src/main/java/org/springframework/core/retry/support/CompositeRetryListener.java b/spring-core/src/main/java/org/springframework/core/retry/support/CompositeRetryListener.java index c9b16865a5b..c205b214171 100644 --- a/spring-core/src/main/java/org/springframework/core/retry/support/CompositeRetryListener.java +++ b/spring-core/src/main/java/org/springframework/core/retry/support/CompositeRetryListener.java @@ -46,6 +46,7 @@ public class CompositeRetryListener implements RetryListener { /** * Create a new {@code CompositeRetryListener}. + * @see #addListener(RetryListener) */ public CompositeRetryListener() { } @@ -56,7 +57,7 @@ public class CompositeRetryListener implements RetryListener { * @param listeners the list of delegate listeners to register; must not be empty */ public CompositeRetryListener(List listeners) { - Assert.notEmpty(listeners, "RetryListener List must not be empty"); + Assert.notEmpty(listeners, "RetryListener list must not be empty"); this.listeners.addAll(listeners); }