Fixes ClassPathURLLoader cannot find files under GraalVM Native Image

apache · Feb 17, 2024 · cba4dad · cba4dad
1 parent fa1ef90
commit cba4dad
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/.../src/main/java/org/apache/shardingsphere/infra/url/type/classpath/ClassPathURLLoader.java b/.../src/main/java/org/apache/shardingsphere/infra/url/type/classpath/ClassPathURLLoader.java
@@ -20,10 +20,15 @@
 import lombok.SneakyThrows;
 import org.apache.shardingsphere.infra.url.ShardingSphereURLLoader;
 
-import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Collections;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
@@ -34,14 +39,19 @@
 public final class ClassPathURLLoader implements ShardingSphereURLLoader {
 
     @Override
-    @SneakyThrows(IOException.class)
+    @SneakyThrows({IOException.class, URISyntaxException.class})
     public String load(final String configurationSubject, final Properties queryProps) {
-        return Files.readAllLines(getResourceFile(configurationSubject).toPath()).stream().collect(Collectors.joining(System.lineSeparator()));
+        URL resourceURL = getResourceURL(configurationSubject);
+        if ("resource".equals(resourceURL.getProtocol())) {
+            try (FileSystem ignored = FileSystems.newFileSystem(URI.create("resource:/"), Collections.emptyMap())) {
+                return Files.readAllLines(Paths.get(resourceURL.toURI())).stream().collect(Collectors.joining(System.lineSeparator()));
+            }
+        }
+        return Files.readAllLines(Paths.get(resourceURL.toURI())).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());
+    private URL getResourceURL(final String configurationSubject) {
+        return Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource(configurationSubject));
     }
 
     @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
@@ -104,13 +104,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);
     }
 
     /**