Fixes ClassPathURLLoader cannot find files under GraalVM Native Image

apache · Feb 18, 2024 · fface99 · fface99
1 parent 87a11f1
commit fface99
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/...spath/src/main/java/org/apache/shardingsphere/infra/url/classpath/ClassPathURLLoader.java b/...spath/src/main/java/org/apache/shardingsphere/infra/url/classpath/ClassPathURLLoader.java
@@ -20,10 +20,11 @@
 import lombok.SneakyThrows;
 import org.apache.shardingsphere.infra.url.spi.ShardingSphereURLLoader;
 
-import java.io.File;
+import java.io.BufferedReader;
 import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
@@ -36,12 +37,12 @@ public final class ClassPathURLLoader implements ShardingSphereURLLoader {
     @Override
     @SneakyThrows(IOException.class)
     public String load(final String configurationSubject, final Properties queryProps) {
-        return Files.readAllLines(getResourceFile(configurationSubject).toPath()).stream().collect(Collectors.joining(System.lineSeparator()));
-    }
-
-    @SneakyThrows(URISyntaxException.class)
-    private File getResourceFile(final String configurationSubject) {
-        return new File(Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource(configurationSubject)).toURI().getPath());
+        try (InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(configurationSubject)) {
+            Objects.requireNonNull(inputStream);
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
+                return reader.lines().collect(Collectors.joining(System.lineSeparator()));
+            }
+        }
     }
 
     @Override

diff --git a/...rg/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java b/...rg/apache/shardingsphere/mode/repository/standalone/jdbc/sql/JDBCRepositorySQLLoader.java
@@ -85,15 +85,10 @@ public static JDBCRepositorySQL load(final String type) {
     }
 
     /**
-     * Under the GraalVM Native Image, although there is
-     * `com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystemProvider`, the corresponding
-     * `com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystem` does not autoload. This is mainly to align the
-     * behavior of `ZipFileSystemProvider`, so ShardingSphere need to manually open and close the FileSystem
-     * corresponding to the `resource:/` scheme. For more background reference <a href="https://github.com/oracle/graal/issues/7682">oracle/graal#7682</a>.
-     * <p/>
-     * ShardingSphere use the System Property of `org.graalvm.nativeimage.imagecode` to identify whether this class is in the
-     * GraalVM Native Image environment. The background of this property comes from
-     * <a href="https://junit.org/junit5/docs/5.10.0/api/org.junit.jupiter.api/org/junit/jupiter/api/condition/DisabledInNativeImage.html">Annotation Interface DisabledInNativeImage</a>.
+     * Under the GraalVM Native Image, `com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystem` does not autoload.
+     * This is mainly to align the behavior of `jdk.nio.zipfs.ZipFileSystem`,
+     * so ShardingSphere need to manually open and close the FileSystem corresponding to the `resource:/` scheme.
+     * For more background reference <a href="https://github.com/oracle/graal/issues/7682">oracle/graal#7682</a>.
      *
      * @param url  url
      * @param type type of JDBC repository SQL
@@ -104,13 +99,12 @@ public static JDBCRepositorySQL load(final String type) {
      * @see sun.nio.fs.UnixFileSystemProvider
      */
     private static JDBCRepositorySQL loadFromDirectory(final URL url, final String type) throws URISyntaxException, IOException {
-        if (null == System.getProperty("org.graalvm.nativeimage.imagecode") || !"runtime".equals(System.getProperty("org.graalvm.nativeimage.imagecode"))) {
-            return loadFromDirectoryLegacy(url, type);
-        } else {
+        if ("resource".equals(url.getProtocol())) {
             try (FileSystem ignored = FileSystems.newFileSystem(URI.create("resource:/"), Collections.emptyMap())) {
                 return loadFromDirectoryInNativeImage(url, type);
             }
         }
+        return loadFromDirectoryLegacy(url, type);
     }
 
     /**