Skip to content
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

Deprecated retryWhen usage substituted #17658

Merged
merged 1 commit into from
Nov 30, 2020
Merged

Deprecated retryWhen usage substituted #17658

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/RetryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import reactor.core.Exceptions;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.util.retry.Retry;

import java.time.Duration;
import java.util.Locale;
Expand Down Expand Up @@ -55,7 +56,7 @@ public static AmqpRetryPolicy getRetryPolicy(AmqpRetryOptions options) {
*/
public static <T> Flux<T> withRetry(Flux<T> source, Duration operationTimeout, AmqpRetryPolicy retryPolicy) {
return Flux.defer(() -> source.timeout(operationTimeout))
.retryWhen(errors -> retry(errors, retryPolicy));
.retryWhen(Retry.withThrowable(errors -> retry(errors, retryPolicy)));
}

/**
Expand All @@ -67,7 +68,7 @@ public static <T> Flux<T> withRetry(Flux<T> source, Duration operationTimeout, A
*/
public static <T> Mono<T> withRetry(Mono<T> source, Duration operationTimeout, AmqpRetryPolicy retryPolicy) {
return Mono.defer(() -> source.timeout(operationTimeout))
.retryWhen(errors -> retry(errors, retryPolicy));
.retryWhen(Retry.withThrowable(errors -> retry(errors, retryPolicy)));
}

private static Flux<Long> retry(Flux<Throwable> source, AmqpRetryPolicy retryPolicy) {
Expand Down
5 changes: 3 additions & 2 deletions ...osmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/BackoffRetryUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.azure.cosmos.implementation.directconnectivity.AddressSelector;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.util.retry.Retry;

import java.time.Duration;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -37,7 +38,7 @@ static public <T> Mono<T> executeRetry(Callable<Mono<T>> callbackMethod,
} catch (Exception e) {
return Mono.error(e);
}
}).retryWhen(RetryUtils.toRetryWhenFunc(retryPolicy));
}).retryWhen(Retry.withThrowable(RetryUtils.toRetryWhenFunc(retryPolicy)));
}

static public <T> Flux<T> fluxExecuteRetry(Callable<Flux<T>> callbackMethod, IRetryPolicy retryPolicy) {
Expand All @@ -48,7 +49,7 @@ static public <T> Flux<T> fluxExecuteRetry(Callable<Flux<T>> callbackMethod, IRe
} catch (Exception e) {
return Flux.error(e);
}
}).retryWhen(RetryUtils.toRetryWhenFunc(retryPolicy));
}).retryWhen(Retry.withThrowable(RetryUtils.toRetryWhenFunc(retryPolicy)));
}

static public <T> Mono<T> executeAsync(
Expand Down