From 77556625f72ef640648891676db2ba8c83f75f26 Mon Sep 17 00:00:00 2001
From: lizhongyuan3 <lizhongyuan3@yeah.net>
Date: Wed, 13 Dec 2023 18:38:43 +0800
Subject: [PATCH] =?UTF-8?q?org.apache.commons.lang.StringUtils=20=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=20cn.hutool.core.util.StrUtil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/core/expression/AbstractExpressionEngine.java   | 7 +++----
 .../client/core/register/scan/ExecutorMethodScanner.java   | 4 ++--
 .../retry/client/core/serializer/HessianSerializer.java    | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/expression/AbstractExpressionEngine.java b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/expression/AbstractExpressionEngine.java
index 4cd5fa0c..fa1081a1 100644
--- a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/expression/AbstractExpressionEngine.java
+++ b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/expression/AbstractExpressionEngine.java
@@ -1,9 +1,8 @@
 package com.aizuda.easy.retry.client.core.expression;
 
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
 import com.aizuda.easy.retry.client.core.ExpressionEngine;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 
 import java.lang.reflect.Method;
@@ -21,13 +20,13 @@ public abstract class AbstractExpressionEngine implements ExpressionEngine {
     @Override
     public Object eval(String expression, Object[] args, Method method) {
 
-        if (StringUtils.isBlank(expression)) {
+        if (StrUtil.isBlank(expression)) {
             return StrUtil.EMPTY;
         }
 
         // 获取参数名称
         String[] paramNameArr = DISCOVERER.getParameterNames(method);
-        if (ArrayUtils.isEmpty(paramNameArr)) {
+        if (ArrayUtil.isEmpty(paramNameArr)) {
             return null;
         }
 
diff --git a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/ExecutorMethodScanner.java b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/ExecutorMethodScanner.java
index 47f83dba..9e281630 100644
--- a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/ExecutorMethodScanner.java
+++ b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/ExecutorMethodScanner.java
@@ -9,7 +9,7 @@ import com.aizuda.easy.retry.client.core.retryer.RetryerInfo;
 import com.aizuda.easy.retry.client.core.strategy.ExecutorMethod;
 import com.aizuda.easy.retry.common.core.log.LogUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import cn.hutool.core.util.StrUtil;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -77,7 +77,7 @@ public class ExecutorMethodScanner implements Scanner, ApplicationContextAware {
                 1,
                 1,
                 idempotentIdGenerate,
-                StringUtils.EMPTY,
+                StrUtil.EMPTY,
                 (Class<? extends ExecutorMethod>) executor.getClass(),
                 Boolean.TRUE,
                 retryCompleteCallback,
diff --git a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java
index bf0ea6c2..f1a127d4 100644
--- a/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java
+++ b/easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java
@@ -3,7 +3,7 @@ package com.aizuda.easy.retry.client.core.serializer;
 import com.aizuda.easy.retry.client.core.RetryArgSerializer;
 import com.caucho.hessian.io.HessianInput;
 import com.caucho.hessian.io.HessianOutput;
-import org.apache.commons.lang.StringUtils;
+import cn.hutool.core.util.StrUtil;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -23,7 +23,7 @@ public class HessianSerializer implements RetryArgSerializer {
     @Override
     public String serialize(Object t) {
         if (Objects.isNull(t)) {
-            return StringUtils.EMPTY;
+            return StrUtil.EMPTY;
         }
 
         try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
@@ -37,7 +37,7 @@ public class HessianSerializer implements RetryArgSerializer {
 
     @Override
     public Object deSerialize(String infoStr, Class aClass, Method method) {
-        if (StringUtils.isBlank(infoStr)) {
+        if (StrUtil.isBlank(infoStr)) {
             return null;
         }