changeset 55104:d850d0f41c72

8224908: Revert: 8216553: JrtFileSystemProvider getPath(URI) omits /modules element from file path Reviewed-by: darcy, kbarrett
author jlaskey
date Tue, 28 May 2019 16:51:28 -0300
parents 6e0786d8451b
children 4e62485d2b18
files src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java test/jdk/jdk/internal/jrtfs/Basic.java test/langtools/tools/lib/toolbox/JarTask.java
diffstat 4 files changed, 7 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java	Tue May 28 21:31:07 2019 +0200
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/JrtFileSystemProvider.java	Tue May 28 16:51:28 2019 -0300
@@ -190,10 +190,10 @@
             throw new IllegalArgumentException("Fragment component present");
         }
         String path = uri.getPath();
-        if (path == null || path.charAt(0) != '/' || path.contains("..")) {
+        if (path == null || path.charAt(0) != '/') {
             throw new IllegalArgumentException("Invalid path component");
         }
-        return getTheFileSystem().getPath("/modules" + path);
+        return getTheFileSystem().getPath(path);
     }
 
     private FileSystem getTheFileSystem() {
--- a/src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java	Tue May 28 21:31:07 2019 +0200
+++ b/src/java.base/share/classes/jdk/internal/jrtfs/JrtPath.java	Tue May 28 16:51:28 2019 -0300
@@ -25,7 +25,6 @@
 package jdk.internal.jrtfs;
 
 import java.io.File;
-import java.io.IOError;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -171,16 +170,7 @@
     @Override
     public final URI toUri() {
         try {
-            String p = toAbsolutePath().path;
-            if (!p.startsWith("/modules") || p.contains("..")) {
-                throw new IOError(new RuntimeException(p + " cannot be represented as URI"));
-            }
-
-            p = p.substring("/modules".length());
-            if (p.isEmpty()) {
-                p = "/";
-            }
-            return new URI("jrt", p, null);
+            return new URI("jrt", toAbsolutePath().path, null);
         } catch (URISyntaxException ex) {
             throw new AssertionError(ex);
         }
--- a/test/jdk/jdk/internal/jrtfs/Basic.java	Tue May 28 21:31:07 2019 +0200
+++ b/test/jdk/jdk/internal/jrtfs/Basic.java	Tue May 28 16:51:28 2019 -0300
@@ -28,7 +28,6 @@
  */
 
 import java.io.InputStream;
-import java.io.IOError;
 import java.io.IOException;
 import java.io.DataInputStream;
 import java.nio.file.DirectoryStream;
@@ -272,60 +271,17 @@
         Path top = fs.getPath("/");
         try (Stream<Path> stream = Files.walk(top)) {
             stream.forEach(path -> {
-                String pathStr = path.toAbsolutePath().toString();
-                URI u = null;
-                try {
-                    u = path.toUri();
-                } catch (IOError e) {
-                    assertFalse(pathStr.startsWith("/modules"));
-                    return;
-                }
-
+                URI u = path.toUri();
                 assertTrue(u.getScheme().equalsIgnoreCase("jrt"));
                 assertFalse(u.isOpaque());
                 assertTrue(u.getAuthority() == null);
-
-                pathStr = pathStr.substring("/modules".length());
-                if (pathStr.isEmpty()) {
-                    pathStr = "/";
-                }
-                assertEquals(u.getPath(), pathStr);
+                assertEquals(u.getPath(), path.toAbsolutePath().toString());
                 Path p = Paths.get(u);
                 assertEquals(p, path);
             });
         }
     }
 
-    // @bug 8216553: JrtFIleSystemProvider getPath(URI) omits /modules element from file path
-    @Test
-    public void testPathToURIConversion() throws Exception {
-        var uri = URI.create("jrt:/java.base/module-info.class");
-        var path = Path.of(uri);
-        assertTrue(Files.exists(path));
-
-        uri = URI.create("jrt:/java.base/../java.base/module-info.class");
-        boolean seenIAE = false;
-        try {
-            Path.of(uri);
-        } catch (IllegalArgumentException iaExp) {
-            seenIAE = true;
-        }
-        assertTrue(seenIAE);
-
-        // check round-trip
-        var jrtfs = FileSystems.getFileSystem(URI.create("jrt:/"));
-        assertTrue(Files.exists(jrtfs.getPath(path.toString())));
-
-        path = jrtfs.getPath("/modules/../modules/java.base/");
-        boolean seenIOError = false;
-        try {
-            path.toUri();
-        } catch (IOError ioError) {
-            seenIOError = true;
-        }
-        assertTrue(seenIOError);
-    }
-
     @Test
     public void testDirectoryNames() throws Exception {
         FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
--- a/test/langtools/tools/lib/toolbox/JarTask.java	Tue May 28 21:31:07 2019 +0200
+++ b/test/langtools/tools/lib/toolbox/JarTask.java	Tue May 28 16:51:28 2019 -0300
@@ -377,9 +377,9 @@
     private final Pattern jarEntry = Pattern.compile(".*!/(?:META-INF/sym/[^/]+/)?(.*)");
 
     /*
-     * A jrt: URL is of the form  jrt:/<module>/<package>/<file>
+     * A jrt: URL is of the form  jrt:/modules/<module>/<package>/<file>
      */
-    private final Pattern jrtEntry = Pattern.compile("/([^/]+)/(.*)");
+    private final Pattern jrtEntry = Pattern.compile("/modules/([^/]+)/(.*)");
 
     /*
      * A file: URL is of the form  file:/path/to/{modules,patches}/<module>/<package>/<file>