Mark RetryException#getCause non null

snicoll · snicoll · commit 532911eb9302 · 2025-08-16T09:20:02.000+02:00
This commit simplifies RetryException to always require a root cause and mark it as not nullable. Such exception is the exception thrown by the retryable operation and should always be available as it explains why the invocation was a candidate for retrying in the first place. Closes gh-35332
diff --git a/spring-context/src/main/java/org/springframework/resilience/retry/AbstractRetryInterceptor.java b/spring-context/src/main/java/org/springframework/resilience/retry/AbstractRetryInterceptor.java
@@ -112,8 +112,7 @@ public String getName() {
 			});
 		}
 		catch (RetryException ex) {
-			Throwable cause = ex.getCause();
-			throw (cause != null ? cause : new IllegalStateException(ex.getMessage(), ex));
+			throw ex.getCause();
 		}
 	}
 
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
@@ -17,6 +17,9 @@
 package org.springframework.core.retry;
 
 import java.io.Serial;
+import java.util.Objects;
+
+import org.jspecify.annotations.NonNull;
 
 /**
  * Exception thrown when a {@link RetryPolicy} has been exhausted.
@@ -31,14 +34,6 @@ public class RetryException extends Exception {
 	private static final long serialVersionUID = 5439915454935047936L;
 
 
-	/**
-	 * Create a new {@code RetryException} for the supplied message.
-	 * @param message the detail message
-	 */
-	public RetryException(String message) {
-		super(message);
-	}
-
 	/**
 	 * Create a new {@code RetryException} for the supplied message and cause.
 	 * @param message the detail message
@@ -48,4 +43,10 @@ public RetryException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
+
+	@Override
+	public synchronized @NonNull Throwable getCause() {
+		return Objects.requireNonNull(super.getCause());
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -112,8 +112,7 @@ public String getName() {`
`112`	`112`	`});`
`113`	`113`	`}`
`114`	`114`	`catch (RetryException ex) {`
`115`		`- Throwable cause = ex.getCause();`
`116`		`- throw (cause != null ? cause : new IllegalStateException(ex.getMessage(), ex));`
	`115`	`+ throw ex.getCause();`
`117`	`116`	`}`
`118`	`117`	`}`
`119`	`118`