Rename strictMetadata to combinedFileSchema

Author: DSouzaM

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ConfigurationBase.java

@@ -71,7 +71,14 @@ public T copyAndFilter(P predicate) {
         return copyAnd(copy -> copy.removeIf(predicate));
     }
 
-    public abstract ConfigurationParser createParser(boolean strictMetadata, EnumSet<ConfigurationParserOption> parserOptions);
+    /**
+     * Creates a JSON parser used to parse and register configuration.
+     *
+     * @param combinedFileSchema whether the parser should support the combined
+     *            reachability-metadata.json schema (if false, uses the legacy schema).
+     * @param parserOptions parser-specific options to enable different parsing features.
+     */
+    public abstract ConfigurationParser createParser(boolean combinedFileSchema, EnumSet<ConfigurationParserOption> parserOptions);
 
     public abstract boolean supportsCombinedFile();
 

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ReflectionConfigurationParser.java

@@ -62,10 +62,10 @@ protected EnumSet<ConfigurationParserOption> supportedOptions() {
         return base;
     }
 
-    public static <C, T> ReflectionConfigurationParser<C, T> create(String combinedFileKey, boolean strictMetadata,
+    public static <C, T> ReflectionConfigurationParser<C, T> create(String combinedFileKey, boolean combinedFileSchema,
                     ConfigurationConditionResolver<C> conditionResolver, ReflectionConfigurationParserDelegate<C, T> delegate,
                     EnumSet<ConfigurationParserOption> parserOptions) {
-        if (strictMetadata) {
+        if (combinedFileSchema) {
             return new ReflectionMetadataParser<>(combinedFileKey, conditionResolver, delegate, parserOptions);
         } else {
             return new LegacyReflectionConfigurationParser<>(conditionResolver, delegate, parserOptions);

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ResourceConfigurationParser.java

@@ -45,9 +45,9 @@ public abstract class ResourceConfigurationParser<C> extends ConditionalConfigur
 
     protected final ConfigurationConditionResolver<C> conditionResolver;
 
-    public static <C> ResourceConfigurationParser<C> create(boolean strictMetadata, ConfigurationConditionResolver<C> conditionResolver, ResourcesRegistry<C> registry,
+    public static <C> ResourceConfigurationParser<C> create(boolean combinedFileSchema, ConfigurationConditionResolver<C> conditionResolver, ResourcesRegistry<C> registry,
                     EnumSet<ConfigurationParserOption> parserOptions) {
-        if (strictMetadata) {
+        if (combinedFileSchema) {
             return new ResourceMetadataParser<>(conditionResolver, registry, parserOptions);
         } else {
             return new LegacyResourceConfigurationParser<>(conditionResolver, registry, parserOptions);

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/SerializationConfigurationParser.java

@@ -42,9 +42,9 @@ public abstract class SerializationConfigurationParser<C> extends ConditionalCon
     protected final ConfigurationConditionResolver<C> conditionResolver;
     protected final RuntimeSerializationSupport<C> serializationSupport;
 
-    public static <C> SerializationConfigurationParser<C> create(boolean strictMetadata, ConfigurationConditionResolver<C> conditionResolver, RuntimeSerializationSupport<C> serializationSupport,
+    public static <C> SerializationConfigurationParser<C> create(boolean combinedFileSchema, ConfigurationConditionResolver<C> conditionResolver, RuntimeSerializationSupport<C> serializationSupport,
                     EnumSet<ConfigurationParserOption> parserOptions) {
-        if (strictMetadata) {
+        if (combinedFileSchema) {
             return new SerializationMetadataParser<>(conditionResolver, serializationSupport, parserOptions);
         } else {
             return new LegacySerializationConfigurationParser<>(conditionResolver, serializationSupport, parserOptions);

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

@@ -169,9 +169,9 @@ public void printJson(JsonWriter writer) throws IOException {
     }
 
     @Override
-    public ConfigurationParser createParser(boolean strictMetadata, EnumSet<ConfigurationParserOption> parserOptions) {
-        if (strictMetadata) {
-            throw new IllegalArgumentException("Predefined classes configuration is not supported with strict metadata");
+    public ConfigurationParser createParser(boolean combinedFileSchema, EnumSet<ConfigurationParserOption> parserOptions) {
+        if (combinedFileSchema) {
+            throw new IllegalArgumentException("Predefined classes configuration is only supported with the legacy metadata schema");
         }
         return new PredefinedClassesConfigurationParser(this::add, parserOptions);
     }

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

@@ -138,9 +138,9 @@ public static void printProxyInterfaces(JsonWriter writer, List<ConditionalEleme
     }
 
     @Override
-    public ConfigurationParser createParser(boolean strictMetadata, EnumSet<ConfigurationParserOption> parserOptions) {
-        if (strictMetadata) {
-            throw new IllegalArgumentException("Independent proxy configuration is not supported with strict metadata");
+    public ConfigurationParser createParser(boolean combinedFileSchema, EnumSet<ConfigurationParserOption> parserOptions) {
+        if (combinedFileSchema) {
+            throw new IllegalArgumentException("Independent proxy configuration is only supported with the legacy metadata schema");
         }
         return new ProxyConfigurationParser<>(ConfigurationConditionResolver.identityResolver(), parserOptions,
                         (cond, interfaces) -> interfaceLists.add(new ConditionalElement<>(cond, interfaces)));

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

@@ -381,8 +381,8 @@ void printGlobsJson(JsonWriter writer, boolean combinedFile) throws IOException
     }
 
     @Override
-    public ConfigurationParser createParser(boolean strictMetadata, EnumSet<ConfigurationParserOption> parserOptions) {
-        return ResourceConfigurationParser.create(strictMetadata, ConfigurationConditionResolver.identityResolver(), new ParserAdapter(this), parserOptions);
+    public ConfigurationParser createParser(boolean combinedFileSchema, EnumSet<ConfigurationParserOption> parserOptions) {
+        return ResourceConfigurationParser.create(combinedFileSchema, ConfigurationConditionResolver.identityResolver(), new ParserAdapter(this), parserOptions);
     }
 
     private static void printResourceBundle(BundleConfiguration config, JsonWriter writer, boolean combinedFile) throws IOException {

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

@@ -132,8 +132,8 @@ public void printLegacyJson(JsonWriter writer) throws IOException {
     }
 
     @Override
-    public ConfigurationParser createParser(boolean strictMetadata, EnumSet<ConfigurationParserOption> parserOptions) {
-        return SerializationConfigurationParser.create(strictMetadata, ConfigurationConditionResolver.identityResolver(), this, parserOptions);
+    public ConfigurationParser createParser(boolean combinedFileSchema, EnumSet<ConfigurationParserOption> parserOptions) {
+        return SerializationConfigurationParser.create(combinedFileSchema, ConfigurationConditionResolver.identityResolver(), this, parserOptions);
     }
 
     @Override

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

@@ -155,8 +155,8 @@ public void printJson(JsonWriter writer) throws IOException {
     }
 
     @Override
-    public ConfigurationParser createParser(boolean strictMetadata, EnumSet<ConfigurationParserOption> parserOptions) {
-        return ReflectionConfigurationParser.create(combinedFileKey, strictMetadata, ConfigurationConditionResolver.identityResolver(), new ParserConfigurationAdapter(this), parserOptions);
+    public ConfigurationParser createParser(boolean combinedFileSchema, EnumSet<ConfigurationParserOption> parserOptions) {
+        return ReflectionConfigurationParser.create(combinedFileKey, combinedFileSchema, ConfigurationConditionResolver.identityResolver(), new ParserConfigurationAdapter(this), parserOptions);
     }
 
     @Override

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/config/ConfigurationParserUtils.java

@@ -60,10 +60,10 @@
 
 public final class ConfigurationParserUtils {
 
-    public static ReflectionConfigurationParser<ConfigurationCondition, Class<?>> create(String combinedFileKey, boolean strictMetadata,
+    public static ReflectionConfigurationParser<ConfigurationCondition, Class<?>> create(String combinedFileKey, boolean combinedFileSchema,
                     ConfigurationConditionResolver<ConfigurationCondition> conditionResolver, ReflectionRegistry registry, ProxyRegistry proxyRegistry,
                     RuntimeSerializationSupport<ConfigurationCondition> serializationSupport, ImageClassLoader imageClassLoader) {
-        return ReflectionConfigurationParser.create(combinedFileKey, strictMetadata, conditionResolver,
+        return ReflectionConfigurationParser.create(combinedFileKey, combinedFileSchema, conditionResolver,
                         RegistryAdapter.create(registry, proxyRegistry, serializationSupport, imageClassLoader),
                         ConfigurationFiles.Options.getConfigurationParserOptions());
     }