Skip to content

Polish RetryTask #36212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quaff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Polish RetryTask #36212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions spring-core/src/main/java/org/springframework/core/retry/support/RetryTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* @since 7.0.4
* @param <V> the returned value type, if any
* @param <E> the exception propagated, if any
* @see RetryTemplate
* @see RetryOperations
* @see org.springframework.core.task.SyncTaskExecutor#execute(TaskCallback)
* @see org.springframework.core.task.AsyncTaskExecutor#submit(Callable)
* @see org.springframework.core.task.AsyncTaskExecutor#submitCompletable(Callable)
Expand All @@ -59,7 +59,7 @@ public class RetryTask<V extends @Nullable Object, E extends Exception> implemen

private final TaskCallback<V, E> task;

private final RetryOperations retryTemplate;
private final RetryOperations retryOperations;


/**
Expand All @@ -86,22 +86,22 @@ public RetryTask(TaskCallback<V, E> task, RetryPolicy retryPolicy) {
/**
* Create a new {@code RetryTask} for the given retryable task.
* @param task a task that allows for re-execution after failure
* @param retryTemplate the retry delegate to use (typically a {@link RetryTemplate}
* @param retryOperations the retry delegate to use (typically a {@link RetryTemplate}
* but declaring the {@link RetryOperations} interface for flexibility)
*/
public RetryTask(TaskCallback<V, E> task, RetryOperations retryTemplate) {
public RetryTask(TaskCallback<V, E> task, RetryOperations retryOperations) {
Assert.notNull(task, "TaskCallback must not be null");
Assert.notNull(retryTemplate, "RetryTemplate must not be null");
Assert.notNull(retryOperations, "RetryOperations must not be null");
this.task = task;
this.retryTemplate = retryTemplate;
this.retryOperations = retryOperations;
}


@SuppressWarnings("unchecked")
@Override
public V call() throws E {
try {
return this.retryTemplate.execute(new Retryable<>() {
return this.retryOperations.execute(new Retryable<>() {
@Override
public V execute() throws E {
return task.call();
Expand Down Expand Up @@ -129,7 +129,7 @@ public String getName() {
@Override
public String toString() {
return "RetryTask for " + getName() + " using " +
(this.retryTemplate instanceof RetryTemplate rt ? rt.getRetryPolicy() : this.retryTemplate);
(this.retryOperations instanceof RetryTemplate rt ? rt.getRetryPolicy() : this.retryOperations);
}


Expand Down Expand Up @@ -157,11 +157,11 @@ public static <V> Callable<V> wrap(Callable<V> task, RetryPolicy retryPolicy) {
/**
* Wrap the given target {@code Callable} into a retrying {@code Callable}.
* @param task a task that allows for re-execution after failure
* @param retryTemplate the retry delegate to use (typically a {@link RetryTemplate}
* @param retryOperations the retry delegate to use (typically a {@link RetryTemplate}
* but declaring the {@link RetryOperations} interface for flexibility)
*/
public static <V> Callable<V> wrap(Callable<V> task, RetryOperations retryTemplate) {
return new RetryTask<>(TaskCallback.from(task), retryTemplate) {
public static <V> Callable<V> wrap(Callable<V> task, RetryOperations retryOperations) {
return new RetryTask<>(TaskCallback.from(task), retryOperations) {
@Override
public String getName() {
return task.getClass().getName();
Expand Down Expand Up @@ -193,11 +193,11 @@ public static Runnable wrap(Runnable task, RetryPolicy retryPolicy) {
/**
* Wrap the given target {@code Runnable} into a retrying {@code Runnable}.
* @param task a task that allows for re-execution after failure
* @param retryTemplate the retry delegate to use (typically a {@link RetryTemplate}
* @param retryOperations the retry delegate to use (typically a {@link RetryTemplate}
* but declaring the {@link RetryOperations} interface for flexibility)
*/
public static Runnable wrap(Runnable task, RetryOperations retryTemplate) {
RetryTask<Void, RuntimeException> rt = new RetryTask<>(TaskCallback.from(task), retryTemplate) {
public static Runnable wrap(Runnable task, RetryOperations retryOperations) {
RetryTask<Void, RuntimeException> rt = new RetryTask<>(TaskCallback.from(task), retryOperations) {
@Override
public String getName() {
return task.getClass().getName();
Expand Down