sonar代码规范问题修复

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/enums/CommonStatusEnum.java

@@ -1,11 +1,11 @@
 package com.cf.imes.framework.common.enums;
 
-import cn.hutool.core.util.ObjUtil;
 import com.cf.imes.framework.common.core.IntArrayValuable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * 通用状态枚举
@@ -36,11 +36,11 @@ public enum CommonStatusEnum implements IntArrayValuable {
     }
 
     public static boolean isEnable(Integer status) {
-        return ObjUtil.equal(ENABLE.status, status);
+        return Objects.equals(ENABLE.status, status);
     }
 
     public static boolean isDisable(Integer status) {
-        return ObjUtil.equal(DISABLE.status, status);
+        return Objects.equals(DISABLE.status, status);
     }
 
 }

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/collection/ArrayUtils.java

@@ -1,6 +1,6 @@
 package com.cf.imes.framework.common.util.collection;
 
-import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.util.ArrayUtil;
 
@@ -8,8 +8,6 @@ import java.util.Collection;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import static com.cf.imes.framework.common.util.collection.CollectionUtils.convertList;
-
 /**
  * Array 工具类
  *
@@ -42,7 +40,7 @@ public class ArrayUtils {
 
     @SuppressWarnings("unchecked")
     public static <T> T[] toArray(Collection<T> from) {
-        if (CollectionUtil.isEmpty(from)) {
+        if (CollUtil.isEmpty(from)) {
             return (T[]) (new Object[0]);
         }
         return ArrayUtil.toArray(from, (Class<T>) IterUtil.getElementType(from.iterator()));

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/collection/CollectionUtils.java

@@ -254,7 +254,7 @@ public class CollectionUtils {
     }
 
     public static <T> T getFirst(List<T> from) {
-        return !CollectionUtil.isEmpty(from) ? from.get(0) : null;
+        return !CollUtil.isEmpty(from) ? from.get(0) : null;
     }
 
     public static <T> T findFirst(List<T> from, Predicate<T> predicate) {

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/collection/MapUtils.java

@@ -1,7 +1,6 @@
 package com.cf.imes.framework.common.util.collection;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import com.cf.imes.framework.common.core.KeyValue;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
@@ -30,7 +29,7 @@ public class MapUtils {
         List<V> result = new ArrayList<>();
         keys.forEach(k -> {
             Collection<V> values = multimap.get(k);
-            if (CollectionUtil.isEmpty(values)) {
+            if (CollUtil.isEmpty(values)) {
                 return;
             }
             result.addAll(values);

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/http/HttpUtils.java

@@ -3,8 +3,8 @@ package com.cf.imes.framework.common.util.http;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.map.TableMap;
 import cn.hutool.core.net.url.UrlBuilder;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ReflectUtil;
-import cn.hutool.core.util.StrUtil;
 import org.springframework.util.StringUtils;
 import org.springframework.web.util.UriComponents;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -104,11 +104,11 @@ public class HttpUtils {
         String clientSecret;
         // 先从 Header 中获取
         String authorization = request.getHeader("Authorization");
-        authorization = StrUtil.subAfter(authorization, "Basic ", true);
+        authorization = CharSequenceUtil.subAfter(authorization, "Basic ", true);
         if (StringUtils.hasText(authorization)) {
             authorization = Base64.decodeStr(authorization);
-            clientId = StrUtil.subBefore(authorization, ":", false);
+            clientId = CharSequenceUtil.subBefore(authorization, ":", false);
-            clientSecret = StrUtil.subAfter(authorization, ":", false);
+            clientSecret = CharSequenceUtil.subAfter(authorization, ":", false);
         // 再从 Param 中获取
         } else {
             clientId = request.getParameter("client_id");
@@ -116,7 +116,7 @@ public class HttpUtils {
         }
 
         // 如果两者非空，则返回
-        if (StrUtil.isNotEmpty(clientId) && StrUtil.isNotEmpty(clientSecret)) {
+        if (CharSequenceUtil.isNotEmpty(clientId) && CharSequenceUtil.isNotEmpty(clientSecret)) {
             return new String[]{clientId, clientSecret};
         }
         return null;

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/io/FileUtils.java

@@ -3,8 +3,8 @@ package com.cf.imes.framework.common.util.io;
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.file.FileNameUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
 import lombok.SneakyThrows;
 
@@ -73,9 +73,9 @@ public class FileUtils {
     public static String generatePath(byte[] content, String originalName) {
         String sha256Hex = DigestUtil.sha256Hex(content);
         // 情况一：如果存在 name，则优先使用 name 的后缀
-        if (StrUtil.isNotBlank(originalName)) {
+        if (CharSequenceUtil.isNotBlank(originalName)) {
             String extName = FileNameUtil.extName(originalName);
-            return StrUtil.isBlank(extName) ? sha256Hex : sha256Hex + "." + extName;
+            return CharSequenceUtil.isBlank(extName) ? sha256Hex : sha256Hex + "." + extName;
         }
         // 情况二：基于 content 计算
         return sha256Hex + '.' + FileTypeUtil.getType(new ByteArrayInputStream(content));

cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/json/JsonUtils.java

@@ -1,6 +1,7 @@
 package com.cf.imes.framework.common.util.json;
 
-import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.PrimitiveArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -68,7 +69,7 @@ public class JsonUtils {
     }
 
     public static <T> T parseObject(String text, Class<T> clazz) {
-        if (StrUtil.isEmpty(text)) {
+        if (CharSequenceUtil.isEmpty(text)) {
             return null;
         }
         try {
@@ -80,7 +81,7 @@ public class JsonUtils {
     }
 
     public static <T> T parseObject(String text, String path, Class<T> clazz) {
-        if (StrUtil.isEmpty(text)) {
+        if (CharSequenceUtil.isEmpty(text)) {
             return null;
         }
         try {
@@ -94,7 +95,7 @@ public class JsonUtils {
     }
 
     public static <T> T parseObject(String text, Type type) {
-        if (StrUtil.isEmpty(text)) {
+        if (CharSequenceUtil.isEmpty(text)) {
             return null;
         }
         try {
@@ -115,14 +116,14 @@ public class JsonUtils {
      * @return 对象
      */
     public static <T> T parseObject2(String text, Class<T> clazz) {
-        if (StrUtil.isEmpty(text)) {
+        if (CharSequenceUtil.isEmpty(text)) {
             return null;
         }
         return JSONUtil.toBean(text, clazz);
     }
 
     public static <T> T parseObject(byte[] bytes, Class<T> clazz) {
-        if (ArrayUtil.isEmpty(bytes)) {
+        if (PrimitiveArrayUtil.isEmpty(bytes)) {
             return null;
         }
         try {