[#noissue] Cleanup

smilu97 · Aug 22, 2023 · 370005a · 370005a
1 parent 2eaa751
commit 370005a
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 22 deletions.
diff --git a/commons-server/src/main/java/com/navercorp/pinpoint/common/server/cluster/ClusterKey.java b/commons-server/src/main/java/com/navercorp/pinpoint/common/server/cluster/ClusterKey.java
@@ -14,7 +14,7 @@ public class ClusterKey {
     public static ClusterKey parse(String clusterKeyFormat) {
         Objects.requireNonNull(clusterKeyFormat, "clusterKeyFormat");
 
-        String[] tokens = clusterKeyFormat.split(DELIMITER);
+        String[] tokens = clusterKeyFormat.split(DELIMITER, 3);
         Assert.isTrue(tokens.length == 3, "invalid token.length == 3");
         return new ClusterKey(tokens[0], tokens[1], Long.parseLong(tokens[2]));
     }

diff --git a/.../java/com/navercorp/pinpoint/profiler/context/monitor/metric/CustomMetricIdGenerator.java b/.../java/com/navercorp/pinpoint/profiler/context/monitor/metric/CustomMetricIdGenerator.java
@@ -18,9 +18,8 @@
 
 import com.navercorp.pinpoint.common.util.Assert;
 import com.navercorp.pinpoint.common.util.IdValidateUtils;
-
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -71,10 +70,10 @@ int create(String metricName) {
 
     private boolean checkValidCustomMetricName(String customMetricName) {
         try {
-            String[] split = customMetricName.split("/");
+            String[] split = customMetricName.split("/", 3);
 
-            if (split == null || split.length != 3) {
-                throw new IllegalArgumentException("customMetricName must consist of {GroupName}/{MetricName}/LabelName} ");
+            if (split.length != 3) {
+                throw new IllegalArgumentException("customMetricName must consist of {GroupName}/{MetricName}/LabelName}");
             }
 
             for (String eachName : split) {

diff --git a/...main/java/com/navercorp/pinpoint/profiler/plugin/PluginPackageClassRequirementFilter.java b/...main/java/com/navercorp/pinpoint/profiler/plugin/PluginPackageClassRequirementFilter.java
@@ -53,7 +53,7 @@ private boolean isLoadedClass(String classname, ClassLoader cl) {
 
     private void parseRequirementList(List<String> packageRequirementList, List<String> packageList, List<String> requirementList) {
         for (String packageWithRequirement : packageRequirementList) {
-            String[] split = packageWithRequirement.split(":");
+            String[] split = packageWithRequirement.split(":", 2);
             if (split.length == 2) {
                 packageList.add(split[0]);
                 requirementList.add(split[1]);

diff --git a/test/src/main/java/com/navercorp/pinpoint/test/plugin/AbstractPluginForkedTestSuite.java b/test/src/main/java/com/navercorp/pinpoint/test/plugin/AbstractPluginForkedTestSuite.java
@@ -240,7 +240,7 @@ private static List<String> extractLibrariesFromSystemClassLoader() {
         if (StringUtils.isEmpty(classPath)) {
             return Collections.emptyList();
         }
-        final List<String> paths = Arrays.asList(classPath.split(":"));
+        final String[] paths = classPath.split(":");
         return normalizePaths(paths);
     }
 
@@ -249,8 +249,8 @@ static String normalizePath(String classPath) {
         return Paths.get(classPath).toAbsolutePath().normalize().toString();
     }
 
-    private static List<String> normalizePaths(List<String> classPaths) {
-        final List<String> result = new ArrayList<>(classPaths.size());
+    private static List<String> normalizePaths(String... classPaths) {
+        final List<String> result = new ArrayList<>(classPaths.length);
         for (String cp : classPaths) {
             result.add(normalizePath(cp));
         }

diff --git a/test/src/main/java/com/navercorp/pinpoint/test/plugin/AbstractPluginTestSuite.java b/test/src/main/java/com/navercorp/pinpoint/test/plugin/AbstractPluginTestSuite.java
@@ -212,7 +212,7 @@ private static List<String> extractLibrariesFromSystemClassLoader() {
         if (StringUtils.isEmpty(classPath)) {
             return Collections.emptyList();
         }
-        final List<String> paths = Arrays.asList(classPath.split(":"));
+        final String[] paths = classPath.split(":");
         return normalizePaths(paths);
     }
 
@@ -221,8 +221,8 @@ static String normalizePath(String classPath) {
         return Paths.get(classPath).toAbsolutePath().normalize().toString();
     }
 
-    private static List<String> normalizePaths(List<String> classPaths) {
-        final List<String> result = new ArrayList<>(classPaths.size());
+    private static List<String> normalizePaths(String... classPaths) {
+        final List<String> result = new ArrayList<>(classPaths.length);
         for (String cp : classPaths) {
             result.add(normalizePath(cp));
         }

diff --git a/test/src/main/java/com/navercorp/pinpoint/test/plugin/DependencyResolver.java b/test/src/main/java/com/navercorp/pinpoint/test/plugin/DependencyResolver.java
@@ -382,9 +382,7 @@ private Map<String, List<Artifact>> combination(List<List<List<Artifact>>> group
 
             for (Entry<String, List<Artifact>> subEntry : sub.entrySet()) {
                 List<Artifact> subArtifacts = subEntry.getValue();
-                List<Artifact> t = new ArrayList<>(thisArtifacts.size() + subArtifacts.size());
-                t.addAll(thisArtifacts);
-                t.addAll(subArtifacts);
+                List<Artifact> t = union(thisArtifacts, subArtifacts);
 
                 result.put(subEntry.getKey(), t);
             }
@@ -395,9 +393,7 @@ private Map<String, List<Artifact>> combination(List<List<List<Artifact>>> group
 
                 for (Entry<String, List<Artifact>> subEntry : sub.entrySet()) {
                     List<Artifact> subArtifacts = subEntry.getValue();
-                    List<Artifact> t = new ArrayList<>(thisArtifacts.size() + subArtifacts.size());
-                    t.addAll(thisArtifacts);
-                    t.addAll(subArtifacts);
+                    List<Artifact> t = union(thisArtifacts, subArtifacts);
 
                     String subKey = subEntry.getKey();
                     String key = subKey.isEmpty() ? thisKey : thisKey + ", " + subKey;
@@ -410,4 +406,11 @@ private Map<String, List<Artifact>> combination(List<List<List<Artifact>>> group
         return result;
     }
 
+    private static List<Artifact> union(List<Artifact> list1, List<Artifact> list2) {
+        List<Artifact> lists = new ArrayList<>(list1.size() + list2.size());
+        lists.addAll(list1);
+        lists.addAll(list2);
+        return lists;
+    }
+
 }
diff --git a/test/src/main/java/com/navercorp/pinpoint/test/plugin/ExceptionReader.java b/test/src/main/java/com/navercorp/pinpoint/test/plugin/ExceptionReader.java
@@ -36,7 +36,7 @@ public Exception read(String exceptionClass, String message, List<String> traceI
     }
 
     private StackTraceElement parseStackTraceElement(String stackTraceElement) {
-        final String[] tokens = stackTraceElement.split(",");
+        final String[] tokens = stackTraceElement.split(",", 4);
         if (tokens.length == 4) {
             return new StackTraceElement(tokens[0], tokens[1], tokens[2], Integer.parseInt(tokens[3]));
         } else {

diff --git a/test/src/main/java/com/navercorp/pinpoint/test/plugin/shared/ArtifactIdUtils.java b/test/src/main/java/com/navercorp/pinpoint/test/plugin/shared/ArtifactIdUtils.java
@@ -55,7 +55,7 @@ public static Artifact toArtifact(String artifactName) {
             return null;
         }
 
-        String[] splitValue = artifactName.split(ARTIFACT_DELIMITER);
+        String[] splitValue = artifactName.split(ARTIFACT_DELIMITER, 4);
         if (ArrayUtils.isEmpty(splitValue)) {
             return null;
         }

diff --git a/test/src/main/java/com/navercorp/pinpoint/test/plugin/shared/TestParameterParser.java b/test/src/main/java/com/navercorp/pinpoint/test/plugin/shared/TestParameterParser.java
@@ -39,7 +39,7 @@ public List<TestParameter> parse(String[] args) {
                 continue;
             }
 
-            String[] testArguments = arg.split("=");
+            String[] testArguments = arg.split("=", 2);
             if (testArguments.length != 2) {
                 continue;
             }