From b19bc2afb87c15ce4d5344df2cc0f929d5859726 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Tue, 20 Jun 2023 13:37:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.0.0=201.=20=E5=88=A0=E9=99=A4GuavaRet?= =?UTF-8?q?ry=E7=9A=84retryIfException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/core/RetryExecutorParameter.java | 3 --- .../core/executor/GuavaRetryExecutor.java | 1 - .../client/core/report/ReportListener.java | 5 ---- .../strategy/AbstractRetryStrategies.java | 24 ------------------- .../core/strategy/LocalRetryStrategies.java | 5 ---- .../core/strategy/ManualRetryStrategies.java | 5 ---- .../core/strategy/RemoteRetryStrategies.java | 4 ---- 7 files changed, 47 deletions(-) diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutorParameter.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutorParameter.java index f5826a8e1..7b05627ae 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutorParameter.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutorParameter.java @@ -1,7 +1,6 @@ package com.aizuda.easy.retry.client.core; import com.github.rholder.retry.RetryListener; -import com.google.common.base.Predicate; import java.util.List; @@ -11,8 +10,6 @@ import java.util.List; */ public interface RetryExecutorParameter { - Predicate exceptionPredicate(); - BR backOff(); SR stop(); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/executor/GuavaRetryExecutor.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/executor/GuavaRetryExecutor.java index 9147fc440..f4c657e5e 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/executor/GuavaRetryExecutor.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/executor/GuavaRetryExecutor.java @@ -33,7 +33,6 @@ public class GuavaRetryExecutor extends AbstractRetryExecutor parameter) { RetryerBuilder retryerBuilder = RetryerBuilder.newBuilder(); - retryerBuilder.retryIfException(throwable -> parameter.exceptionPredicate().apply(throwable)); retryerBuilder.withWaitStrategy(parameter.backOff()); retryerBuilder.withStopStrategy(parameter.stop()); for (RetryListener retryListener : parameter.getRetryListeners()) { diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java index 17d7e521a..e477a108a 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java @@ -76,11 +76,6 @@ public class ReportListener implements Listener { public RetryExecutorParameter getRetryExecutorParameter() { return new RetryExecutorParameter() { - @Override - public Predicate exceptionPredicate() { - return throwable -> Boolean.TRUE; - } - @Override public WaitStrategy backOff() { return WaitStrategies.fixedWait(2, TimeUnit.SECONDS); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java index 9f37ada74..851d209d7 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java @@ -127,30 +127,6 @@ public abstract class AbstractRetryStrategies implements RetryStrategy { protected abstract Consumer doGetRetryErrorConsumer(RetryerInfo retryerInfo, Object[] params); protected abstract Callable doGetCallable(RetryExecutor retryExecutor,Object[] params); protected abstract RetryExecutorParameter getRetryExecutorParameter(RetryerInfo retryerInfo); - - protected boolean validate(Class throwable,RetryerInfo retryerInfo) { - - Set> exclude = retryerInfo.getExclude(); - Set> include = retryerInfo.getInclude(); - if (CollectionUtils.isEmpty(include) && CollectionUtils.isEmpty(exclude)) { - return true; - } - for (Class e : include) { - if (e.isAssignableFrom(throwable)) { - return true; - } - } - if (!CollectionUtils.isEmpty(exclude)) { - for (Class e : exclude) { - if (e.isAssignableFrom(throwable)) { - return false; - } - } - return true; - } - return false; - } - /** * 上报数据 * diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/LocalRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/LocalRetryStrategies.java index 86e658947..097bf11bf 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/LocalRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/LocalRetryStrategies.java @@ -128,11 +128,6 @@ public class LocalRetryStrategies extends AbstractRetryStrategies { return new RetryExecutorParameter() { - @Override - public Predicate exceptionPredicate() { - return throwable -> LocalRetryStrategies.super.validate(throwable.getClass(), retryerInfo); - } - @Override public WaitStrategy backOff() { return WaitStrategies.fixedWait(retryerInfo.getLocalInterval(), TimeUnit.SECONDS); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/ManualRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/ManualRetryStrategies.java index 1a4061ea1..36815927c 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/ManualRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/ManualRetryStrategies.java @@ -95,11 +95,6 @@ public class ManualRetryStrategies extends AbstractRetryStrategies { protected RetryExecutorParameter getRetryExecutorParameter(RetryerInfo retryerInfo) { return new RetryExecutorParameter() { - @Override - public Predicate exceptionPredicate() { - return throwable -> ManualRetryStrategies.super.validate(throwable.getClass(), retryerInfo); - } - @Override public WaitStrategy backOff() { return WaitStrategies.fixedWait(500, TimeUnit.MILLISECONDS); diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java index c242894e2..e879a5946 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java @@ -92,10 +92,6 @@ public class RemoteRetryStrategies extends AbstractRetryStrategies { @Override protected RetryExecutorParameter getRetryExecutorParameter(RetryerInfo retryerInfo) { return new RetryExecutorParameter() { - @Override - public Predicate exceptionPredicate() { - return throwable -> RemoteRetryStrategies.super.validate(throwable.getClass(), retryerInfo); - } @Override public WaitStrategy backOff() {