opendev/gerrit
Code Issues Proposed changes

RetryHelper: Convert from Guava Predicate to java.util

Browse Source 
guava-retrying still uses Guava (it still hasn't been updated since
2015), but we can use the standard type in our code and convert using a
method reference when calling.

Change-Id: I6d4d4e6e32e43ef0faa180b076dc3d4550af1905
This commit is contained in:
Dave Borowitz
2019-05-16 15:49:04 +02:00
committed by David Pursehouse
parent ac27183ae9
commit 6265d75e45
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/com/google/gerrit/server/update/RetryHelper.java
View File

@@ -28,7 +28,6 @@ import com.github.rholder.retry.WaitStrategies;
import com.github.rholder.retry.WaitStrategy;
import com.google.auto.value.AutoValue;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Predicate;
import com.google.common.base.Throwables;
import com.google.common.collect.Maps;
import com.google.common.flogger.FluentLogger;
@@ -47,6 +46,7 @@ import java.util.Arrays;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.function.Consumer;
import java.util.function.Predicate;
import org.eclipse.jgit.lib.Config;
@Singleton
@@ -294,7 +294,7 @@ public class RetryHelper {
private <O> RetryerBuilder<O> createRetryerBuilder(
ActionType actionType, Options opts, Predicate<Throwable> exceptionPredicate) {
RetryerBuilder<O> retryerBuilder =
RetryerBuilder.<O>newBuilder().retryIfException(exceptionPredicate);
RetryerBuilder.<O>newBuilder().retryIfException(exceptionPredicate::test);
if (opts.listener() != null) {
retryerBuilder.withRetryListener(opts.listener());
}