Changing resource policy.

Author: jovanstevanovic

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

@@ -69,15 +69,15 @@ final class Target_sun_misc_Resource_JDK8OrEarlier {
 }
 
 @SuppressWarnings("unchecked")
-class URLClassPathHelper {
+class ResourcesHelper {
 
-    private static <T> T urlToResource(String name, URL url) {
+    private static <T> T urlToResource(String resourceName, URL url) {
         try {
             if (url == null) {
                 return null;
             }
             URLConnection urlConnection = url.openConnection();
-            Object resource = JDKVersionSpecificResourceBuilder.buildResource(name, url, urlConnection);
+            Object resource = JDKVersionSpecificResourceBuilder.buildResource(resourceName, url, urlConnection);
             VMError.guarantee(resource != null);
             return (T) resource;
         } catch (IOException e) {
@@ -87,18 +87,40 @@ private static <T> T urlToResource(String name, URL url) {
         }
     }
 
-    static <T> T nameToResource(String name) {
-        return urlToResource(name, Resources.createURL(name));
+    static <T> T nameToResource(String resourceName) {
+        return urlToResource(resourceName, nameToResourceURL(resourceName));
     }
 
-    static <T> Enumeration<T> nameToResources(String name) {
-        Enumeration<URL> urls = Resources.createURLs(name);
+    static <T> Enumeration<T> nameToResources(String resourceName) {
+        Enumeration<URL> urls = Resources.createURLs(resourceName);
         List<T> resourceURLs = new ArrayList<>();
         while (urls.hasMoreElements()) {
-            resourceURLs.add(urlToResource(name, urls.nextElement()));
+            resourceURLs.add(urlToResource(resourceName, urls.nextElement()));
         }
         return Collections.enumeration(resourceURLs);
     }
+
+    static URL nameToResourceURL(String resourceName) {
+        return Resources.createURL(resourceName);
+    }
+
+    static InputStream nameToResourceInputStream(String resourceName) throws IOException {
+        URL url = nameToResourceURL(resourceName);
+        return url != null ? url.openStream() : null;
+    }
+
+    static List<URL> nameToResourceListURLs(String resourcesName) {
+        Enumeration<URL> urls = Resources.createURLs(resourcesName);
+        List<URL> resourceURLs = new ArrayList<>();
+        while (urls.hasMoreElements()) {
+            resourceURLs.add(urls.nextElement());
+        }
+        return resourceURLs;
+    }
+
+    static Enumeration<URL> nameToResourceEnumerationURLs(String resourcesName) {
+        return Collections.enumeration(nameToResourceListURLs(resourcesName));
+    }
 }
 
 @TargetClass(classNameProvider = Package_jdk_internal_loader.class, className = "URLClassPath")
@@ -148,27 +170,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.nameToResource(name);
+        return ResourcesHelper.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.nameToResources(name);
+        return ResourcesHelper.nameToResources(name);
     }
 
     @Substitute
     @TargetElement(name = "getResource", onlyWith = JDK8OrEarlier.class)
     public Target_sun_misc_Resource_JDK8OrEarlier getResourceJDK8OrEarlier(String name, boolean check) {
-        return URLClassPathHelper.nameToResource(name);
+        return ResourcesHelper.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.nameToResources(name);
+        return ResourcesHelper.nameToResources(name);
     }
 }
 
@@ -185,63 +207,83 @@ protected Class<?> findClass(final String name) {
     }
 }
 
-/**
- * The BuiltinClassLoader is loading resources from modules, and if a resource is not found, from
- * the classpath. Currently, we are supporting resource loading only from the classpath, so we need
- * to ensure that in all cases, we will fallback to searching in the classpath. Once we get the full
- * module support, we will need to reimplement this class.
- */
 @TargetClass(className = "jdk.internal.loader.BuiltinClassLoader", onlyWith = JDK11OrLater.class)
 @SuppressWarnings({"unused", "static-method"})
 final class Target_jdk_internal_loader_BuiltinClassLoader {
 
-    @Alias
-    public native URL findResource(String mn, String name);
+    @Substitute
+    public URL findResource(String mn, String name) {
+        return ResourcesHelper.nameToResourceURL(name);
+    }
 
     @Substitute
     public InputStream findResourceAsStream(String mn, String name) throws IOException {
-        URL url = findResource(mn, name);
-        return (url != null) ? url.openStream() : null;
+        return ResourcesHelper.nameToResourceInputStream(name);
+    }
+
+    @Substitute
+    public URL findResource(String name) {
+        return ResourcesHelper.nameToResourceURL(name);
+    }
+
+    @Substitute
+    public Enumeration<URL> findResources(String name) {
+        return ResourcesHelper.nameToResourceEnumerationURLs(name);
     }
 
     @Substitute
     private List<URL> findMiscResource(String name) {
-        return new ArrayList<>();
+        return ResourcesHelper.nameToResourceListURLs(name);
     }
 
     @Substitute
     private URL findResource(Target_java_lang_module_ModuleReference mref, String name) {
-        return null;
+        return ResourcesHelper.nameToResourceURL(name);
     }
 
     @Substitute
     private URL findResourceOnClassPath(String name) {
-        return Resources.createURL(name);
+        return ResourcesHelper.nameToResourceURL(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);
+        return ResourcesHelper.nameToResourceEnumerationURLs(name);
     }
 }
 
-/**
- * The Loader is loading resources from modules. Currently, we are supporting resource loading only
- * from the classpath. Once we get the full module support, we will need to reimplement this class.
- * This method is a root of substitution, so we only need to return null here.
- */
 @TargetClass(className = "jdk.internal.loader.Loader", onlyWith = JDK11OrLater.class)
 @SuppressWarnings({"unused", "static-method"})
 final class Target_jdk_internal_loader_Loader {
 
     @Substitute
     protected URL findResource(String mn, String name) {
-        return null;
+        return ResourcesHelper.nameToResourceURL(name);
+    }
+
+    @Substitute
+    public URL findResource(String name) {
+        return ResourcesHelper.nameToResourceURL(name);
+    }
+
+    @Substitute
+    public Enumeration<URL> findResources(String name) {
+        return ResourcesHelper.nameToResourceEnumerationURLs(name);
+    }
+
+    @Substitute
+    public URL getResource(String name) {
+        return ResourcesHelper.nameToResourceURL(name);
+    }
+
+    @Substitute
+    public Enumeration<URL> getResources(String name) throws IOException {
+        return ResourcesHelper.nameToResourceEnumerationURLs(name);
+    }
+
+    @Substitute
+    private List<URL> findResourcesAsList(String name) {
+        return ResourcesHelper.nameToResourceListURLs(name);
     }
 }