From 5657a5efd6f6067582038bc341990b56214e37ea Mon Sep 17 00:00:00 2001
From: zhuang <devlzh93@gmail.com>
Date: Thu, 26 Nov 2020 17:42:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20subString=20=E5=92=8C=20is?=
 =?UTF-8?q?Empty=20=E6=96=B9=E6=B3=95=EF=BC=8C=E5=B9=B6=E6=B6=88=E9=99=A4?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=20sonarlint=20=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 添加私有构造方法；sonarlint(java:S1118)
2. 调整 static 和 final 顺序；sonarlint(java:S1124)
3. 修改两个 subString 内部实现，减少重复代码；
4. String 是  CharSequence 实现类，因此保留一个 isEmpty(CharSequence value) 就行，并且直接返回 if 条件即可；sonarlint(java:S1126)
5. isNumber(String str) 不知道是不是出于性能考虑没有在内部直接调用 isNumber(str.toCharArray()) 来实现判断；
---
 .../com/alibaba/druid/util/StringUtils.java   | 43 ++++++-------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java
index 8b60970fb2..26c075ffbe 100644
--- a/src/main/java/com/alibaba/druid/util/StringUtils.java
+++ b/src/main/java/com/alibaba/druid/util/StringUtils.java
@@ -26,7 +26,10 @@ import com.alibaba.druid.support.logging.LogFactory;
  */
 public class StringUtils {
 
-    private final static Log LOG = LogFactory.getLog(StringUtils.class);
+    private static final Log LOG = LogFactory.getLog(StringUtils.class);
+
+    private StringUtils() {
+    }
 
     /**
      * Example: subString("12345","1","4")=23
@@ -49,18 +52,7 @@ public class StringUtils {
      * @return
      */
     public static String subString(String src, String start, String to) {
-        int indexFrom = start == null ? 0 : src.indexOf(start);
-        int indexTo = to == null ? src.length() : src.indexOf(to);
-        if (indexFrom < 0 || indexTo < 0 || indexFrom > indexTo) {
-            return null;
-        }
-
-        if (null != start) {
-            indexFrom += start.length();
-        }
-
-        return src.substring(indexFrom, indexTo);
-
+        return subString(src, start, to, false);
     }
 
     /**
@@ -73,11 +65,13 @@ public class StringUtils {
      * @return
      */
     public static String subString(String src, String start, String to, boolean toLast) {
-        if(!toLast) {
-            return subString(src, start, to);
-        }
         int indexFrom = start == null ? 0 : src.indexOf(start);
-        int indexTo = to == null ? src.length() : src.lastIndexOf(to);
+        int indexTo;
+        if (to == null) {
+            indexTo = src.length();
+        } else {
+            indexTo = toLast ? src.lastIndexOf(to) : src.indexOf(to);
+        }
         if (indexFrom < 0 || indexTo < 0 || indexFrom > indexTo) {
             return null;
         }
@@ -87,7 +81,6 @@ public class StringUtils {
         }
 
         return src.substring(indexFrom, indexTo);
-
     }
 
     /**
@@ -125,16 +118,8 @@ public class StringUtils {
         return a.equalsIgnoreCase(b);
     }
 
-    public static boolean isEmpty(String value) {
-        return isEmpty((CharSequence) value);
-    }
-
     public static boolean isEmpty(CharSequence value) {
-        if (value == null || value.length() == 0) {
-            return true;
-        }
-
-        return false;
+        return value == null || value.length() == 0;
     }
     
     public static int lowerHashCode(String text) {
@@ -155,7 +140,7 @@ public class StringUtils {
     }
 
     public static boolean isNumber(String str) {
-        if (str.length() == 0) {
+        if (str == null || str.length() == 0) {
             return false;
         }
         int sz = str.length();
@@ -254,7 +239,7 @@ public class StringUtils {
     }
 
     public static boolean isNumber(char[] chars) {
-        if (chars.length == 0) {
+        if (chars == null || chars.length == 0) {
             return false;
         }
         int sz = chars.length;