From b92c7d9fe6ae9d0d7d44afb72439d753508d93c1 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sun, 26 Dec 2021 22:20:11 +0100 Subject: [PATCH] Small cleanup * correctly unwrap DelegatingPath * improve javadoc * remove useless catch blocks --- .../java/io/quarkus/fs/util/ZipUtils.java | 38 +++++++++++-------- .../quarkus/fs/util/base/DelegatingPath.java | 5 +-- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/quarkus/fs/util/ZipUtils.java b/src/main/java/io/quarkus/fs/util/ZipUtils.java index 3ca2986..790e2f1 100644 --- a/src/main/java/io/quarkus/fs/util/ZipUtils.java +++ b/src/main/java/io/quarkus/fs/util/ZipUtils.java @@ -16,7 +16,7 @@ import java.nio.file.SimpleFileVisitor; import java.nio.file.StandardCopyOption; import java.nio.file.attribute.BasicFileAttributes; -import java.nio.file.spi.FileSystemProvider; +import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.Map; @@ -127,8 +127,6 @@ public static FileSystem newZip(Path zipFile) throws IOException { } try { return FileSystemProviders.ZIP_PROVIDER.newFileSystem(toZipUri(zipFile), env); - } catch (FileSystemAlreadyExistsException e) { - throw new IOException("fs already exists " + zipFile, e); } catch (IOException ioe) { // include the URI for which the filesystem creation failed throw new IOException("Failed to create a new filesystem for " + zipFile, ioe); @@ -164,13 +162,12 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) /** * This call is not thread safe, a single of FileSystem can be created for the - * profided uri until it is closed. + * provided uri until it is closed. * * @param uri The uri to the zip file. * @param env Env map. * @return A new FileSystem. * @throws IOException in case of a failure - * @deprecated Use {@link #newFileSystem(Path)} or {@link #newZip(Path)}. */ public static FileSystem newFileSystem(URI uri, Map env) throws IOException { env = new HashMap<>(env); @@ -183,29 +180,39 @@ public static FileSystem newFileSystem(URI uri, Map env) throws return FileSystemProviders.ZIP_PROVIDER.newFileSystem(uri, env); } catch (FileSystemAlreadyExistsException e) { throw new IOException("fs already exists " + uri, e); - } catch (IOException | ZipError ioe) { - // TODO: (at a later date) Get rid of the ZipError catching (and instead only catch IOException) - // since it's a JDK bug which threw the undeclared ZipError instead of an IOException. - // Java 9 fixes it https://bugs.openjdk.java.net/browse/JDK-8062754 - + } catch (IOException ioe) { // include the URI for which the filesystem creation failed throw new IOException("Failed to create a new filesystem for " + uri, ioe); } } /** - * This call is thread safe, a new FS is created for each invocation. + * Constructs a new FileSystem to access the contents of a zip as a file system. * * @param path The zip file. * @return A new FileSystem instance * @throws IOException in case of a failure */ public static FileSystem newFileSystem(Path path) throws IOException { + return newFileSystem(path, Collections.emptyMap()); + } + + /** + * Constructs a new FileSystem to access the contents of a zip as a file system. + * + * @param path The zip file. + * @param env Property map to configure the constructed FileSystem. + * @return A new FileSystem instance + * @throws IOException in case of a failure + */ + private static FileSystem newFileSystem(Path path, Map env) throws IOException { + final Map tmp = new HashMap<>(DEFAULT_OWNER_ENV); + tmp.putAll(env); + env = tmp; + try { path = FileSystemHelper.ignoreFileWriteability(path); - return FileSystemProviders.ZIP_PROVIDER.newFileSystem(path, DEFAULT_OWNER_ENV); - } catch (FileSystemAlreadyExistsException e) { - throw new IOException("fs already exists " + path, e); + return FileSystemProviders.ZIP_PROVIDER.newFileSystem(path, env); } catch (IOException ioe) { // include the path for which the filesystem creation failed throw new IOException("Failed to create a new filesystem for " + path, ioe); @@ -216,6 +223,7 @@ public static FileSystem newFileSystem(Path path) throws IOException { * This call is thread safe, a new FS is created for each invocation. * * @param path The zip file. + * @param classLoader the classloader to locate the appropriate FileSystemProvider to open the path * @return A new FileSystem instance * @throws IOException in case of a failure * @deprecated Use {@link #newFileSystem(Path)}. Providing a classLoader makes no difference, since the @@ -224,7 +232,7 @@ public static FileSystem newFileSystem(Path path) throws IOException { */ @Deprecated public static FileSystem newFileSystem(final Path path, ClassLoader classLoader) throws IOException { - return newFileSystem(path); + return newFileSystem(path, Collections.emptyMap()); } /** diff --git a/src/main/java/io/quarkus/fs/util/base/DelegatingPath.java b/src/main/java/io/quarkus/fs/util/base/DelegatingPath.java index 0a72166..59180c4 100644 --- a/src/main/java/io/quarkus/fs/util/base/DelegatingPath.java +++ b/src/main/java/io/quarkus/fs/util/base/DelegatingPath.java @@ -1,6 +1,5 @@ package io.quarkus.fs.util.base; -import io.quarkus.fs.util.sysfs.PathWrapper; import java.io.File; import java.io.IOException; import java.net.URI; @@ -39,8 +38,8 @@ protected DelegatingPath(Path delegate) { * @return unwrapped path, or the original one if not an instance of DelegatingPath */ public static Path unwrap(Path path) { - if (path instanceof PathWrapper) { - return ((PathWrapper) path).getDelegate(); + if (path instanceof DelegatingPath) { + return ((DelegatingPath) path).getDelegate(); } return path; }