[MDEP-952] Decouple DependencyUtil from StringUtils (#491)

* Decouple DependencyUtil from StringUtils
apache · Nov 28, 2024 · 0079030 · 0079030
1 parent eceab09
commit 0079030
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 33 deletions.
diff --git a/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java b/src/main/java/org/apache/maven/plugins/dependency/utils/DependencyUtil.java
@@ -29,7 +29,6 @@
 import java.nio.file.StandardOpenOption;
 import java.util.Objects;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.plugin.logging.Log;
@@ -119,7 +118,9 @@ public static String getFormattedFileName(
 
         String classifierString = "";
 
-        if (!removeClassifier && StringUtils.isNotEmpty(artifact.getClassifier())) {
+        if (!removeClassifier
+                && artifact.getClassifier() != null
+                && !artifact.getClassifier().isEmpty()) {
             classifierString = "-" + artifact.getClassifier();
         }
         destFileName.append(artifact.getArtifactId()).append(versionString);
@@ -186,7 +187,7 @@ private static String getDependencyId(Artifact artifact, boolean removeVersion,
             sb.append(artifact.getVersion());
         }
 
-        if (StringUtils.isNotEmpty(artifact.getClassifier())) {
+        if (artifact.getClassifier() != null && !artifact.getClassifier().isEmpty()) {
             sb.append("-");
             sb.append(artifact.getClassifier());
         }
@@ -259,16 +260,6 @@ public static synchronized void log(String string, Log log) throws IOException {
         }
     }
 
-    /**
-     * Mainly used to parse excludes, includes configuration.
-     *
-     * @param str the string to split
-     * @return the result items
-     */
-    public static String[] tokenizer(String str) {
-        return StringUtils.split(cleanToBeTokenizedString(str), ",");
-    }
-
     /**
      * Clean up configuration string before it can be tokenized.
      *

diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java b/src/test/java/org/apache/maven/plugins/dependency/utils/TestDependencyUtil.java
@@ -320,26 +320,6 @@ void testFileNameClassifierWithFile() {
         assertEquals(expectedResult, name);
     }
 
-    @Test
-    void testTokenizer() {
-        String[] tokens = DependencyUtil.tokenizer(" alpha,bravo, charlie , delta kappa, theta");
-        String[] expected = new String[] {"alpha", "bravo", "charlie", "delta kappa", "theta"};
-        // easier to see in the JUnit reports
-        assertEquals(String.join(", ", expected), String.join(", ", tokens));
-        assertEquals(expected.length, tokens.length);
-
-        tokens = DependencyUtil.tokenizer(" \r\n a, \t \n \r b \t \n \r");
-        assertEquals(2, tokens.length);
-        assertEquals("a", tokens[0]);
-        assertEquals("b", tokens[1]);
-
-        tokens = DependencyUtil.tokenizer(null);
-        assertEquals(0, tokens.length);
-
-        tokens = DependencyUtil.tokenizer("  ");
-        assertEquals(0, tokens.length);
-    }
-
     @Test
     void outputFileShouldBeOverridden() throws IOException {
         File file = new File(temDir, "file1.out");