diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java index ca4d27e..ff852a0 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/AnchorState.java @@ -29,8 +29,8 @@ public enum AnchorState { ; - private Integer code; - private String description; + private final Integer code; + private final String description; /** * 通过code获取描述 diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java index 8001d13..8b0868e 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/AuditStatus.java @@ -21,8 +21,8 @@ public enum AuditStatus { AUDIT_SUCCESS(20, "审核成功"), AUDIT_REJECT(30, "被拒绝"); - private Integer code; - private String description; + private final Integer code; + private final String description; } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java index c81882d..e9ea330 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/ChannelType.java @@ -34,29 +34,29 @@ public enum ChannelType { /** * 编码值 */ - private Integer code; + private final Integer code; /** * 描述 */ - private String description; + private final String description; /** * 内容模型Class */ - private Class contentModelClass; + private final Class contentModelClass; /** * 英文标识 */ - private String codeEn; + private final String codeEn; /** * 通过code获取class * @param code * @return */ - public static Class getChanelModelClassByCode(Integer code) { + public static Class getChanelModelClassByCode(Integer code) { ChannelType[] values = values(); for (ChannelType value : values) { if (value.getCode().equals(code)) { diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java index 3adee2f..6524309 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/DeduplicationType.java @@ -19,8 +19,8 @@ public enum DeduplicationType { CONTENT(10, "N分钟相同内容去重"), FREQUENCY(20, "一天内N次相同渠道去重"), ; - private Integer code; - private String description; + private final Integer code; + private final String description; /** diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java index fc95288..c5f994a 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/FileType.java @@ -19,8 +19,8 @@ public enum FileType { COMMON_FILE("30", "file"), VIDEO("40", "video"), ; - private String code; - private String name; + private final String code; + private final String name; public static String getNameByCode(String code) { for (FileType fileType : FileType.values()) { diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java index f0fd5a2..0799512 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/IdType.java @@ -25,8 +25,8 @@ public enum IdType { FEI_SHU_USER_ID(90, "fei_shu_user_id"), ; - private Integer code; - private String description; + private final Integer code; + private final String description; } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java index 5986c36..7930316 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageStatus.java @@ -24,8 +24,8 @@ public enum MessageStatus { SEND_SUCCESS(60, "发送成功"), SEND_FAIL(70, "发送失败"); - private Integer code; - private String description; + private final Integer code; + private final String description; } diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java index 9030315..0f24bdc 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/MessageType.java @@ -21,18 +21,18 @@ public enum MessageType { /** * 编码值 */ - private Integer code; + private final Integer code; /** * 描述 */ - private String description; + private final String description; /** * 英文标识 */ - private String codeEn; + private final String codeEn; /** diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java index 7301853..d733662 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SendMessageType.java @@ -33,28 +33,28 @@ public enum SendMessageType { ; - private String code; - private String description; + private final String code; + private final String description; /** * 钉钉工作消息的类型值 */ - private String dingDingRobotType; + private final String dingDingRobotType; /** * 钉钉机器人消息的类型值 */ - private String dingDingWorkType; + private final String dingDingWorkType; /** * 企业微信机器人的类型值 */ - private String enterpriseWeChatRobotType; + private final String enterpriseWeChatRobotType; /** * 飞书机器人类型值 */ - private String feiShuRobotType; + private final String feiShuRobotType; /** diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java index ea00e3a..e854a69 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/ShieldType.java @@ -19,8 +19,8 @@ public enum ShieldType { NIGHT_SHIELD(20, "夜间屏蔽"), NIGHT_SHIELD_BUT_NEXT_DAY_SEND(30, "夜间屏蔽(次日早上9点发送)"); - private Integer code; - private String description; + private final Integer code; + private final String description; diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java index 8bbdf67..e2fd44b 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsStatus.java @@ -18,8 +18,8 @@ public enum SmsStatus { RECEIVE_FAIL(30, "用户收不到短信(收到渠道短信回执，状态失败)"), SEND_FAIL(40, "调用渠道接口发送失败"); - private Integer code; - private String description; + private final Integer code; + private final String description; /** diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java index 818acba..5084d09 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/SmsSupplier.java @@ -17,8 +17,8 @@ public enum SmsSupplier { TENCENT(10,"腾讯渠道商"), YUN_PAIN(20,"云片渠道商"); - private Integer code; - private String description; + private final Integer code; + private final String description; /** diff --git a/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java b/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java index 75b0c8d..0349ccd 100644 --- a/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java +++ b/austin-common/src/main/java/com/java3y/austin/common/enums/TemplateType.java @@ -17,7 +17,7 @@ public enum TemplateType { REALTIME(20, "实时类的模板(接口实时调用)"), ; - private Integer code; - private String description; + private final Integer code; + private final String description; } diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/pending/CrowdBatchTaskPending.java b/austin-cron/src/main/java/com/java3y/austin/cron/pending/CrowdBatchTaskPending.java index 7b420df..d3de60c 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/pending/CrowdBatchTaskPending.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/pending/CrowdBatchTaskPending.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.concurrent.LinkedBlockingQueue; /** @@ -56,7 +57,7 @@ public class CrowdBatchTaskPending extends AbstractLazyPending { for (CrowdInfoVo crowdInfoVo : crowdInfoVos) { String receiver = crowdInfoVo.getReceiver(); Map vars = crowdInfoVo.getParams(); - if (paramMap.get(vars) == null) { + if (Objects.isNull(paramMap.get(vars))) { paramMap.put(vars, receiver); } else { String newReceiver = StringUtils.join(new String[]{ diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/utils/ReadFileUtils.java b/austin-cron/src/main/java/com/java3y/austin/cron/utils/ReadFileUtils.java index c1de5aa..a9cb722 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/utils/ReadFileUtils.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/utils/ReadFileUtils.java @@ -10,10 +10,7 @@ import com.java3y.austin.cron.vo.CrowdInfoVo; import lombok.extern.slf4j.Slf4j; import java.io.FileReader; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 读取人群文件 工具类 @@ -97,7 +94,7 @@ public class ReadFileUtils { List result = new ArrayList<>(); try { CsvData data = CsvUtil.getReader().read(FileUtil.file(path)); - if (data == null || data.getRow(0) == null || data.getRow(1) == null) { + if (Objects.isNull(data) || Objects.isNull(data.getRow(0)) || Objects.isNull(data.getRow(1))) { log.error("read csv file empty!,path:{}", path); } // 第一行为默认为头信息,所以遍历从第二行开始,第一列默认为接收者Id(不处理) diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobGroup.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobGroup.java index d7d59db..d561fe6 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobGroup.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/entity/XxlJobGroup.java @@ -6,10 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 执行器组信息 @@ -44,7 +41,7 @@ public class XxlJobGroup { private List registryList; public List getRegistryList() { - if (addressList != null && addressList.trim().length() > 0) { + if (Objects.nonNull(addressList) && addressList.trim().length() > 0) { registryList = new ArrayList(Arrays.asList(addressList.split(","))); } return registryList; diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java index 5374516..129892b 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/service/impl/CronTaskServiceImpl.java @@ -21,6 +21,7 @@ import java.net.HttpCookie; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * @author 3y @@ -42,7 +43,7 @@ public class CronTaskServiceImpl implements CronTaskService { @Override public BasicResultVO saveCronTask(XxlJobInfo xxlJobInfo) { Map params = JSON.parseObject(JSON.toJSONString(xxlJobInfo), Map.class); - String path = xxlJobInfo.getId() == null ? xxlAddresses + XxlJobConstant.INSERT_URL + String path = Objects.isNull(xxlJobInfo.getId()) ? xxlAddresses + XxlJobConstant.INSERT_URL : xxlAddresses + XxlJobConstant.UPDATE_URL; HttpResponse response; @@ -145,7 +146,7 @@ public class CronTaskServiceImpl implements CronTaskService { try { response = HttpRequest.post(path).form(params).cookie(getCookie()).execute(); Integer id = JSON.parseObject(response.body()).getJSONArray("data").getJSONObject(0).getInteger("id"); - if (response.isOk() && id != null) { + if (response.isOk() && Objects.nonNull(id)) { return BasicResultVO.success(id); } } catch (Exception e) { diff --git a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java index 4df140c..a2651b4 100644 --- a/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java +++ b/austin-cron/src/main/java/com/java3y/austin/cron/xxl/utils/XxlJobUtils.java @@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.Date; +import java.util.Objects; /** * xxlJob工具类 @@ -68,7 +69,7 @@ public class XxlJobUtils { .alarmEmail(StrUtil.EMPTY) .childJobId(StrUtil.EMPTY).build(); - if (messageTemplate.getCronTaskId() != null) { + if (Objects.nonNull(messageTemplate.getCronTaskId())) { xxlJobInfo.setId(messageTemplate.getCronTaskId()); } return xxlJobInfo; @@ -80,7 +81,7 @@ public class XxlJobUtils { */ private Integer queryJobGroupId() { BasicResultVO basicResultVO = cronTaskService.getGroupId(appName, jobHandlerName); - if (basicResultVO.getData() == null) { + if (Objects.isNull(basicResultVO.getData())) { XxlJobGroup xxlJobGroup = XxlJobGroup.builder().appname(appName).title(jobHandlerName).addressType(CommonConstant.FALSE).build(); if (RespStatusEnum.SUCCESS.getCode().equals(cronTaskService.createGroup(xxlJobGroup).getStatus())) { return (int) cronTaskService.getGroupId(appName, jobHandlerName).getData(); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java index bf254b2..b225822 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/DeduplicationRuleService.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * @author 3y. @@ -34,7 +35,7 @@ public class DeduplicationRuleService { List deduplicationList = DeduplicationType.getDeduplicationList(); for (Integer deduplicationType : deduplicationList) { DeduplicationParam deduplicationParam = deduplicationHolder.selectBuilder(deduplicationType).build(deduplicationConfig, taskInfo); - if (deduplicationParam != null) { + if (Objects.nonNull(deduplicationParam)) { deduplicationHolder.selectService(deduplicationType).deduplication(deduplicationParam); } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java index f69c2a8..a08a14c 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/AbstractDeduplicationBuilder.java @@ -7,6 +7,7 @@ import com.java3y.austin.handler.deduplication.DeduplicationParam; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.PostConstruct; +import java.util.Objects; /** * @author 3y @@ -26,11 +27,11 @@ public abstract class AbstractDeduplicationBuilder implements Builder { public DeduplicationParam getParamsFromConfig(Integer key, String duplicationConfig, TaskInfo taskInfo) { JSONObject object = JSONObject.parseObject(duplicationConfig); - if (object == null) { + if (Objects.isNull(object)) { return null; } DeduplicationParam deduplicationParam = JSONObject.parseObject(object.getString(DEDUPLICATION_CONFIG_PRE + key), DeduplicationParam.class); - if (deduplicationParam == null) { + if (Objects.isNull(deduplicationParam)) { return null; } deduplicationParam.setTaskInfo(taskInfo); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java index 358c11e..e946395 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/ContentDeduplicationBuilder.java @@ -6,6 +6,8 @@ import com.java3y.austin.common.enums.DeduplicationType; import com.java3y.austin.handler.deduplication.DeduplicationParam; import org.springframework.stereotype.Service; +import java.util.Objects; + /** * @author huskey @@ -21,7 +23,7 @@ public class ContentDeduplicationBuilder extends AbstractDeduplicationBuilder im @Override public DeduplicationParam build(String deduplication, TaskInfo taskInfo) { DeduplicationParam deduplicationParam = getParamsFromConfig(deduplicationType, deduplication, taskInfo); - if (deduplicationParam == null) { + if (Objects.isNull(deduplicationParam)) { return null; } deduplicationParam.setAnchorState(AnchorState.CONTENT_DEDUPLICATION); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/FrequencyDeduplicationBuilder.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/FrequencyDeduplicationBuilder.java index 3d83962..3d8b67a 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/FrequencyDeduplicationBuilder.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/build/FrequencyDeduplicationBuilder.java @@ -8,6 +8,7 @@ import com.java3y.austin.handler.deduplication.DeduplicationParam; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.Objects; /** * @author huskey @@ -23,7 +24,7 @@ public class FrequencyDeduplicationBuilder extends AbstractDeduplicationBuilder @Override public DeduplicationParam build(String deduplication, TaskInfo taskInfo) { DeduplicationParam deduplicationParam = getParamsFromConfig(deduplicationType, deduplication, taskInfo); - if (deduplicationParam == null) { + if (Objects.isNull(deduplicationParam)) { return null; } deduplicationParam.setDeduplicationTime((DateUtil.endOfDay(new Date()).getTime() - DateUtil.current()) / 1000); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java index 569188b..84efc77 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/deduplication/limit/SimpleLimitService.java @@ -40,7 +40,7 @@ public class SimpleLimitService extends AbstractLimitService { String value = inRedisValue.get(key); // 符合条件的用户 - if (value != null && Integer.parseInt(value) >= param.getCountNum()) { + if (Objects.nonNull(value) && Integer.parseInt(value) >= param.getCountNum()) { filterReceiver.add(receiver); } else { readyPutRedisReceiver.put(receiver, key); @@ -64,8 +64,8 @@ public class SimpleLimitService extends AbstractLimitService { Map keyValues = new HashMap<>(readyPutRedisReceiver.size()); for (Map.Entry entry : readyPutRedisReceiver.entrySet()) { String key = entry.getValue(); - if (inRedisValue.get(key) != null) { - keyValues.put(key, String.valueOf(Integer.valueOf(inRedisValue.get(key)) + 1)); + if (Objects.nonNull(inRedisValue.get(key))) { + keyValues.put(key, String.valueOf(Integer.parseInt(inRedisValue.get(key)) + 1)); } else { keyValues.put(key, String.valueOf(CommonConstant.TRUE)); } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java b/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java index 80ac3f1..2109cfc 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/enums/RateLimitStrategy.java @@ -19,8 +19,8 @@ public enum RateLimitStrategy { SEND_USER_NUM_RATE_LIMIT(20, "根据发送用户数限流"), ; - private Integer code; - private String description; + private final Integer code; + private final String description; } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java index 217b790..e617032 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/flowcontrol/FlowControlFactory.java @@ -50,7 +50,7 @@ public class FlowControlFactory implements ApplicationContextAware { Double rateInitValue = flowControlParam.getRateInitValue(); // 对比 初始限流值 与 配置限流值，以 配置中心的限流值为准 Double rateLimitConfig = getRateLimitConfig(taskInfo.getSendChannel()); - if (rateLimitConfig != null && !rateInitValue.equals(rateLimitConfig)) { + if (Objects.nonNull(rateLimitConfig) && !rateInitValue.equals(rateLimitConfig)) { rateLimiter = RateLimiter.create(rateLimitConfig); flowControlParam.setRateInitValue(rateLimitConfig); flowControlParam.setRateLimiter(rateLimiter); @@ -79,7 +79,7 @@ public class FlowControlFactory implements ApplicationContextAware { private Double getRateLimitConfig(Integer channelCode) { String flowControlConfig = config.getProperty(FLOW_CONTROL_KEY, CommonConstant.EMPTY_JSON_OBJECT); JSONObject jsonObject = JSON.parseObject(flowControlConfig); - if (jsonObject.getDouble(FLOW_CONTROL_PREFIX + channelCode) == null) { + if (Objects.isNull(jsonObject.getDouble(FLOW_CONTROL_PREFIX + channelCode))) { return null; } return jsonObject.getDouble(FLOW_CONTROL_PREFIX + channelCode); diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java b/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java index 1e70ddb..d25b6e9 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/handler/BaseHandler.java @@ -9,6 +9,8 @@ import com.java3y.austin.support.utils.LogUtils; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Objects; + /** * @author 3y * 发送各个渠道的handler @@ -48,7 +50,7 @@ public abstract class BaseHandler implements Handler { */ public void flowControl(TaskInfo taskInfo) { // 只有子类指定了限流参数，才需要限流 - if (flowControlParam != null) { + if (Objects.nonNull(flowControlParam)) { flowControlFactory.flowControl(taskInfo, flowControlParam); } } diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java index 4baca75..1394cd8 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/TencentSmsScript.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** * @author 3y @@ -79,7 +80,7 @@ public class TencentSmsScript implements SmsScript { * @return */ private List assembleSendSmsRecord(SmsParam smsParam, SendSmsResponse response, TencentSmsAccount tencentSmsAccount) { - if (response == null || ArrayUtil.isEmpty(response.getSendStatusSet())) { + if (Objects.isNull(response) || ArrayUtil.isEmpty(response.getSendStatusSet())) { return null; } @@ -150,7 +151,7 @@ public class TencentSmsScript implements SmsScript { */ private List assemblePullSmsRecord(TencentSmsAccount account, PullSmsSendStatusResponse resp) { List smsRecordList = new ArrayList<>(); - if (resp != null && resp.getPullSmsSendStatusSet() != null && resp.getPullSmsSendStatusSet().length > 0) { + if (Objects.nonNull(resp) && Objects.nonNull(resp.getPullSmsSendStatusSet()) && resp.getPullSmsSendStatusSet().length > 0) { for (PullSmsSendStatus pullSmsSendStatus : resp.getPullSmsSendStatusSet()) { SmsRecord smsRecord = SmsRecord.builder() .sendDate(Integer.valueOf(DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN))) diff --git a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java index e19a4ed..859f86e 100644 --- a/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/handler/script/impl/YunPianSmsScript.java @@ -81,7 +81,7 @@ public class YunPianSmsScript implements SmsScript { private List assembleSmsRecord(SmsParam smsParam, YunPianSendResult response, YunPianSmsAccount account) { - if (response == null || ArrayUtil.isEmpty(response.getData())) { + if (Objects.isNull(response) || ArrayUtil.isEmpty(response.getData())) { return null; } diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java index c70d95c..61881a9 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/AssembleAction.java @@ -107,8 +107,7 @@ public class AssembleAction implements BusinessProcess { // 得到真正的ContentModel 类型 Integer sendChannel = messageTemplate.getSendChannel(); - Class contentModelClass = ChannelType.getChanelModelClassByCode(sendChannel); - + Class contentModelClass = ChannelType.getChanelModelClassByCode(sendChannel); // 得到模板的 msgContent 和 入参 Map variables = messageParam.getVariables(); @@ -117,7 +116,7 @@ public class AssembleAction implements BusinessProcess { // 通过反射 组装出 contentModel Field[] fields = ReflectUtil.getFields(contentModelClass); - ContentModel contentModel = (ContentModel) ReflectUtil.newInstance(contentModelClass); + ContentModel contentModel = ReflectUtil.newInstance(contentModelClass); for (Field field : fields) { String originValue = jsonObject.getString(field.getName()); diff --git a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java index 6255859..5ae1665 100644 --- a/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java +++ b/austin-service-api-impl/src/main/java/com/java3y/austin/service/api/impl/action/PreParamCheckAction.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -33,7 +34,7 @@ public class PreParamCheckAction implements BusinessProcess { List messageParamList = sendTaskModel.getMessageParamList(); // 1.没有传入 消息模板Id 或者 messageParam - if (messageTemplateId == null || CollUtil.isEmpty(messageParamList)) { + if (Objects.isNull(messageTemplateId) || CollUtil.isEmpty(messageParamList)) { context.setNeedBreak(true).setResponse(BasicResultVO.fail(RespStatusEnum.CLIENT_BAD_PARAMETERS)); return; } diff --git a/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java b/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java index e42540d..3ef3e49 100644 --- a/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java +++ b/austin-service-api/src/main/java/com/java3y/austin/service/api/enums/BusinessCode.java @@ -21,10 +21,10 @@ public enum BusinessCode { /** code 关联着责任链的模板 */ - private String code; + private final String code; /** 类型说明 */ - private String description; + private final String description; } diff --git a/austin-support/src/main/java/com/java3y/austin/support/exception/ProcessException.java b/austin-support/src/main/java/com/java3y/austin/support/exception/ProcessException.java index 129cfab..327b0b9 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/exception/ProcessException.java +++ b/austin-support/src/main/java/com/java3y/austin/support/exception/ProcessException.java @@ -3,6 +3,8 @@ package com.java3y.austin.support.exception; import com.java3y.austin.common.enums.RespStatusEnum; import com.java3y.austin.support.pipeline.ProcessContext; +import java.util.Objects; + /** * @author SamLee * @since 2022-03-29 @@ -26,7 +28,7 @@ public class ProcessException extends RuntimeException { @Override public String getMessage() { - if (this.processContext != null) { + if (Objects.nonNull(this.processContext)) { return this.processContext.getResponse().getMsg(); } else { return RespStatusEnum.CONTEXT_IS_NULL.getMsg(); diff --git a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessController.java b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessController.java index e21ce34..acb4bd1 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessController.java +++ b/austin-support/src/main/java/com/java3y/austin/support/pipeline/ProcessController.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 流程控制器 @@ -66,7 +67,7 @@ public class ProcessController { */ private void preCheck(ProcessContext context) throws ProcessException { // 上下文 - if (context == null) { + if (Objects.isNull(context)) { context = new ProcessContext(); context.setResponse(BasicResultVO.fail(RespStatusEnum.CONTEXT_IS_NULL)); throw new ProcessException(context); @@ -81,7 +82,7 @@ public class ProcessController { // 执行模板 ProcessTemplate processTemplate = templateConfig.get(businessCode); - if (processTemplate == null) { + if (Objects.isNull(processTemplate)) { context.setResponse(BasicResultVO.fail(RespStatusEnum.PROCESS_TEMPLATE_IS_NULL)); throw new ProcessException(context); } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java index 9d51a43..5758b2f 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/AccountUtils.java @@ -35,7 +35,7 @@ public class AccountUtils { return JSON.parseObject(channelAccount.getAccountConfig(), clazz); } } catch (Exception e) { - log.error("AccountUtils#getAccount fail!", Throwables.getStackTraceAsString(e)); + log.error("AccountUtils#getAccount fail! e:{}", Throwables.getStackTraceAsString(e)); } return null; } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/OkHttpUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/OkHttpUtils.java index b72f4cf..e4c4f2a 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/OkHttpUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/OkHttpUtils.java @@ -9,6 +9,7 @@ import org.springframework.stereotype.Component; import java.nio.charset.StandardCharsets; import java.util.Map; +import java.util.Objects; /** * @author 3y @@ -67,7 +68,7 @@ public class OkHttpUtils { */ public String doGet(String url, Map params, Map headers) { StringBuilder sb = new StringBuilder(url); - if (params != null && params.keySet().size() > 0) { + if (Objects.nonNull(params) && params.keySet().size() > 0) { boolean firstFlag = true; for (String key : params.keySet()) { if (firstFlag) { @@ -96,7 +97,7 @@ public class OkHttpUtils { public String doPost(String url, Map params, Map headers) { FormBody.Builder formBuilder = new FormBody.Builder(); - if (params != null && params.keySet().size() > 0) { + if (Objects.nonNull(params) && params.keySet().size() > 0) { for (String key : params.keySet()) { formBuilder.add(key, params.get(key)); } diff --git a/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java b/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java index 0b73201..bd01ed1 100644 --- a/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java +++ b/austin-support/src/main/java/com/java3y/austin/support/utils/RedisUtils.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * @author 3y @@ -170,7 +171,7 @@ public class RedisUtils { try { Long execute = redisTemplate.execute(redisScript, keys, args); - if (execute == null) { + if (Objects.isNull(execute)) { return false; } return CommonConstant.TRUE.equals(execute.intValue()); diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java index 3af9886..c98191b 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/DataController.java @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.Objects; /** * 获取数据接口（全链路追踪) @@ -50,7 +51,7 @@ public class DataController { @PostMapping("/sms") @ApiOperation("/获取短信下发数据") public BasicResultVO getSmsData(@RequestBody DataParam dataParam) { - if (dataParam == null || dataParam.getDateTime() == null || StrUtil.isBlank(dataParam.getReceiver())) { + if (Objects.isNull(dataParam) || Objects.isNull(dataParam.getDateTime()) || StrUtil.isBlank(dataParam.getReceiver())) { return new BasicResultVO<>(RespStatusEnum.SUCCESS, SmsTimeLineVo.builder().items(new ArrayList<>()).build()); } diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java index 9a300b9..f40edc3 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/MessageTemplateController.java @@ -34,6 +34,7 @@ import java.io.File; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @@ -154,7 +155,7 @@ public class MessageTemplateController { public BasicResultVO test(Long id) { MessageTemplate messageTemplate = messageTemplateService.queryById(id); CommonAmisVo commonAmisVo = Convert4Amis.getTestContent(messageTemplate.getMsgContent()); - if (commonAmisVo != null) { + if (Objects.nonNull(commonAmisVo)) { return BasicResultVO.success(commonAmisVo); } return BasicResultVO.success(); diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java index 87b241c..a7c11c4 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/MiniProgramController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 微信服务号 @@ -60,7 +61,7 @@ public class MiniProgramController { @PostMapping("/detailTemplate") @ApiOperation("/根据账号Id和模板ID获取模板列表") public BasicResultVO queryDetailList(Long id, String wxTemplateId) { - if (id == null || wxTemplateId == null) { + if (Objects.isNull(id) || Objects.isNull(wxTemplateId)) { return BasicResultVO.success(RespStatusEnum.CLIENT_BAD_PARAMETERS); } try { diff --git a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java index 9c11c86..df98a5e 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java +++ b/austin-web/src/main/java/com/java3y/austin/web/controller/OfficialAccountController.java @@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 微信服务号 @@ -86,7 +87,7 @@ public class OfficialAccountController { @PostMapping("/detailTemplate") @ApiOperation("/根据账号Id和模板ID获取模板列表") public BasicResultVO queryDetailList(Long id, String wxTemplateId) { - if (id == null || wxTemplateId == null) { + if (Objects.isNull(id) || Objects.isNull(wxTemplateId)) { return BasicResultVO.success(RespStatusEnum.CLIENT_BAD_PARAMETERS); } try { @@ -113,7 +114,7 @@ public class OfficialAccountController { public String receiptMessage(HttpServletRequest request) { try { WeChatLoginConfig configService = loginUtils.getLoginConfig(); - if (configService == null) { + if (Objects.isNull(configService)) { return RespStatusEnum.DO_NOT_NEED_LOGIN.getMsg(); } WxMpService wxMpService = configService.getOfficialAccountLoginService(); @@ -164,7 +165,7 @@ public class OfficialAccountController { public BasicResultVO getQrCode() { try { WeChatLoginConfig configService = loginUtils.getLoginConfig(); - if (configService == null) { + if (Objects.isNull(configService)) { return BasicResultVO.fail(RespStatusEnum.DO_NOT_NEED_LOGIN); } String id = IdUtil.getSnowflake().nextIdStr(); diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java index a55eab7..af9e4f8 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/ChannelAccountServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * @author 3y @@ -26,7 +27,7 @@ public class ChannelAccountServiceImpl implements ChannelAccountService { @Override public ChannelAccount save(ChannelAccount channelAccount) { - if (channelAccount.getId() == null) { + if (Objects.isNull(channelAccount.getId())) { channelAccount.setCreated(Math.toIntExact(DateUtil.currentSeconds())); channelAccount.setIsDeleted(CommonConstant.FALSE); } diff --git a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java index da38fb7..3f84ed3 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/web/service/impl/MessageTemplateServiceImpl.java @@ -26,6 +26,7 @@ import org.springframework.stereotype.Service; import javax.persistence.criteria.Predicate; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** * 消息模板管理 Service @@ -74,7 +75,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { @Override public MessageTemplate saveOrUpdate(MessageTemplate messageTemplate) { - if (messageTemplate.getId() == null) { + if (Objects.isNull(messageTemplate.getId())) { initStatus(messageTemplate); } else { resetStatus(messageTemplate); @@ -90,7 +91,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { Iterable messageTemplates = messageTemplateDao.findAllById(ids); messageTemplates.forEach(messageTemplate -> messageTemplate.setIsDeleted(CommonConstant.TRUE)); for (MessageTemplate messageTemplate : messageTemplates) { - if (messageTemplate.getCronTaskId() != null && messageTemplate.getCronTaskId() > 0) { + if (Objects.nonNull(messageTemplate.getCronTaskId()) && messageTemplate.getCronTaskId() > 0) { cronTaskService.deleteCronTask(messageTemplate.getCronTaskId()); } } @@ -120,12 +121,12 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { // 3.获取taskId(如果本身存在则复用原有任务，如果不存在则得到新建后任务ID) Integer taskId = messageTemplate.getCronTaskId(); BasicResultVO basicResultVO = cronTaskService.saveCronTask(xxlJobInfo); - if (taskId == null && RespStatusEnum.SUCCESS.getCode().equals(basicResultVO.getStatus()) && basicResultVO.getData() != null) { + if (Objects.isNull(taskId) && RespStatusEnum.SUCCESS.getCode().equals(basicResultVO.getStatus()) && Objects.nonNull(basicResultVO.getData())) { taskId = Integer.valueOf(String.valueOf(basicResultVO.getData())); } // 4. 启动定时任务 - if (taskId != null) { + if (Objects.nonNull(taskId)) { cronTaskService.startCronTask(taskId); MessageTemplate clone = ObjectUtil.clone(messageTemplate).setMsgStatus(MessageStatus.RUN.getCode()).setCronTaskId(taskId).setUpdated(Math.toIntExact(DateUtil.currentSeconds())); messageTemplateDao.save(clone); @@ -173,7 +174,7 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { messageTemplate.setUpdator(messageTemplate.getUpdator()) .setMsgStatus(MessageStatus.INIT.getCode()).setAuditStatus(AuditStatus.WAIT_AUDIT.getCode()); - if (messageTemplate.getCronTaskId() != null && TemplateType.CLOCKING.getCode().equals(messageTemplate.getTemplateType())) { + if (Objects.nonNull(messageTemplate.getCronTaskId()) && TemplateType.CLOCKING.getCode().equals(messageTemplate.getTemplateType())) { XxlJobInfo xxlJobInfo = xxlJobUtils.buildXxlJobInfo(messageTemplate); cronTaskService.saveCronTask(xxlJobInfo); cronTaskService.stopCronTask(messageTemplate.getCronTaskId()); diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/LoginUtils.java b/austin-web/src/main/java/com/java3y/austin/web/utils/LoginUtils.java index 512e473..5908018 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/LoginUtils.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/LoginUtils.java @@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; +import java.util.Objects; + /** * @author 3y * @date 2022/12/22 @@ -47,7 +49,7 @@ public class LoginUtils { public boolean needLogin() { try { WeChatLoginConfig bean = applicationContext.getBean(OfficialAccountParamConstant.WE_CHAT_LOGIN_CONFIG, WeChatLoginConfig.class); - if (CommonConstant.ENV_TEST.equals(env) && bean != null) { + if (CommonConstant.ENV_TEST.equals(env) && Objects.nonNull(bean)) { return true; } } catch (Exception e) { diff --git a/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java b/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java index c5f480c..bccd966 100644 --- a/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java +++ b/austin-web/src/main/java/com/java3y/austin/web/utils/SpringFileUtils.java @@ -6,6 +6,7 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.util.Objects; /** @@ -35,7 +36,7 @@ public class SpringFileUtils { } catch (IOException e) { e.printStackTrace(); } finally { - if (out != null) { + if (Objects.nonNull(out)) { try { out.close(); } catch (IOException e) {