Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Retryable.run() to Retryable.execute()

Browse Source 
See gh-34716
This commit is contained in:
Sam Brannen
2025-06-11 13:50:16 +02:00
parent d74b863ae7
commit 8f3ca49bc4
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,7 @@ import org.springframework.util.backoff.BackOffExecution;
import org.springframework.util.backoff.FixedBackOff;
/**
* A basic implementation of {@link RetryOperations} that invokes and potentially
* A basic implementation of {@link RetryOperations} that executes and potentially
* retries a {@link Retryable} operation based on a configured {@link RetryPolicy}
* and {@link BackOff} policy.
*
@@ -147,7 +147,7 @@ public class RetryTemplate implements RetryOperations {
// Initial attempt
try {
logger.debug(() -> "Preparing to execute retryable operation '%s'".formatted(retryableName));
R result = retryable.run();
R result = retryable.execute();
logger.debug(() -> "Retryable operation '%s' completed successfully".formatted(retryableName));
return result;
}
@@ -165,7 +165,7 @@ public class RetryTemplate implements RetryOperations {
logger.debug(() -> "Preparing to retry operation '%s'".formatted(retryableName));
try {
this.retryListener.beforeRetry(retryExecution);
R result = retryable.run();
R result = retryable.execute();
this.retryListener.onRetrySuccess(retryExecution, result);
logger.debug(() -> "Retryable operation '%s' completed successfully after retry"
.formatted(retryableName));

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

@@ -36,7 +36,7 @@ public interface Retryable<R> {
* @return the result of the operation
* @throws Throwable if an error occurs during the execution of the operation
*/
R run() throws Throwable;
R execute() throws Throwable;
/**
* A unique, logical name for this retryable operation, used to distinguish

6
spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java
View File

@@ -44,7 +44,7 @@ class RetryTemplateTests {
int failure;
@Override
public String run() throws Exception {
public String execute() throws Exception {
if (failure++ < 2) {
throw new Exception("Error while invoking greeting service");
}
@@ -68,7 +68,7 @@ class RetryTemplateTests {
Retryable<String> retryable = new Retryable<>() {
@Override
public String run() throws Exception {
public String execute() throws Exception {
throw exception;
}
@@ -100,7 +100,7 @@ class RetryTemplateTests {
Retryable<String> retryable = new Retryable<>() {
@Override
public String run() throws TechnicalException {
public String execute() throws TechnicalException {
throw technicalException;
}