Fixed bug with classpath search.

Author: jovanstevanovic

substratevm/mx.substratevm/ce-dev

@@ -0,0 +1,5 @@
+LINKY_LAYOUT=*.jar
+DISABLE_INSTALLABLES=true
+FORCE_BASH_LAUNCHERS=true
+EXCLUDE_COMPONENTS=nju,nic,LibGraal
+SKIP_LIBRARIES=polyglot

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java

@@ -87,11 +87,11 @@ private static <T> T urlToResource(String name, URL url) {
         }
     }
 
-    static <T> T urlToResource(String name) {
+    static <T> T nameToResource(String name) {
         return urlToResource(name, Resources.createURL(name));
     }
 
-    static <T> Enumeration<T> findResources(String name) {
+    static <T> Enumeration<T> nameToResources(String name) {
         Enumeration<URL> urls = Resources.createURLs(name);
         List<T> resourceURLs = new ArrayList<>();
         while (urls.hasMoreElements()) {
@@ -148,27 +148,27 @@ public Enumeration<URL> findResources(final String name, final boolean check) {
     @Substitute
     @TargetElement(name = "getResource", onlyWith = JDK11OrLater.class)
     public Target_jdk_internal_loader_Resource_JDK11OrLater getResourceJDK11OrLater(String name, boolean check) {
-        return URLClassPathHelper.urlToResource(name);
+        return URLClassPathHelper.nameToResource(name);
     }
 
     @Substitute
     @TargetElement(name = "getResources", onlyWith = JDK11OrLater.class)
     public Enumeration<Target_jdk_internal_loader_Resource_JDK11OrLater> getResourcesJDK11OrLater(final String name,
                     final boolean check) {
-        return URLClassPathHelper.findResources(name);
+        return URLClassPathHelper.nameToResources(name);
     }
 
     @Substitute
     @TargetElement(name = "getResource", onlyWith = JDK8OrEarlier.class)
     public Target_sun_misc_Resource_JDK8OrEarlier getResourceJDK8OrEarlier(String name, boolean check) {
-        return URLClassPathHelper.urlToResource(name);
+        return URLClassPathHelper.nameToResource(name);
     }
 
     @Substitute
     @TargetElement(name = "getResources", onlyWith = JDK8OrEarlier.class)
     public Enumeration<Target_sun_misc_Resource_JDK8OrEarlier> getResourcesJDK8OrEarlier(final String name,
                     final boolean check) {
-        return URLClassPathHelper.findResources(name);
+        return URLClassPathHelper.nameToResources(name);
     }
 }
 
@@ -213,6 +213,21 @@ private List<URL> findMiscResource(String name) {
     private URL findResource(Target_java_lang_module_ModuleReference mref, String name) {
         return null;
     }
+
+    @Substitute
+    private URL findResourceOnClassPath(String name) {
+        return Resources.createURL(name);
+    }
+
+    @Substitute
+    private Enumeration<URL> findResourcesOnClassPath(String name) {
+        Enumeration<URL> urls = Resources.createURLs(name);
+        List<URL> resourceURLs = new ArrayList<>();
+        while (urls.hasMoreElements()) {
+            resourceURLs.add(urls.nextElement());
+        }
+        return Collections.enumeration(resourceURLs);
+    }
 }
 
 /**

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ByteArrayChannel.java

@@ -36,12 +36,12 @@
 
 /**
  * <p>
- * This class is copy of class {@link jdk.nio.zipfs.ByteArrayChannel }. There are two reasons why we
- * cannot substitute this class:
+ * This class is copy of class jdk.nio.zipfs.ByteArrayChannel. There are two reasons why we cannot
+ * substitute this class:
  * <ul>
  * <li>This class doesn't exists on JDK8.</li>
- * <li>On JDK11, we need to extends this class, and in case of substitution, it's not possible because
- * substituted class is final</li>
+ * <li>On JDK11, we need to extends this class, and in case of substitution, it's not possible
+ * because substituted class is final</li>
  * </ul>
  * </p>
  */

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourceFileSystem.java

@@ -89,9 +89,9 @@
 
 /**
  * <p>
- * Some parts of code from this class are copied from {@link jdk.nio.zipfs.ZipFileSystem } with small tweaks. The
- * main reason why we cannot reuse this class (without any code copying) is that we cannot extend
- * {@link jdk.nio.zipfs.ZipPath } which is central class in Zip file system.
+ * Some parts of code from this class are copied from jdk.nio.zipfs.ZipFileSystem with small tweaks.
+ * The main reason why we cannot reuse this class (without any code copying) is that we cannot
+ * extend jdk.nio.zipfs.ZipPath which is central class in Zip file system.
  * </p>
  */
 public class NativeImageResourceFileSystem extends FileSystem {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/NativeImageResourcePath.java

@@ -69,9 +69,8 @@
 
 /**
  * <p>
- * Most of the code from this class is a copy of {@link jdk.nio.zipfs.ZipPath } with small tweaks.
- * The main reason why we cannot reuse this class is that this class is final in its original
- * implementation.
+ * Most of the code from this class is a copy of jdk.nio.zipfs.ZipPath with small tweaks. The main
+ * reason why we cannot reuse this class is that this class is final in its original implementation.
  * </p>
  */
 public class NativeImageResourcePath implements Path {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceURLConnection.java

@@ -31,6 +31,7 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.List;
 
 import com.oracle.svm.core.jdk.Resources;
 
@@ -64,13 +65,16 @@ public void connect() {
         String resourceName = resolveName(url.getPath());
         ResourceStorageEntry entry = Resources.get(resourceName);
         if (entry != null) {
-            if (index < entry.getData().size()) {
-                data = entry.getData().get(index);
+            List<byte[]> bytes = entry.getData();
+            if (index < bytes.size()) {
+                this.data = bytes.get(index);
             } else {
                 // This will happen only in case that we are creating one URL with the second URL as
                 // a context.
-                data = entry.getData().get(0);
+                this.data = bytes.get(0);
             }
+        } else {
+            this.data = null;
         }
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java

@@ -32,8 +32,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.nio.file.FileSystems;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -311,7 +309,7 @@ private static void scanJar(DebugContext debugContext, File root, Pattern[] incl
             if (entry.isDirectory()) {
                 String dirName = entry.getName().substring(0, entry.getName().length() - 1);
                 if (matches(includePatterns, excludePatterns, dirName)) {
-                    // Directory content is emtpy during JAR scanning.
+                    // Directory content is emtpy in JAR scanning.
                     registerDirectoryResource(debugContext, dirName, "");
                 }
             } else {
@@ -325,7 +323,7 @@ private static void scanJar(DebugContext debugContext, File root, Pattern[] incl
     }
 
     private static boolean matches(Pattern[] includePatterns, Pattern[] excludePatterns, String relativePath) {
-        String relativePathWithSeparator = Paths.get(FileSystems.getDefault().getSeparator(), relativePath).toString();
+        String relativePathWithSeparator = "/" + relativePath;
         for (Pattern p : excludePatterns) {
             if (p.matcher(relativePath).matches() || p.matcher(relativePathWithSeparator).matches()) {
                 return false;

substratevm/src/com.oracle.svm.test/src/META-INF/native-image/com.oracle.svm.test/native-image.properties

@@ -1,2 +1 @@
-Args = -H:IncludeResources=resources/resource-test1.txt|resources/resource-test2.txt \
-       --initialize-at-run-time=com.oracle.svm.test
+Args = --initialize-at-run-time=com.oracle.svm.test

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceFileSystemProviderTest.java

@@ -54,18 +54,35 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.configure.ResourcesRegistry;
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class NativeImageResourceFileSystemProviderTest {
 
-    private static final String RESOURCE_DIR = Paths.get(FileSystems.getDefault().getSeparator(), "resources").toString();
-    private static final String RESOURCE_FILE1 = Paths.get(RESOURCE_DIR, "resource-test1.txt").toString();
-    private static final String RESOURCE_FILE2 = Paths.get(RESOURCE_DIR, "resource-test2.txt").toString();
-    private static final String NEW_DIRECTORY = Paths.get(RESOURCE_DIR, "tmp").toString();
+    private static final String RESOURCE_DIR = "/resources";
+    private static final String RESOURCE_FILE_1 = RESOURCE_DIR + "/resource-test1.txt";
+    private static final String RESOURCE_FILE_2 = RESOURCE_DIR + "/resource-test2.txt";
+    private static final String NEW_DIRECTORY = RESOURCE_DIR + "/tmp";
 
     private static final int TIME_SPAN = 1_000_000;
 
+    // Register resources.
+    @AutomaticFeature
+    private static final class RegisterResourceFeature implements Feature {
+        @Override
+        public void beforeAnalysis(BeforeAnalysisAccess access) {
+            RuntimeClassInitialization.initializeAtBuildTime(NativeImageResourceFileSystemProviderTest.class);
+            ResourcesRegistry registry = ImageSingletons.lookup(ResourcesRegistry.class);
+            registry.addResources(RESOURCE_FILE_1);
+            registry.addResources(RESOURCE_FILE_2);
+        }
+    }
+
     private static URL resourceNameToURL(String resourceName) {
         URL resource = NativeImageResourceFileSystemProviderTest.class.getResource(resourceName);
         Assert.assertNotNull("Resource " + resourceName + " is not found!", resource);
@@ -107,7 +124,7 @@ private static boolean compareTwoURLs(URL url1, URL url2) throws IOException {
     }
 
     private static FileSystem createNewFileSystem() {
-        URI resource = resourceNameToURI(RESOURCE_FILE1);
+        URI resource = resourceNameToURI(RESOURCE_FILE_1);
 
         Map<String, String> env = new HashMap<>();
         env.put("create", "true");
@@ -158,8 +175,8 @@ private static void closeFileSystem(FileSystem fileSystem) {
     @Test
     public void githubIssues() {
         try {
-            URL url1 = resourceNameToURL(RESOURCE_FILE1);
-            URL url2 = new URL(url1, RESOURCE_FILE2);
+            URL url1 = resourceNameToURL(RESOURCE_FILE_1);
+            URL url2 = new URL(url1, RESOURCE_FILE_2);
             Assert.assertNotNull("Second URL is null!", url2);
             Assert.assertFalse("Two URLs are same!", compareTwoURLs(url1, url2));
         } catch (IOException e) {
@@ -187,7 +204,7 @@ public void readingFileByteChannel() {
         FileSystem fileSystem = createNewFileSystem();
 
         Path resourceDirectory = fileSystem.getPath(RESOURCE_DIR);
-        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE1);
+        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE_1);
 
         // 2. Reading from file.
         try (SeekableByteChannel channel = Files.newByteChannel(resourceDirectory, StandardOpenOption.READ)) {
@@ -230,7 +247,7 @@ public void writingFileByteChannel() {
         FileSystem fileSystem = createNewFileSystem();
 
         Path resourceDirectory = fileSystem.getPath(RESOURCE_DIR);
-        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE1);
+        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE_1);
 
         // 2. Writing into file.
         try {
@@ -282,7 +299,7 @@ public void readingFileFileChannel() {
         FileSystem fileSystem = createNewFileSystem();
 
         Path resourceDirectory = fileSystem.getPath(RESOURCE_DIR);
-        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE1);
+        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE_1);
 
         // 2. Reading from file.
         Set<StandardOpenOption> permissions = Collections.singleton(StandardOpenOption.READ);
@@ -327,7 +344,7 @@ public void writingFileFileChannel() {
         FileSystemProvider provider = fileSystem.provider();
 
         Path resourceDirectory = fileSystem.getPath(RESOURCE_DIR);
-        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE1);
+        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE_1);
 
         Set<StandardOpenOption> readPermissions = Collections.singleton(StandardOpenOption.READ);
         Set<StandardOpenOption> writePermissions = Collections.singleton(StandardOpenOption.WRITE);
@@ -388,8 +405,8 @@ public void fileSystemOperations() {
         // 1. Creating new file system.
         FileSystem fileSystem = createNewFileSystem();
 
-        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE1);
-        Path resourceFile2 = resourceNameToPath(RESOURCE_FILE2);
+        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE_1);
+        Path resourceFile2 = resourceNameToPath(RESOURCE_FILE_2);
 
         // 2. Creating new directory.
         Path newDirectory = fileSystem.getPath(NEW_DIRECTORY);
@@ -488,7 +505,7 @@ public void readingFileAttributes() {
         FileSystem fileSystem = createNewFileSystem();
 
         Path resourceDirectory = fileSystem.getPath(RESOURCE_DIR);
-        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE1);
+        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE_1);
 
         try {
             // 2. Reading file attributes.
@@ -540,7 +557,7 @@ public void readingFileAttributes() {
     public void writingFileAttributes() {
         // 1. Creating new file system.
         FileSystem fileSystem = createNewFileSystem();
-        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE1);
+        Path resourceFile1 = resourceNameToPath(RESOURCE_FILE_1);
 
         try {
             // 2. Writing file attributes.