[#noissue] remove duplicate code : StringUtils.tokenizeToStringList()

likeonechild · Sep 26, 2017 · c4598ec · c4598ec
1 parent 551528d
commit c4598ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 44 deletions.
diff --git a/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java b/...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java
@@ -18,13 +18,13 @@
 
 import com.navercorp.pinpoint.bootstrap.util.NumberUtils;
 import com.navercorp.pinpoint.bootstrap.util.spring.PropertyPlaceholderHelper;
+import com.navercorp.pinpoint.common.util.StringUtils;
 import com.navercorp.pinpoint.common.util.logger.CommonLogger;
 import com.navercorp.pinpoint.common.util.PropertyUtils;
 import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -633,18 +633,10 @@ public long readLong(String propertyName, long defaultValue) {
     @Override
     public List<String> readList(String propertyName) {
         String value = properties.getProperty(propertyName);
-        if (value == null) {
+        if (StringUtils.isEmpty(value)) {
             return Collections.emptyList();
         }
-        String[] orders = value.trim().split(",");
-        final List<String> list = new ArrayList<String>(orders.length);
-        for (String order : orders) {
-            final String trimmed = order.trim();
-            if (!trimmed.isEmpty()) {
-                list.add(trimmed);
-            }
-        }
-        return list;
+        return StringUtils.tokenizeToStringList(value, ",");
     }
 
     @Override

diff --git a/plugins/cxf/src/main/java/com/navercorp/pinpoint/plugin/cxf/CxfPluginConfig.java b/plugins/cxf/src/main/java/com/navercorp/pinpoint/plugin/cxf/CxfPluginConfig.java
@@ -15,6 +15,7 @@
 package com.navercorp.pinpoint.plugin.cxf;
 
 import java.util.Arrays;
+import java.util.List;
 
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
 import com.navercorp.pinpoint.common.util.StringUtils;
@@ -46,14 +47,18 @@ private String[] getStringArray(String value) {
         if (StringUtils.isEmpty(value)) {
             return null;
         }
-        String[] split = value.split(",");
-        String[] array = new String[split.length];
-        for (int i = 0; i < split.length; i++) {
-            array[i] = split[i].trim();
-        }
-        return array;
+        List<String> tokenList = StringUtils.tokenizeToStringList(value, ",");
+        return toStringArray(tokenList);
     }
 
+    private String[] toStringArray(List<String> list) {
+		if (list == null) {
+			return null;
+		}
+
+		return list.toArray(new String[list.size()]);
+	}
+
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();

diff --git a/...ns/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTarget.java b/...ns/spring/src/main/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTarget.java
@@ -18,6 +18,7 @@
 import com.navercorp.pinpoint.bootstrap.util.PathMatcher;
 import com.navercorp.pinpoint.bootstrap.util.RegexPathMatcher;
 import com.navercorp.pinpoint.common.util.CollectionUtils;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -98,21 +99,10 @@ public List<String> getAnnotations() {
     }
 
     List<String> split(final String values) {
-        if (values == null) {
+        if (StringUtils.isEmpty(values)) {
             return Collections.emptyList();
         }
-
-        final String[] tokens = values.split(",");
-        final List<String> result = new ArrayList<String>(tokens.length);
-
-        for (String token : tokens) {
-            final String trimmed = token.trim();
-            if (!trimmed.isEmpty()) {
-                result.add(trimmed);
-            }
-        }
-
-        return result;
+        return StringUtils.tokenizeToStringList(values, ",");
     }
 
     List<PathMatcher> compilePattern(List<String> patternStrings, final String separator) {

diff --git a/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/UserPluginConfig.java b/plugins/user/src/main/java/com/navercorp/pinpoint/plugin/user/UserPluginConfig.java
@@ -15,11 +15,11 @@
  */
 package com.navercorp.pinpoint.plugin.user;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig;
+import com.navercorp.pinpoint.common.util.StringUtils;
 
 /**
  * 
@@ -39,22 +39,11 @@ public List<String> getIncludeList() {
     }
 
     private List<String> split(String values) {
-        if (values == null) {
+        if (StringUtils.isEmpty(values)) {
             return Collections.emptyList();
         }
 
-        String[] tokens = values.split(",");
-        List<String> result = new ArrayList<String>(tokens.length);
-
-        for (String token : tokens) {
-            String trimmed = token.trim();
-
-            if (!trimmed.isEmpty()) {
-                result.add(trimmed);
-            }
-        }
-
-        return result;
+        return StringUtils.tokenizeToStringList(values, ",");
     }
 
     @Override