[GR-37154] Make Class.getResource compatible with java in all cases.

jovanstevanovic · jovanstevanovic · commit 7795578f2806 · 2022-03-11T11:19:34.000Z
PullRequest: graal/11226
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
@@ -1,6 +1,6 @@
 # pylint: disable=line-too-long
 suite = {
-    "mxversion": "5.319.0",
+    "mxversion": "5.316.15",
     "name": "substratevm",
     "version" : "22.1.0",
     "release" : False,
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ClassLoaderSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/ClassLoaderSupport.java
@@ -52,9 +52,9 @@ public interface ResourceCollector {
 
         boolean isIncluded(String moduleName, String resourceName);
 
-        void addResource(String moduleName, String resourceName, InputStream resourceStream);
+        void addResource(String moduleName, String resourceName, InputStream resourceStream, boolean fromJar);
 
-        void addDirectoryResource(String moduleName, String dir, String content);
+        void addDirectoryResource(String moduleName, String dir, String content, boolean fromJar);
     }
 
     public abstract void collectResources(ResourceCollector resourceCollector);
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java
@@ -29,6 +29,7 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -42,6 +43,7 @@
 import org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.svm.core.annotate.AutomaticFeature;
+import com.oracle.svm.core.jdk.resources.NativeImageResourcePath;
 import com.oracle.svm.core.jdk.resources.ResourceStorageEntry;
 import com.oracle.svm.core.util.ImageHeapMap;
 import com.oracle.svm.core.util.VMError;
@@ -83,57 +85,108 @@ public static byte[] inputStreamToByteArray(InputStream is) {
         }
     }
 
