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 115c04ece55..40cca6a2647 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 @@ -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)); diff --git a/spring-core/src/main/java/org/springframework/core/retry/Retryable.java b/spring-core/src/main/java/org/springframework/core/retry/Retryable.java index f90f294018a..fffc34dc00d 100644 --- a/spring-core/src/main/java/org/springframework/core/retry/Retryable.java +++ b/spring-core/src/main/java/org/springframework/core/retry/Retryable.java @@ -36,7 +36,7 @@ public interface Retryable { * @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 diff --git a/spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java b/spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java index 7e17efbbdc1..f2d20fd75d9 100644 --- a/spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java +++ b/spring-core/src/test/java/org/springframework/core/retry/RetryTemplateTests.java @@ -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 retryable = new Retryable<>() { @Override - public String run() throws Exception { + public String execute() throws Exception { throw exception; } @@ -100,7 +100,7 @@ class RetryTemplateTests { Retryable retryable = new Retryable<>() { @Override - public String run() throws TechnicalException { + public String execute() throws TechnicalException { throw technicalException; }