Add missing module property in BundleConfiguration and JSON printing

Author: olpaw

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java

@@ -116,17 +116,23 @@ public void addClassBasedResourceBundle(UnresolvedConfigurationCondition conditi
 
     public static final class BundleConfiguration {
         public final UnresolvedConfigurationCondition condition;
+        public final String module;
         public final String baseName;
         public final Set<String> locales = ConcurrentHashMap.newKeySet();
         public final Set<String> classNames = ConcurrentHashMap.newKeySet();
 
-        public BundleConfiguration(UnresolvedConfigurationCondition condition, String baseName) {
+        public BundleConfiguration(UnresolvedConfigurationCondition condition, String module, String baseName) {
             this.condition = condition;
+            this.module = module;
             this.baseName = baseName;
         }
 
+        public BundleConfiguration(UnresolvedConfigurationCondition condition, String baseName) {
+            this(condition, null, baseName);
+        }
+
         private BundleConfiguration(BundleConfiguration other) {
-            this(other.condition, other.baseName);
+            this(other.condition, other.module, other.baseName);
             locales.addAll(other.locales);
             classNames.addAll(other.classNames);
         }
@@ -389,6 +395,9 @@ public ConfigurationParser createParser(boolean combinedFileSchema, EnumSet<Conf
     public static void printResourceBundle(BundleConfiguration config, JsonWriter writer, boolean combinedFile) throws IOException {
         writer.appendObjectStart();
         ConfigurationConditionPrintable.printConditionAttribute(config.condition, writer, combinedFile);
+        if (config.module != null) {
+            writer.quote("module").appendFieldSeparator().quote(config.module).appendSeparator();
+        }
         writer.quote(combinedFile ? BUNDLE_KEY : NAME_KEY).appendFieldSeparator().quote(config.baseName);
         if (!combinedFile && !config.locales.isEmpty()) {
             writer.appendSeparator().quote("locales").appendFieldSeparator();

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

@@ -63,14 +63,14 @@ public static void reportResourceAccess(Module module, String resourcePath) {
     }
 
     public static void reportResourceBundleAccess(Module module, String baseName) {
-        var bundleConfig = new ResourceConfiguration.BundleConfiguration(UnresolvedConfigurationCondition.alwaysTrue(), baseName);
+        Objects.requireNonNull(module);
+        var bundleConfig = new ResourceConfiguration.BundleConfiguration(UnresolvedConfigurationCondition.alwaysTrue(), module.getName(), baseName);
         StringWriter json = new StringWriter();
         try {
             ResourceConfiguration.printResourceBundle(bundleConfig, getJSONWriter(json), true);
         } catch (IOException e) {
             throw VMError.shouldNotReachHere("In memory JSON printing should not fail");
         }
-        Objects.requireNonNull(module);
         String moduleMessage = module.isNamed() ? " from module " + quote(module.getName()) : "";
         MissingResourceRegistrationError exception = new MissingResourceRegistrationError(
                         resourceError("resource bundle" + moduleMessage + " with name " + quote(baseName), json.toString(), "resource-bundles"),