-    private static String getResourceWithoutTrailingSlash(String name) {
-        return name.endsWith("/") ? name.substring(0, name.length() - 1) : name;
-    }
-
-    private static void addEntry(String moduleName, String resourceName, boolean isDirectory, byte[] data) {
+    private static void addEntry(String moduleName, String resourceName, boolean isDirectory, byte[] data, boolean fromJar) {
         Resources support = singleton();
-        Pair<String, String> key = Pair.create(moduleName, getResourceWithoutTrailingSlash(resourceName));
+        Pair<String, String> key = Pair.create(moduleName, resourceName);
         ResourceStorageEntry entry = support.resources.get(key);
         if (entry == null) {
-            entry = new ResourceStorageEntry(isDirectory);
+            entry = new ResourceStorageEntry(isDirectory, fromJar);
             support.resources.put(key, entry);
         }
         entry.getData().add(data);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public static void registerResource(String resourceName, InputStream is) {
-        registerResource(null, resourceName, is);
+        registerResource(null, resourceName, is, true);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static void registerResource(String resourceName, InputStream is, boolean fromJar) {
+        registerResource(null, resourceName, is, fromJar);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public static void registerResource(String moduleName, String resourceName, InputStream is) {
-        addEntry(moduleName, resourceName, false, inputStreamToByteArray(is));
+        registerResource(moduleName, resourceName, is, true);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static void registerResource(String moduleName, String resourceName, InputStream is, boolean fromJar) {
+        addEntry(moduleName, resourceName, false, inputStreamToByteArray(is), fromJar);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public static void registerDirectoryResource(String resourceDirName, String content) {
-        registerDirectoryResource(null, resourceDirName, content);
+        registerDirectoryResource(null, resourceDirName, content, true);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static void registerDirectoryResource(String resourceDirName, String content, boolean fromJar) {
+        registerDirectoryResource(null, resourceDirName, content, fromJar);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public static void registerDirectoryResource(String moduleName, String resourceDirName, String content) {
+        registerDirectoryResource(moduleName, resourceDirName, content, true);
+    }
+
+    @Platforms(Platform.HOSTED_ONLY.class)
+    public static void registerDirectoryResource(String moduleName, String resourceDirName, String content, boolean fromJar) {
         /*
          * A directory content represents the names of all files and subdirectories located in the
          * specified directory, separated with new line delimiter and joined into one string which
          * is later converted into a byte array and placed into the resources map.
          */
-        addEntry(moduleName, resourceDirName, true, content.getBytes());
+        addEntry(moduleName, resourceDirName, true, content.getBytes(), fromJar);
+    }
+
+    /**
+     * Avoid pulling native file system by using {@link NativeImageResourcePath} implementation to
+     * convert <code>resourceName</code> to canonical variant.
+     */
+    public static String toCanonicalForm(String resourceName) {
+        NativeImageResourcePath path = new NativeImageResourcePath(null, removeTrailingSlash(resourceName).getBytes(StandardCharsets.UTF_8), true);
+        return new String(NativeImageResourcePath.getResolved(path));
+    }
+
+    private static boolean hasTrailingSlash(String resourceName) {
+        return resourceName.endsWith("/");
+    }
+
+    private static String removeTrailingSlash(String resourceName) {
+        return hasTrailingSlash(resourceName) ? resourceName.substring(0, resourceName.length() - 1) : resourceName;
+    }
+
+    private static boolean wasAlreadyInCanonicalForm(String resourceName, String canonicalResourceName) {
+        return resourceName.equals(canonicalResourceName) || removeTrailingSlash(resourceName).equals(canonicalResourceName);
     }
 
     public static ResourceStorageEntry get(String name) {
         return get(null, name);
     }
 
     public static ResourceStorageEntry get(String moduleName, String resourceName) {
-        ResourceStorageEntry resourceStorageEntry = singleton().resources.get(Pair.create(moduleName, getResourceWithoutTrailingSlash(resourceName)));
-        if (resourceStorageEntry != null && (resourceStorageEntry.isDirectory() || !resourceName.endsWith("/"))) {
-            return resourceStorageEntry;
-        } else {
+        String canonicalResourceName = toCanonicalForm(resourceName);
+        ResourceStorageEntry entry = singleton().resources.get(Pair.create(moduleName, canonicalResourceName));
+        if (entry == null) {
+            return null;
+        }
+        if (entry.isFromJar() && !wasAlreadyInCanonicalForm(resourceName, canonicalResourceName)) {
+            /*
+             * The resource originally came from a jar file, thus behave like ZipFileSystem behaves
+             * for non-canonical paths.
+             */
             return null;
         }
+        if (!entry.isDirectory() && hasTrailingSlash(resourceName)) {
+            /*
+             * It this an actual resource file (not a directory) we do not tolerate a trailing
+             * slash.
+             */
+            return null;
+        }
+        return entry;
     }
 
     private static URL createURL(String moduleName, String resourceName, int index) {
@@ -186,30 +239,31 @@ public static Enumeration<URL> createURLs(String moduleName, String resourceName
         }
 
         List<URL> resourcesURLs = new ArrayList<>();
-
+        String canonicalResourceName = toCanonicalForm(resourceName);
+        boolean shouldAppendTrailingSlash = hasTrailingSlash(resourceName);
         /* If moduleName was unspecified we have to consider all modules in the image */
         if (moduleName == null) {
             for (Module module : BootModuleLayerSupport.instance().getBootLayer().modules()) {
                 ResourceStorageEntry entry = Resources.get(module.getName(), resourceName);
-                addURLEntries(resourcesURLs, entry, module.getName(), resourceName);
+                addURLEntries(resourcesURLs, entry, module.getName(), shouldAppendTrailingSlash ? canonicalResourceName + '/' : canonicalResourceName);
             }
         }
         ResourceStorageEntry explicitEntry = Resources.get(moduleName, resourceName);
-        addURLEntries(resourcesURLs, explicitEntry, moduleName, resourceName);
+        addURLEntries(resourcesURLs, explicitEntry, moduleName, shouldAppendTrailingSlash ? canonicalResourceName + '/' : canonicalResourceName);
 
         if (resourcesURLs.isEmpty()) {
             return Collections.emptyEnumeration();
         }
         return Collections.enumeration(resourcesURLs);
     }
 
-    private static void addURLEntries(List<URL> resourcesURLs, ResourceStorageEntry entry, String moduleName, String resourceName) {
+    private static void addURLEntries(List<URL> resourcesURLs, ResourceStorageEntry entry, String moduleName, String canonicalResourceName) {
         if (entry == null) {
             return;
         }
         int numberOfResources = entry.getData().size();
         for (int index = 0; index < numberOfResources; index++) {
-            resourcesURLs.add(createURL(moduleName, resourceName, index));
+            resourcesURLs.add(createURL(moduleName, canonicalResourceName, index));
         }
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceStorageEntry.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceStorageEntry.java
@@ -31,17 +31,23 @@
 public class ResourceStorageEntry {
 
     private final boolean isDirectory;
+    private final boolean fromJar;
     private final List<byte[]> data;
 
-    public ResourceStorageEntry(boolean isDirectory) {
+    public ResourceStorageEntry(boolean isDirectory, boolean fromJar) {
         this.isDirectory = isDirectory;
+        this.fromJar = fromJar;
         this.data = new ArrayList<>();
     }
 
     public boolean isDirectory() {
         return isDirectory;
     }
 
+    public boolean isFromJar() {
+        return fromJar;
+    }
+
     public List<byte[]> getData() {
         return data;
     }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderSupportImpl.java
@@ -110,7 +110,7 @@ private static void scanDirectory(Path root, ResourceCollector collector) throws
             } else {
                 if (collector.isIncluded(null, relativeFilePath)) {
                     try (InputStream is = Files.newInputStream(entry)) {
-                        collector.addResource(null, relativeFilePath, is);
+                        collector.addResource(null, relativeFilePath, is, false);
                     }
                 }
             }
@@ -127,7 +127,7 @@ private static void scanDirectory(Path root, ResourceCollector collector) throws
 
         matchedDirectoryResources.forEach((dir, content) -> {
             content.sort(Comparator.naturalOrder());
-            collector.addDirectoryResource(null, dir, String.join(System.lineSeparator(), content));
+            collector.addDirectoryResource(null, dir, String.join(System.lineSeparator(), content), false);
         });
     }
 
@@ -140,12 +140,12 @@ private static void scanJar(Path jarPath, ResourceCollector collector) throws IO
                     String dirName = entry.getName().substring(0, entry.getName().length() - 1);
                     if (collector.isIncluded(null, dirName)) {
                         // Register the directory with empty content to preserve Java behavior
-                        collector.addDirectoryResource(null, dirName, "");
+                        collector.addDirectoryResource(null, dirName, "", true);
                     }
                 } else {
                     if (collector.isIncluded(null, entry.getName())) {
                         try (InputStream is = jf.getInputStream(entry)) {
-                            collector.addResource(null, entry.getName(), is);
+                            collector.addResource(null, entry.getName(), is, true);
                         }
                     }
                 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ResourcesFeature.java
@@ -233,15 +233,15 @@ public boolean isIncluded(String moduleName, String resourceName) {
         }
 
         @Override
-        public void addResource(String moduleName, String resourceName, InputStream resourceStream) {
+        public void addResource(String moduleName, String resourceName, InputStream resourceStream, boolean fromJar) {
             collectModuleName(moduleName);
-            registerResource(debugContext, moduleName, resourceName, resourceStream);
+            registerResource(debugContext, moduleName, resourceName, resourceStream, fromJar);
         }
 
         @Override
-        public void addDirectoryResource(String moduleName, String dir, String content) {
+        public void addDirectoryResource(String moduleName, String dir, String content, boolean fromJar) {
             collectModuleName(moduleName);
-            registerDirectoryResource(debugContext, moduleName, dir, content);
+            registerDirectoryResource(debugContext, moduleName, dir, content, fromJar);
         }
 
         private void collectModuleName(String moduleName) {
@@ -319,20 +319,20 @@ public void beforeCompilation(BeforeCompilationAccess access) {
     }
 
     @SuppressWarnings("try")
-    private static void registerResource(DebugContext debugContext, String moduleName, String resourceName, InputStream resourceStream) {
+    private static void registerResource(DebugContext debugContext, String moduleName, String resourceName, InputStream resourceStream, boolean fromJar) {
         try (DebugContext.Scope s = debugContext.scope("registerResource")) {
             String moduleNamePrefix = moduleName == null ? "" : moduleName + ":";
             debugContext.log(DebugContext.VERBOSE_LEVEL, "ResourcesFeature: registerResource: %s%s", moduleNamePrefix, resourceName);
-            Resources.registerResource(moduleName, resourceName, resourceStream);
+            Resources.registerResource(moduleName, resourceName, resourceStream, fromJar);
         }
     }
 
     @SuppressWarnings("try")
-    private static void registerDirectoryResource(DebugContext debugContext, String moduleName, String dir, String content) {
+    private static void registerDirectoryResource(DebugContext debugContext, String moduleName, String dir, String content, boolean fromJar) {
         try (DebugContext.Scope s = debugContext.scope("registerResource")) {
             String moduleNamePrefix = moduleName == null ? "" : moduleName + ":";
             debugContext.log(DebugContext.VERBOSE_LEVEL, "ResourcesFeature: registerResource: %s%s", moduleNamePrefix, moduleName, dir);
-            Resources.registerDirectoryResource(moduleName, dir, content);
+            Resources.registerDirectoryResource(moduleName, dir, content, fromJar);
         }
     }
 }
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java
@@ -362,7 +362,7 @@ private boolean handleType(AnalysisType type, DuringAnalysisAccessImpl access) {
         try (DebugContext.Scope s = debugContext.scope("registerResource")) {
             debugContext.log("ServiceLoaderFeature: registerResource: " + serviceResourceLocation);
         }
-        Resources.registerResource(null, serviceResourceLocation, new ByteArrayInputStream(newResourceValue.toString().getBytes(StandardCharsets.UTF_8)));
+        Resources.registerResource(null, serviceResourceLocation, new ByteArrayInputStream(newResourceValue.toString().getBytes(StandardCharsets.UTF_8)), false);
 
         /* Ensure that the static analysis runs again for the new implementation classes. */
         access.requireAnalysisIteration();
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/ClassLoaderSupportFeatureJDK11OrLater.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/ClassLoaderSupportFeatureJDK11OrLater.java
@@ -89,7 +89,7 @@ private static void collectResourceFromModule(ResourceCollector resourceCollecto
                     continue;
                 }
                 try (InputStream is = content.get()) {
-                    resourceCollector.addResource(moduleName, resName, is);
+                    resourceCollector.addResource(moduleName, resName, is, false);
                 }
             }
         } catch (IOException e) {
diff --git a/substratevm/src/com.oracle.svm.test/src/META-INF/native-image/com.oracle.svm.test/native-image.properties b/substratevm/src/com.oracle.svm.test/src/META-INF/native-image/com.oracle.svm.test/native-image.properties
@@ -4,7 +4,7 @@ Args= \
   --features=com.oracle.svm.test.SerializationRegistrationTestFeature \
   --features=com.oracle.svm.test.AbstractServiceLoaderTest$TestFeature \
   --features=com.oracle.svm.test.NoProviderConstructorServiceLoaderTest$TestFeature \
-  --features=com.oracle.svm.test.NativeImageResourceFileSystemProviderTest$TestFeature \
+  --features=com.oracle.svm.test.NativeImageResourceUtils$TestFeature \
   --add-opens=java.base/java.lang=ALL-UNNAMED \
   -H:+AllowVMInspection \
   --add-exports=org.graalvm.nativeimage.builder/com.oracle.svm.core.containers=ALL-UNNAMED
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceFileSystemProviderTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceFileSystemProviderTest.java
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceTest.java
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceUtils.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/NativeImageResourceUtils.java

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ public interface ResourceCollector {`
`52`	`52`
`53`	`53`	`boolean isIncluded(String moduleName, String resourceName);`
`54`	`54`
`55`		`- void addResource(String moduleName, String resourceName, InputStream resourceStream);`
	`55`	`+ void addResource(String moduleName, String resourceName, InputStream resourceStream, boolean fromJar);`
`56`	`56`
`57`		`- void addDirectoryResource(String moduleName, String dir, String content);`
	`57`	`+ void addDirectoryResource(String moduleName, String dir, String content, boolean fromJar);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public abstract void collectResources(ResourceCollector resourceCollector);`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private static void scanDirectory(Path root, ResourceCollector collector) throws`
`110`	`110`	`} else {`
`111`	`111`	`if (collector.isIncluded(null, relativeFilePath)) {`
`112`	`112`	`try (InputStream is = Files.newInputStream(entry)) {`
`113`		`- collector.addResource(null, relativeFilePath, is);`
	`113`	`+ collector.addResource(null, relativeFilePath, is, false);`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`}`
`@@ -127,7 +127,7 @@ private static void scanDirectory(Path root, ResourceCollector collector) throws`
`127`	`127`
`128`	`128`	`matchedDirectoryResources.forEach((dir, content) -> {`
`129`	`129`	`content.sort(Comparator.naturalOrder());`
`130`		`- collector.addDirectoryResource(null, dir, String.join(System.lineSeparator(), content));`
	`130`	`+ collector.addDirectoryResource(null, dir, String.join(System.lineSeparator(), content), false);`
`131`	`131`	`});`
`132`	`132`	`}`
`133`	`133`
`@@ -140,12 +140,12 @@ private static void scanJar(Path jarPath, ResourceCollector collector) throws IO`
`140`	`140`	`String dirName = entry.getName().substring(0, entry.getName().length() - 1);`
`141`	`141`	`if (collector.isIncluded(null, dirName)) {`
`142`	`142`	`// Register the directory with empty content to preserve Java behavior`
`143`		`- collector.addDirectoryResource(null, dirName, "");`
	`143`	`+ collector.addDirectoryResource(null, dirName, "", true);`
`144`	`144`	`}`
`145`	`145`	`} else {`
`146`	`146`	`if (collector.isIncluded(null, entry.getName())) {`
`147`	`147`	`try (InputStream is = jf.getInputStream(entry)) {`
`148`		`- collector.addResource(null, entry.getName(), is);`
	`148`	`+ collector.addResource(null, entry.getName(), is, true);`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,15 +233,15 @@ public boolean isIncluded(String moduleName, String resourceName) {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`@Override`
`236`		`- public void addResource(String moduleName, String resourceName, InputStream resourceStream) {`
	`236`	`+ public void addResource(String moduleName, String resourceName, InputStream resourceStream, boolean fromJar) {`
`237`	`237`	`collectModuleName(moduleName);`
`238`		`- registerResource(debugContext, moduleName, resourceName, resourceStream);`
	`238`	`+ registerResource(debugContext, moduleName, resourceName, resourceStream, fromJar);`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`@Override`
`242`		`- public void addDirectoryResource(String moduleName, String dir, String content) {`
	`242`	`+ public void addDirectoryResource(String moduleName, String dir, String content, boolean fromJar) {`
`243`	`243`	`collectModuleName(moduleName);`
`244`		`- registerDirectoryResource(debugContext, moduleName, dir, content);`
	`244`	`+ registerDirectoryResource(debugContext, moduleName, dir, content, fromJar);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`private void collectModuleName(String moduleName) {`
`@@ -319,20 +319,20 @@ public void beforeCompilation(BeforeCompilationAccess access) {`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`@SuppressWarnings("try")`
`322`		`- private static void registerResource(DebugContext debugContext, String moduleName, String resourceName, InputStream resourceStream) {`
	`322`	`+ private static void registerResource(DebugContext debugContext, String moduleName, String resourceName, InputStream resourceStream, boolean fromJar) {`
`323`	`323`	`try (DebugContext.Scope s = debugContext.scope("registerResource")) {`
`324`	`324`	`String moduleNamePrefix = moduleName == null ? "" : moduleName + ":";`
`325`	`325`	`debugContext.log(DebugContext.VERBOSE_LEVEL, "ResourcesFeature: registerResource: %s%s", moduleNamePrefix, resourceName);`
`326`		`- Resources.registerResource(moduleName, resourceName, resourceStream);`
	`326`	`+ Resources.registerResource(moduleName, resourceName, resourceStream, fromJar);`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`@SuppressWarnings("try")`
`331`		`- private static void registerDirectoryResource(DebugContext debugContext, String moduleName, String dir, String content) {`
	`331`	`+ private static void registerDirectoryResource(DebugContext debugContext, String moduleName, String dir, String content, boolean fromJar) {`
`332`	`332`	`try (DebugContext.Scope s = debugContext.scope("registerResource")) {`
`333`	`333`	`String moduleNamePrefix = moduleName == null ? "" : moduleName + ":";`
`334`	`334`	`debugContext.log(DebugContext.VERBOSE_LEVEL, "ResourcesFeature: registerResource: %s%s", moduleNamePrefix, moduleName, dir);`
`335`		`- Resources.registerDirectoryResource(moduleName, dir, content);`
	`335`	`+ Resources.registerDirectoryResource(moduleName, dir, content, fromJar);`
`336`	`336`	`}`
`337`	`337`	`}`
`338`	`338`	`}`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ private boolean handleType(AnalysisType type, DuringAnalysisAccessImpl access) {`
`362`	`362`	`try (DebugContext.Scope s = debugContext.scope("registerResource")) {`
`363`	`363`	`debugContext.log("ServiceLoaderFeature: registerResource: " + serviceResourceLocation);`
`364`	`364`	`}`
`365`		`- Resources.registerResource(null, serviceResourceLocation, new ByteArrayInputStream(newResourceValue.toString().getBytes(StandardCharsets.UTF_8)));`
	`365`	`+ Resources.registerResource(null, serviceResourceLocation, new ByteArrayInputStream(newResourceValue.toString().getBytes(StandardCharsets.UTF_8)), false);`
`366`	`366`
`367`	`367`	`/* Ensure that the static analysis runs again for the new implementation classes. */`
`368`	`368`	`access.requireAnalysisIteration();`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private static void collectResourceFromModule(ResourceCollector resourceCollecto`
`89`	`89`	`continue;`
`90`	`90`	`}`
`91`	`91`	`try (InputStream is = content.get()) {`
`92`		`- resourceCollector.addResource(moduleName, resName, is);`
	`92`	`+ resourceCollector.addResource(moduleName, resName, is, false);`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`	`} catch (IOException e) {`