Properly decode jar URLs with spaces (%20). Closes #866

History.md

@@ -1,5 +1,6 @@
 ## [1.2.3-SNAPSHOT](https://github.com/cucumber/cucumber-jvm/compare/v1.2.2...master) (In Git)
 
+* [Core] Properly decode jar URLs with spaces (%20) - ([#866](https://github.com/cucumber/cucumber-jvm/issues/866) Aslak Hellesøy)
 * [Java] Arity mismatch Java8 Step Definition error ([#852](https://github.com/cucumber/cucumber-jvm/issues/852), [#847](https://github.com/cucumber/cucumber-jvm/pull/847) David Coelho)
 * [Java] Print Java 8 lambda snippets when `cucumber-java8` is active (Aslak Hellesøy)
 * [Core] Make the Summary Printer into a plugin ([#828](https://github.com/cucumber/cucumber-jvm/pull/828) Björn Rasmusson)

core/src/main/java/cucumber/runtime/io/ClasspathResourceIterable.java

@@ -39,15 +39,4 @@ public Iterator<Resource> iterator() {
         }
     }
 
-    static boolean hasSuffix(String suffix, String name) {
-        return suffix == null || name.endsWith(suffix);
-    }
-
-    static String getPath(URL url) {
-        try {
-            return URLDecoder.decode(url.getPath(), "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            throw new CucumberException("Encoding problem", e);
-        }
-    }
 }

core/src/main/java/cucumber/runtime/io/FileResourceIterator.java

@@ -4,7 +4,7 @@
 import java.io.FileFilter;
 import java.util.Iterator;
 
-import static cucumber.runtime.io.ClasspathResourceIterable.hasSuffix;
+import static cucumber.runtime.io.Helpers.hasSuffix;
 import static java.util.Arrays.asList;
 
 public class FileResourceIterator implements Iterator<Resource> {

core/src/main/java/cucumber/runtime/io/FileResourceIteratorFactory.java

@@ -4,7 +4,7 @@
 import java.net.URL;
 import java.util.Iterator;
 
-import static cucumber.runtime.io.ClasspathResourceIterable.getPath;
+import static cucumber.runtime.io.Helpers.filePath;
 
 /**
  * Factory which creates {@link FileResourceIterator}s.
@@ -25,7 +25,7 @@ public boolean isFactoryFor(URL url) {
 
     @Override
     public Iterator<Resource> createIterator(URL url, String path, String suffix) {
-        File file = new File(getPath(url));
+        File file = new File(filePath(url));
         File rootDir = new File(file.getAbsolutePath().substring(0, file.getAbsolutePath().length() - path.length()));
         return new FileResourceIterator(rootDir, file, suffix);
     }

core/src/main/java/cucumber/runtime/io/Helpers.java

@@ -0,0 +1,32 @@
+package cucumber.runtime.io;
+
+import cucumber.runtime.CucumberException;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+public class Helpers {
+    static boolean hasSuffix(String suffix, String name) {
+        return suffix == null || name.endsWith(suffix);
+    }
+
+    static String filePath(URL url) {
+        try {
+            return url.toURI().getSchemeSpecificPart();
+        } catch (URISyntaxException e) {
+            throw new CucumberException(e);
+        }
+    }
+
+    static String jarFilePath(URL jarUrl) throws UnsupportedEncodingException, MalformedURLException {
+        String urlFile = jarUrl.getFile();
+
+        int separatorIndex = urlFile.indexOf("!/");
+        if (separatorIndex == -1) {
+            throw new CucumberException("Not a jar URL: " + jarUrl.toExternalForm());
+        }
+        return filePath(new URL(urlFile.substring(0, separatorIndex)));
+    }
+}

core/src/main/java/cucumber/runtime/io/ZipResourceIterator.java

@@ -50,7 +50,7 @@ private void moveToNext() {
         while (entries.hasMoreElements()) {
             ZipEntry jarEntry = entries.nextElement();
             String entryName = jarEntry.getName();
-            if (entryName.startsWith(path) && ClasspathResourceIterable.hasSuffix(suffix, entryName)) {
+            if (entryName.startsWith(path) && Helpers.hasSuffix(suffix, entryName)) {
                 next = new ZipResource(jarFile, jarEntry);
                 break;
             }

core/src/main/java/cucumber/runtime/io/ZipResourceIteratorFactory.java

@@ -1,9 +1,6 @@
 package cucumber.runtime.io;
 
-import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Iterator;
 
@@ -15,27 +12,15 @@
  */
 public class ZipResourceIteratorFactory implements ResourceIteratorFactory {
 
-    static String filePath(URL jarUrl) throws UnsupportedEncodingException, MalformedURLException {
-        String urlFile = jarUrl.getFile();
-
-        int separatorIndex = urlFile.indexOf("!/");
-        if (separatorIndex != -1) {
-            urlFile = urlFile.substring(0, separatorIndex);
-        }
-
-        URL url = new URL(urlFile);
-        return new File(url.getFile()).getPath();
-    }
-
     @Override
     public boolean isFactoryFor(URL url) {
-        return url.getFile().indexOf("!/") != -1;
+        return url.getFile().contains("!/");
     }
 
     @Override
     public Iterator<Resource> createIterator(URL url, String path, String suffix) {
         try {
-            String jarPath = filePath(url);
+            String jarPath = Helpers.jarFilePath(url);
             return new ZipResourceIterator(jarPath, path, suffix);
         } catch (IOException e) {
             throw new CucumberException(e);

core/src/test/java/cucumber/runtime/io/HelpersTest.java

@@ -0,0 +1,40 @@
+package cucumber.runtime.io;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+
+import static cucumber.runtime.io.Helpers.filePath;
+import static cucumber.runtime.io.Helpers.jarFilePath;
+import static org.junit.Assert.assertEquals;
+
+public class HelpersTest {
+    private static final URLStreamHandler NULL_URL_STREAM_HANDLER = new URLStreamHandler() {
+        @Override
+        protected URLConnection openConnection(URL u) throws IOException {
+            throw new UnsupportedOperationException();
+        }
+    };
+
+    @Test
+    public void computes_file_path_for_file_url() throws UnsupportedEncodingException, MalformedURLException {
+        URL url = new URL("file:/Users/First%20Last/.m2/repository/info/cukes/cucumber-java/1.2.2/cucumber-java-1.2.2.jar");
+        assertEquals(new File("/Users/First Last/.m2/repository/info/cukes/cucumber-java/1.2.2/cucumber-java-1.2.2.jar").getAbsolutePath(), filePath(url));
+    }
+
+    @Test
+    public void computes_file_path_for_jar_protocols() throws Exception {
+        assertEquals("foo bar+zap/cucumber-core.jar", jarFilePath(new URL("jar:file:foo%20bar+zap/cucumber-core.jar!/cucumber/runtime/io")));
+        assertEquals("foo bar+zap/cucumber-core.jar", jarFilePath(new URL(null, "zip:file:foo%20bar+zap/cucumber-core.jar!/cucumber/runtime/io", NULL_URL_STREAM_HANDLER)));
+        assertEquals("foo bar+zap/cucumber-core.jar", jarFilePath(new URL(null, "wsjar:file:foo%20bar+zap/cucumber-core.jar!/cucumber/runtime/io", NULL_URL_STREAM_HANDLER)));
+        assertEquals("foo bar+zap/cucumber-core.jar", jarFilePath(new URL("jar:file:foo%20bar+zap/cucumber-core.jar!/")));
+        assertEquals("foo bar+zap/cucumber-core.jar", jarFilePath(new URL(null, "zip:file:foo%20bar+zap/cucumber-core.jar!/", NULL_URL_STREAM_HANDLER)));
+        assertEquals("foo bar+zap/cucumber-core.jar", jarFilePath(new URL(null, "wsjar:file:foo%20bar+zap/cucumber-core.jar!/", NULL_URL_STREAM_HANDLER)));
+    }
+}

core/src/test/java/cucumber/runtime/io/ZipResourceIteratorFactoryTest.java

@@ -1,24 +1,22 @@
 package cucumber.runtime.io;
 
-import static cucumber.runtime.io.ZipResourceIteratorFactory.filePath;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
 
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 // https://github.com/cucumber/cucumber-jvm/issues/808
 public class ZipResourceIteratorFactoryTest {
 
     private static final URLStreamHandler NULL_URL_STREAM_HANDLER = new URLStreamHandler() {
         @Override
         protected URLConnection openConnection(URL u) throws IOException {
-            return null;
+            throw new UnsupportedOperationException();
         }
     };
 
@@ -32,14 +30,4 @@ public void is_factory_for_jar_protocols() throws IOException {
         assertFalse(factory.isFactoryFor(new URL("file:cucumber-core")));
         assertFalse(factory.isFactoryFor(new URL("http://http://cukes.info/cucumber-core.jar")));
     }
-
-    @Test
-    public void computes_file_path_for_jar_protocols() throws Exception {
-        assertEquals("cucumber-core.jar", filePath(new URL("jar:file:cucumber-core.jar!/cucumber/runtime/io")));
-        assertEquals("cucumber-core.jar", filePath(new URL(null, "zip:file:cucumber-core.jar!/cucumber/runtime/io", NULL_URL_STREAM_HANDLER)));
-        assertEquals("cucumber-core.jar", filePath(new URL(null, "wsjar:file:cucumber-core.jar!/cucumber/runtime/io", NULL_URL_STREAM_HANDLER)));
-        assertEquals("cucumber-core.jar", filePath(new URL("jar:file:cucumber-core.jar!/")));
-        assertEquals("cucumber-core.jar", filePath(new URL(null, "zip:file:cucumber-core.jar!/", NULL_URL_STREAM_HANDLER)));
-        assertEquals("cucumber-core.jar", filePath(new URL(null, "wsjar:file:cucumber-core.jar!/", NULL_URL_STREAM_HANDLER)));
-    }
 }