代码优化

framework-common/src/main/java/com/chelvc/framework/common/model/Period.java

@@ -36,7 +36,7 @@ public final class Period implements Serializable {
     /**
      * 自定义时间匹配模式
      */
-    private static final Pattern TIME_PATTERN = StringUtils.getPattern(String.format(
+    private static final Pattern TIME_PATTERN = Pattern.compile(String.format(
             "^(%s) *\\( *(-?[0-9]+[%s])? *\\)$", StringUtils.join(Eval.values(), "|"), StringUtils.join(Unit.values())
     ));
 

framework-common/src/main/java/com/chelvc/framework/common/util/DateUtils.java

@@ -83,55 +83,51 @@ public final class DateUtils {
      */
     private static final Map<Pattern, Parser> PATTERN_PARSER_MAPPING = ImmutableMap.<Pattern, Parser>builder()
             .put(
-                    StringUtils.getPattern("^-?[0-9]+$"),
+                    Pattern.compile("^-?[0-9]+$"),
                     text -> new Date(Long.parseLong(text))
             ).put(
-                    StringUtils.getPattern("^\\d{4}-\\d{1,2}-\\d{1,2}$"),
+                    Pattern.compile("^\\d{4}-\\d{1,2}-\\d{1,2}$"),
                     new DateParser(DateTimeFormatter.ofPattern("yyyy-M-d"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}/\\d{1,2}/\\d{1,2}$"),
+                    Pattern.compile("^\\d{4}/\\d{1,2}/\\d{1,2}$"),
                     new DateParser(DateTimeFormatter.ofPattern("yyyy/M/d"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}$"),
+                    Pattern.compile("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("yyyy-M-d H"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}$"),
+                    Pattern.compile("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("yyyy/M/d H"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}$"),
+                    Pattern.compile("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("yyyy-M-d H:m"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}:\\d{1,2}$"),
+                    Pattern.compile("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}:\\d{1,2}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("yyyy/M/d H:m"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}$"),
+                    Pattern.compile("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("yyyy-M-d H:m:s"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}$"),
+                    Pattern.compile("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("yyyy/M/d H:m:s"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}\\.\\d{1,3}$"),
+                    Pattern.compile("^\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}\\.\\d{1,3}$"),
                     new MillisDatetimeParser(new SimpleDatetimeParser("yyyy-M-d H:m:s.SSS"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}\\.\\d{1,3}$"),
+                    Pattern.compile("^\\d{4}/\\d{1,2}/\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}\\.\\d{1,3}$"),
                     new MillisDatetimeParser(new SimpleDatetimeParser("yyyy-M-d H:m:s.SSS"))
             ).put(
-                    StringUtils.getPattern("^\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{1,2}:\\d{1,2}\\.\\d{1,3}\\S+$"),
+                    Pattern.compile("^\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{1,2}:\\d{1,2}\\.\\d{1,3}\\S+$"),
                     new MillisDatetimeParser(new ZonedDatetimeParser(
                             DateTimeFormatter.ofPattern("yyyy-M-d'T'H:m:s.SSSXXX")
                     ))
             ).put(
-                    StringUtils.getPattern(
-                            "^[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} CST [0-9]{4}$"
-                    ),
+                    Pattern.compile("^[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} CST [0-9]{4}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US))
             ).put(
-                    StringUtils.getPattern(
-                            "^[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} UTC [0-9]{4}$"
-                    ),
+                    Pattern.compile("^[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} UTC [0-9]{4}$"),
                     new DatetimeParser(DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US))
             ).put(
-                    StringUtils.getPattern(
+                    Pattern.compile(
                             "^[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} GMT[\\+-:0-9]{6} [0-9]{4}$"
                     ),
                     new DatetimeParser(DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss z yyyy", Locale.US))

framework-common/src/main/java/com/chelvc/framework/common/util/DesensitizeUtils.java

@@ -41,17 +41,17 @@ public final class DesensitizeUtils {
     /**
      * 固定数量匹配模式
      */
-    private static final Pattern FIXED_PATTERN = StringUtils.getPattern("^(-*|-\\?)\\*+(-*|-\\?)$");
+    private static final Pattern FIXED_PATTERN = Pattern.compile("^(-*|-\\?)\\*+(-*|-\\?)$");
 
     /**
      * 占比数量匹配模式
      */
-    private static final Pattern RATIO_PATTERN = StringUtils.getPattern("^(-*|-\\?)\\*\\.[1-9](-*|-\\?)$");
+    private static final Pattern RATIO_PATTERN = Pattern.compile("^(-*|-\\?)\\*\\.[1-9](-*|-\\?)$");
 
     /**
      * 反向数量匹配模式
      */
-    private static final Pattern REVERSE_PATTERN = StringUtils.getPattern("^-*\\*\\?-*$");
+    private static final Pattern REVERSE_PATTERN = Pattern.compile("^-*\\*\\?-*$");
 
     private DesensitizeUtils() {
     }

framework-common/src/main/java/com/chelvc/framework/common/util/IdentityUtils.java

@@ -24,7 +24,7 @@ public final class IdentityUtils {
     /**
      * 主键匹配模式
      */
-    private static final Pattern IDENTITY_PATTERN = StringUtils.getPattern("^[0-9]{1,19}$");
+    private static final Pattern IDENTITY_PATTERN = Pattern.compile("^[0-9]{1,19}$");
 
     private IdentityUtils() {
     }

framework-database/src/main/java/com/chelvc/framework/database/context/TableFieldContext.java

@@ -113,14 +113,4 @@ public class TableFieldContext implements Serializable {
         }
         return ObjectUtils.ifNull(acceptor.getValue(), original);
     }
-
-    @Override
-    public int hashCode() {
-        return this.getField().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof TableFieldContext && this.getField().equals(((TableFieldContext) obj).getField());
-    }
 }