Make ResourceURLConnection module aware

Author: olpaw

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

@@ -159,9 +159,11 @@ public static ResourceStorageEntry get(String moduleName, String resourceName) {
         return singleton().resources.get(Pair.create(moduleName, resourceName));
     }
 
-    private static URL createURL(String resourceName, int index) {
+    private static URL createURL(String moduleName, String resourceName, int index) {
         try {
-            return new URL(JavaNetSubstitutions.RESOURCE_PROTOCOL, null, -1, resourceName,
+            String moduleNameNonNull = moduleName == null ? "" : moduleName;
+            String filePart = moduleNameNonNull + ResourceURLConnection.MODULENAME_SEPARATOR + resourceName;
+            return new URL(JavaNetSubstitutions.RESOURCE_PROTOCOL, null, -1, filePart,
                             new URLStreamHandler() {
                                 @Override
                                 protected URLConnection openConnection(URL url) {
@@ -222,7 +224,7 @@ public static Enumeration<URL> createURLs(String moduleName, String resourceName
         int numberOfResources = entry.getData().size();
         List<URL> resourcesURLs = new ArrayList<>(numberOfResources);
         for (int index = 0; index < numberOfResources; index++) {
-            resourcesURLs.add(createURL(canonicalResourceName, index));
+            resourcesURLs.add(createURL(moduleName, canonicalResourceName, index));
         }
         return Collections.enumeration(resourcesURLs);
     }

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

@@ -37,6 +37,8 @@
 
 public class ResourceURLConnection extends URLConnection {
 
+    public static final char MODULENAME_SEPARATOR = '!';
+
     private final URL url;
     private final int index;
     private byte[] data;
@@ -51,19 +53,19 @@ public ResourceURLConnection(URL url, int index) {
         this.index = index;
     }
 
-    private static String resolveName(String resourceName) {
-        return resourceName.startsWith("/") ? resourceName.substring(1) : resourceName;
-    }
-
     @Override
     public void connect() {
         if (connected) {
             return;
         }
         connected = true;
-
-        String resourceName = resolveName(url.getPath());
-        ResourceStorageEntry entry = Resources.get(Resources.toCanonicalForm(resourceName));
+        String moduleNameResourcePath = url.getPath();
+        int separatorPos = moduleNameResourcePath.indexOf(MODULENAME_SEPARATOR);
+        String moduleName = moduleNameResourcePath.substring(0, separatorPos);
+        String resourcePath = moduleNameResourcePath.substring(separatorPos + 1);
+        String strippedResourcePath = resourcePath.startsWith("/") ? resourcePath.substring(1) : resourcePath;
+        String canonicalForm = Resources.toCanonicalForm(strippedResourcePath);
+        ResourceStorageEntry entry = Resources.get(moduleName.isEmpty() ? null : moduleName, canonicalForm);
         if (entry != null) {
             List<byte[]> bytes = entry.getData();
             if (index < bytes.size()) {