root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revise nullability for Core Retry after upgrade to NullAway 0.12.10 

This commit revises the nullability declarations in Retryable,
RetryOperations, and RetryTemplate after the upgrade to NullAway 0.12.10.

See gh-35492
This commit is contained in:
Sam Brannen 2025-09-25 11:34:50 +02:00
parent 5df082132d
commit 34be8e266d
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-context/src/main/java/org/springframework/resilience/retry/AbstractRetryInterceptor.java
View File

@ -101,7 +101,7 @@ public abstract class AbstractRetryInterceptor implements MethodInterceptor {
RetryTemplate retryTemplate = new RetryTemplate(retryPolicy); RetryTemplate retryTemplate = new RetryTemplate(retryPolicy);
try { try {
return retryTemplate.execute(new Retryable<>() { return retryTemplate.execute(new Retryable<@Nullable Object>() {
@Override @Override
public @Nullable Object execute() throws Throwable { public @Nullable Object execute() throws Throwable {
return (invocation instanceof ProxyMethodInvocation pmi ? return (invocation instanceof ProxyMethodInvocation pmi ?

2
spring-core/src/main/java/org/springframework/core/retry/RetryOperations.java
View File

@ -46,6 +46,6 @@ public interface RetryOperations {
* @return the result of the {@code Retryable}, if any * @return the result of the {@code Retryable}, if any
* @throws RetryException if the {@code RetryPolicy} is exhausted * @throws RetryException if the {@code RetryPolicy} is exhausted
*/ */
<R> @Nullable R execute(Retryable<? extends @Nullable R> retryable) throws RetryException; <R extends @Nullable Object> R execute(Retryable<R> retryable) throws RetryException;
} }

2
spring-core/src/main/java/org/springframework/core/retry/RetryTemplate.java
View File

@ -134,7 +134,7 @@ public class RetryTemplate implements RetryOperations {
* @throws RetryException if the {@code RetryPolicy} is exhausted * @throws RetryException if the {@code RetryPolicy} is exhausted
*/ */
@Override @Override
public <R> @Nullable R execute(Retryable<? extends @Nullable R> retryable) throws RetryException { public <R extends @Nullable Object> R execute(Retryable<R> retryable) throws RetryException {
String retryableName = retryable.getName(); String retryableName = retryable.getName();
// Initial attempt // Initial attempt
try { try {

4
spring-core/src/main/java/org/springframework/core/retry/Retryable.java
View File

@ -31,14 +31,14 @@ import org.jspecify.annotations.Nullable;
* @see RetryOperations * @see RetryOperations
*/ */
@FunctionalInterface @FunctionalInterface
public interface Retryable<R> { public interface Retryable<R extends @Nullable Object> {
/** /**
* Method to execute and retry if needed. * Method to execute and retry if needed.
* @return the result of the operation * @return the result of the operation
* @throws Throwable if an error occurs during the execution of the operation * @throws Throwable if an error occurs during the execution of the operation
*/ */
@Nullable R execute() throws Throwable; R execute() throws Throwable;
/** /**
* A unique, logical name for this retryable operation, used to distinguish * A unique, logical name for this retryable operation, used to distinguish