[maven-pmd-plugin] branch MPMD-320 created (now eb42f01)

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adangel pushed a change to branch MPMD-320
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git.


      at eb42f01  [MPMD-320] Correctly decode filename paths in classpath for toolchain

This branch includes the following new commits:

     new eb42f01  [MPMD-320] Correctly decode filename paths in classpath for toolchain

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-pmd-plugin] 01/01: [MPMD-320] Correctly decode filename paths in classpath for toolchain

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adangel pushed a commit to branch MPMD-320
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git

commit eb42f011c3eccba2a55a5f2cad1e7a8b4618da2e
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Tue Aug 31 20:00:09 2021 +0200

    [MPMD-320] Correctly decode filename paths in classpath for toolchain
---
 .../apache/maven/plugins/pmd/exec/Executor.java    | 19 +++++++---
 .../maven/plugins/pmd/exec/ExecutorTest.java       | 42 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java b/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java
index ca17511..88bbb60 100644
--- a/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java
+++ b/src/main/java/org/apache/maven/plugins/pmd/exec/Executor.java
@@ -25,8 +25,11 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.SimpleFormatter;
@@ -125,17 +128,23 @@ abstract class Executor
         return classpath.toString();
     }
 
-    private static void buildClasspath( StringBuilder classpath, ClassLoader cl )
+    static void buildClasspath( StringBuilder classpath, ClassLoader cl )
     {
         if ( cl instanceof URLClassLoader )
         {
             for ( URL url : ( (URLClassLoader) cl ).getURLs() )
             {
-                String urlString = url.toString();
-                if ( urlString.startsWith( "file:" ) )
+                if ( "file".equalsIgnoreCase( url.getProtocol() ) )
                 {
-                    String f = urlString.substring( 5 ); //  strip "file:"
-                    classpath.append( f ).append( File.pathSeparatorChar );
+                    try
+                    {
+                        String filename = URLDecoder.decode( url.getPath(), StandardCharsets.UTF_8.name() );
+                        classpath.append( filename ).append( File.pathSeparatorChar );
+                    }
+                    catch ( UnsupportedEncodingException e )
+                    {
+                        LOG.warn( "Ignoring " + url + " in classpath due to UnsupportedEncodingException", e );
+                    }
                 }
             }
         }
diff --git a/src/test/java/org/apache/maven/plugins/pmd/exec/ExecutorTest.java b/src/test/java/org/apache/maven/plugins/pmd/exec/ExecutorTest.java
new file mode 100644
index 0000000..4898147
--- /dev/null
+++ b/src/test/java/org/apache/maven/plugins/pmd/exec/ExecutorTest.java
@@ -0,0 +1,42 @@
+package org.apache.maven.plugins.pmd.exec;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.junit.Assert;
+
+import junit.framework.TestCase;
+
+public class ExecutorTest extends TestCase
+{
+    public void testBuildClasspath() throws MalformedURLException {
+        String pathname = "/home/test/dir with space/mylib.jar";
+        URL[] urls = new URL[] { new File(pathname).toURI().toURL() };
+        URLClassLoader mockedClassLoader = new URLClassLoader( urls );
+
+        StringBuilder classpath = new StringBuilder();
+        Executor.buildClasspath(classpath, mockedClassLoader);
+        Assert.assertEquals( pathname + ":", classpath.toString() );
+    }
+}