gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

Pre Merge pull request !35 from 李中原/dev_2.6.0

Browse Source
This commit is contained in:
李中原 2023-12-13 10:41:24 +00:00 committed by Gitee
commit 1eae4cf078
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/expression/AbstractExpressionEngine.java
View File

@ -1,9 +1,8 @@
package com.aizuda.easy.retry.client.core.expression; package com.aizuda.easy.retry.client.core.expression;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ArrayUtil;
import com.aizuda.easy.retry.client.core.ExpressionEngine; 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 org.springframework.core.DefaultParameterNameDiscoverer;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@ -21,13 +20,13 @@ public abstract class AbstractExpressionEngine implements ExpressionEngine {
@Override @Override
public Object eval(String expression, Object[] args, Method method) { public Object eval(String expression, Object[] args, Method method) {
if (StringUtils.isBlank(expression)) { if (StrUtil.isBlank(expression)) {
return StrUtil.EMPTY; return StrUtil.EMPTY;
} }
// 获取参数名称 // 获取参数名称
String[] paramNameArr = DISCOVERER.getParameterNames(method); String[] paramNameArr = DISCOVERER.getParameterNames(method);
if (ArrayUtils.isEmpty(paramNameArr)) { if (ArrayUtil.isEmpty(paramNameArr)) {
return null; return null;
} }

4
easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/ExecutorMethodScanner.java
View File

@ -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.client.core.strategy.ExecutorMethod;
import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.common.core.log.LogUtils;
import lombok.extern.slf4j.Slf4j; 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.aop.support.AopUtils;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
@ -77,7 +77,7 @@ public class ExecutorMethodScanner implements Scanner, ApplicationContextAware {
1, 1,
1, 1,
idempotentIdGenerate, idempotentIdGenerate,
StringUtils.EMPTY, StrUtil.EMPTY,
(Class<? extends ExecutorMethod>) executor.getClass(), (Class<? extends ExecutorMethod>) executor.getClass(),
Boolean.TRUE, Boolean.TRUE,
retryCompleteCallback, retryCompleteCallback,

6
easy-retry-client/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java
View File

@ -3,7 +3,7 @@ package com.aizuda.easy.retry.client.core.serializer;
import com.aizuda.easy.retry.client.core.RetryArgSerializer; import com.aizuda.easy.retry.client.core.RetryArgSerializer;
import com.caucho.hessian.io.HessianInput; import com.caucho.hessian.io.HessianInput;
import com.caucho.hessian.io.HessianOutput; 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.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -23,7 +23,7 @@ public class HessianSerializer implements RetryArgSerializer {
@Override @Override
public String serialize(Object t) { public String serialize(Object t) {
if (Objects.isNull(t)) { if (Objects.isNull(t)) {
return StringUtils.EMPTY; return StrUtil.EMPTY;
} }
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) { try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
@ -37,7 +37,7 @@ public class HessianSerializer implements RetryArgSerializer {
@Override @Override
public Object deSerialize(String infoStr, Class aClass, Method method) { public Object deSerialize(String infoStr, Class aClass, Method method) {
if (StringUtils.isBlank(infoStr)) { if (StrUtil.isBlank(infoStr)) {
return null; return null;
} }