Skip to content

Commit b668042

Browse files
committed
Change signature of RetryOperations.execute() regarding nullability
Due to lacking support in NullAway for the current arrangement, we are (perhaps temporarily) changing the signature of the execute() method in RetryOperations (and thus also in RetryTemplate)... from: <R extends @nullable Object> R execute(Retryable<R> retryable); to: <R> @nullable R execute(Retryable<? extends @nullable R> retryable); Once uber/NullAway#1075 has been resolved, we will consider switching back to the original signature. See gh-34716
1 parent a462f5e commit b668042

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ public interface RetryOperations {
4141
* encountered during retry attempts should be made available as suppressed
4242
* exceptions
4343
*/
44-
<R extends @Nullable Object> R execute(Retryable<R> retryable) throws RetryException;
44+
<R> @Nullable R execute(Retryable<? extends @Nullable R> retryable) throws RetryException;
4545

4646
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void setRetryListener(RetryListener retryListener) {
142142
* encountered during retry attempts are available as suppressed exceptions
143143
*/
144144
@Override
145-
public <R extends @Nullable Object> R execute(Retryable<R> retryable) throws RetryException {
145+
public <R> @Nullable R execute(Retryable<? extends @Nullable R> retryable) throws RetryException {
146146
String retryableName = retryable.getName();
147147
// Initial attempt
148148
try {

0 commit comments

Comments
 (0)