ConfigurationCondition.objectReachable -> ConfigurationCondition.alwaysTrue

vjovanov · vjovanov · commit 14c6ad392365 · 2021-09-14T17:23:28.000+02:00
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeReflection.java
@@ -69,7 +69,7 @@ public final class RuntimeReflection {
      * @since 19.0
      */
     public static void register(Class<?>... classes) {
-        ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.objectReachable(), classes);
+        ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), classes);
     }
 
     /**
@@ -80,7 +80,7 @@ public static void register(Class<?>... classes) {
      * @since 19.0
      */
     public static void register(Executable... methods) {
-        ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.objectReachable(), methods);
+        ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), methods);
     }
 
     /**
@@ -91,7 +91,7 @@ public static void register(Executable... methods) {
      * @since 19.0
      */
     public static void register(Field... fields) {
-        ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.objectReachable(), false, fields);
+        ImageSingletons.lookup(RuntimeReflectionSupport.class).register(ConfigurationCondition.alwaysTrue(), false, fields);
     }
 
     /**
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeSerialization.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/RuntimeSerialization.java
@@ -61,7 +61,7 @@ public final class RuntimeSerialization {
      * @since 21.3
      */
     public static void register(Class<?>... classes) {
-        ImageSingletons.lookup(RuntimeSerializationSupport.class).register(ConfigurationCondition.objectReachable(), classes);
+        ImageSingletons.lookup(RuntimeSerializationSupport.class).register(ConfigurationCondition.alwaysTrue(), classes);
     }
 
     /**
@@ -76,7 +76,7 @@ public static void register(Class<?>... classes) {
      * @since 21.3
      */
     public static void registerWithTargetConstructorClass(Class<?> clazz, Class<?> customTargetConstructorClazz) {
-        ImageSingletons.lookup(RuntimeSerializationSupport.class).registerWithTargetConstructorClass(ConfigurationCondition.objectReachable(), clazz, customTargetConstructorClazz);
+        ImageSingletons.lookup(RuntimeSerializationSupport.class).registerWithTargetConstructorClass(ConfigurationCondition.alwaysTrue(), clazz, customTargetConstructorClazz);
     }
 
     private RuntimeSerialization() {
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationCondition.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationCondition.java
@@ -46,7 +46,7 @@ public final class ConfigurationCondition implements Comparable<ConfigurationCon
     private final String typeName;
     private static final ConfigurationCondition OBJECT_REACHABLE = new ConfigurationCondition(Object.class.getTypeName());
 
-    public static ConfigurationCondition objectReachable() {
+    public static ConfigurationCondition alwaysTrue() {
         return OBJECT_REACHABLE;
     }
 
diff --git a/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/OmitPreviousConfigTests.java b/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/OmitPreviousConfigTests.java
@@ -146,8 +146,8 @@ private static void doTestTypeConfig(TypeConfiguration typeConfig) {
     }
 
     private static void doTestExpectedMissingTypes(TypeConfiguration typeConfig) {
-        Assert.assertNull(typeConfig.get(ConfigurationCondition.objectReachable(), "FlagTestA"));
-        Assert.assertNull(typeConfig.get(ConfigurationCondition.objectReachable(), "FlagTestB"));
+        Assert.assertNull(typeConfig.get(ConfigurationCondition.alwaysTrue(), "FlagTestA"));
+        Assert.assertNull(typeConfig.get(ConfigurationCondition.alwaysTrue(), "FlagTestB"));
     }
 
     private static void doTestTypeFlags(TypeConfiguration typeConfig) {
@@ -182,7 +182,7 @@ private static void doTestMethods(TypeConfiguration typeConfig) {
     }
 
     private static void doTestProxyConfig(ProxyConfiguration proxyConfig) {
-        ConfigurationCondition condition = ConfigurationCondition.objectReachable();
+        ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
         Assert.assertFalse(proxyConfig.contains(condition, "testProxySeenA", "testProxySeenB", "testProxySeenC"));
         Assert.assertTrue(proxyConfig.contains(condition, "testProxyUnseen"));
     }
@@ -191,19 +191,19 @@ private static void doTestResourceConfig(ResourceConfiguration resourceConfig) {
         Assert.assertFalse(resourceConfig.anyResourceMatches("seenResource.txt"));
         Assert.assertTrue(resourceConfig.anyResourceMatches("unseenResource.txt"));
 
-        ConfigurationCondition condition = ConfigurationCondition.objectReachable();
+        ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
         Assert.assertFalse(resourceConfig.anyBundleMatches(condition, "seenBundle"));
         Assert.assertTrue(resourceConfig.anyBundleMatches(condition, "unseenBundle"));
     }
 
     private static void doTestSerializationConfig(SerializationConfiguration serializationConfig) {
-        ConfigurationCondition condition = ConfigurationCondition.objectReachable();
+        ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
         Assert.assertFalse(serializationConfig.contains(condition, "seenType", null));
         Assert.assertTrue(serializationConfig.contains(condition, "unseenType", null));
     }
 
     private static ConfigurationType getConfigTypeOrFail(TypeConfiguration typeConfig, String typeName) {
-        ConfigurationType type = typeConfig.get(ConfigurationCondition.objectReachable(), typeName);
+        ConfigurationType type = typeConfig.get(ConfigurationCondition.alwaysTrue(), typeName);
         Assert.assertNotNull(type);
         return type;
     }
@@ -263,11 +263,11 @@ Map<ConfigurationMethod, ConfigurationMemberKind> getMethodsMap(ConfigurationMem
     }
 
     void populateConfig() {
-        ConfigurationType oldType = new ConfigurationType(ConfigurationCondition.objectReachable(), getTypeName());
+        ConfigurationType oldType = new ConfigurationType(ConfigurationCondition.alwaysTrue(), getTypeName());
         setFlags(oldType);
         previousConfig.add(oldType);
 
-        ConfigurationType newType = new ConfigurationType(ConfigurationCondition.objectReachable(), getTypeName());
+        ConfigurationType newType = new ConfigurationType(ConfigurationCondition.alwaysTrue(), getTypeName());
         for (Map.Entry<ConfigurationMethod, ConfigurationMemberKind> methodEntry : methodsThatMustExist.entrySet()) {
             newType.addMethod(methodEntry.getKey().getName(), methodEntry.getKey().getInternalSignature(), methodEntry.getValue());
         }
@@ -298,7 +298,7 @@ String getTypeName() {
 
     void doTest() {
         String name = getTypeName();
-        ConfigurationType configurationType = currentConfig.get(ConfigurationCondition.objectReachable(), name);
+        ConfigurationType configurationType = currentConfig.get(ConfigurationCondition.alwaysTrue(), name);
         if (methodsThatMustExist.size() == 0) {
             Assert.assertNull("Generated configuration type " + name + " exists. Expected it to be cleared as it is empty.", configurationType);
         } else {
diff --git a/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/ResourceConfigurationTest.java b/substratevm/src/com.oracle.svm.configure.test/src/com/oracle/svm/configure/test/config/ResourceConfigurationTest.java
@@ -45,7 +45,7 @@ public class ResourceConfigurationTest {
     @Test
     public void anyResourceMatches() {
         ResourceConfiguration rc = new ResourceConfiguration();
-        ConfigurationCondition defaultCond = ConfigurationCondition.objectReachable();
+        ConfigurationCondition defaultCond = ConfigurationCondition.alwaysTrue();
         rc.addResourcePattern(defaultCond, ".*/Resource.*txt$");
 
         Assert.assertTrue(rc.anyResourceMatches("com/my/app/Resource0.txt"));
@@ -64,7 +64,7 @@ public void anyResourceMatches() {
     @Test
     public void printJson() {
         ResourceConfiguration rc = new ResourceConfiguration();
-        ConfigurationCondition defaultCond = ConfigurationCondition.objectReachable();
+        ConfigurationCondition defaultCond = ConfigurationCondition.alwaysTrue();
         rc.addResourcePattern(defaultCond, ".*/Resource.*txt$");
         rc.ignoreResourcePattern(defaultCond, ".*/Resource2.txt$");
         PipedWriter pw = new PipedWriter();
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ConfigurationConditionPrintable.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ConfigurationConditionPrintable.java
@@ -35,7 +35,7 @@
 
 final class ConfigurationConditionPrintable {
     static void printConditionAttribute(ConfigurationCondition condition, JsonWriter writer) throws IOException {
-        if (!condition.equals(ConfigurationCondition.objectReachable())) {
+        if (!condition.equals(ConfigurationCondition.alwaysTrue())) {
             writer.quote(CONDITIONAL_KEY).append(":{");
             writer.quote(TYPE_REACHABLE_KEY).append(':').quote(condition.getTypeName());
             writer.append("},").newline();
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JniProcessor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JniProcessor.java
@@ -56,7 +56,7 @@ public TypeConfiguration getConfiguration() {
     @Override
     @SuppressWarnings("fallthrough")
     void processEntry(Map<String, ?> entry) {
-        ConfigurationCondition condition = ConfigurationCondition.objectReachable();
+        ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
         boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));
         if (invalidResult) {
             return;
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/ReflectionProcessor.java
@@ -73,7 +73,7 @@ public ResourceConfiguration getResourceConfiguration() {
     @SuppressWarnings("fallthrough")
     public void processEntry(Map<String, ?> entry) {
         boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));
-        ConfigurationCondition condition = ConfigurationCondition.objectReachable();
+        ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
         if (invalidResult) {
             return;
         }
@@ -257,7 +257,7 @@ private void addFullyQualifiedDeclaredMethod(String descriptor) {
         String qualifiedClass = descriptor.substring(0, classend);
         String methodName = descriptor.substring(classend + 1, sigbegin);
         String signature = descriptor.substring(sigbegin);
-        configuration.getOrCreateType(ConfigurationCondition.objectReachable(), qualifiedClass).addMethod(methodName, signature, ConfigurationMemberKind.DECLARED);
+        configuration.getOrCreateType(ConfigurationCondition.alwaysTrue(), qualifiedClass).addMethod(methodName, signature, ConfigurationMemberKind.DECLARED);
     }
 
     private void addDynamicProxy(List<?> interfaceList, LazyValue<String> callerClass) {
@@ -268,7 +268,7 @@ private void addDynamicProxy(List<?> interfaceList, LazyValue<String> callerClas
                 return;
             }
         }
-        proxyConfiguration.add(ConfigurationCondition.objectReachable(), interfaces);
+        proxyConfiguration.add(ConfigurationCondition.alwaysTrue(), interfaces);
     }
 
     private void addDynamicProxyUnchecked(List<?> checkedInterfaceList, List<?> uncheckedInterfaceList, LazyValue<String> callerClass) {
@@ -285,6 +285,6 @@ private void addDynamicProxyUnchecked(List<?> checkedInterfaceList, List<?> unch
         List<String> interfaces = new ArrayList<>();
         interfaces.addAll(checkedInterfaces);
         interfaces.addAll(uncheckedInterfaces);
-        proxyConfiguration.add(ConfigurationCondition.objectReachable(), interfaces);
+        proxyConfiguration.add(ConfigurationCondition.alwaysTrue(), interfaces);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/SerializationProcessor.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/SerializationProcessor.java
@@ -48,7 +48,7 @@ public SerializationConfiguration getSerializationConfiguration() {
     @Override
     void processEntry(Map<String, ?> entry) {
         boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));
-        ConfigurationCondition condition = ConfigurationCondition.objectReachable();
+        ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
         if (invalidResult) {
             return;
         }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ConfigurationParser.java
@@ -156,7 +156,7 @@ protected ConfigurationCondition parseCondition(Map<String, Object> data) {
                 warnOrFail("'" + TYPE_REACHABLE_KEY + "' should be of type string");
             }
         }
-        return ConfigurationCondition.objectReachable();
+        return ConfigurationCondition.alwaysTrue();
     }
 
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ProxyConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ProxyConfigurationParser.java
@@ -64,7 +64,7 @@ private void parseTopLevelArray(List<Object> proxyConfiguration) {
         for (Object proxyConfigurationObject : proxyConfiguration) {
             if (proxyConfigurationObject instanceof List) {
                 foundInterfaceLists = true;
-                parseInterfaceList(ConfigurationCondition.objectReachable(), asList(proxyConfigurationObject, "<shouldn't reach here>"));
+                parseInterfaceList(ConfigurationCondition.alwaysTrue(), asList(proxyConfigurationObject, "<shouldn't reach here>"));
             } else if (proxyConfigurationObject instanceof Map) {
                 foundProxyConfigurationObjects = true;
                 parseWithConditionalConfig(asMap(proxyConfigurationObject, "<shouldn't reach here>"));
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParser.java
@@ -228,7 +228,7 @@ private List<T> parseMethodParameters(T clazz, String methodName, List<Object> t
         List<T> result = new ArrayList<>();
         for (Object type : types) {
             String typeName = asString(type, "types");
-            TypeResult<T> typeResult = delegate.resolveType(ConfigurationCondition.objectReachable(), typeName);
+            TypeResult<T> typeResult = delegate.resolveType(ConfigurationCondition.alwaysTrue(), typeName);
             if (!typeResult.isPresent()) {
                 handleError("Could not register method " + formatMethod(clazz, methodName) + " for reflection.", typeResult.getException());
                 return null;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/localization/LocalizationSupport.java
@@ -92,7 +92,7 @@ public Map<String, Object> getBundleContentOf(Object bundle) {
     public void prepareBundle(String bundleName, ResourceBundle bundle, Locale locale) {
         if (bundle instanceof PropertyResourceBundle) {
             String withLocale = control.toBundleName(bundleName, locale);
-            ImageSingletons.lookup(ResourcesRegistry.class).addResources(ConfigurationCondition.objectReachable(), withLocale.replace('.', '/') + "\\.properties");
+            ImageSingletons.lookup(ResourcesRegistry.class).addResources(ConfigurationCondition.alwaysTrue(), withLocale.replace('.', '/') + "\\.properties");
         } else {
             RuntimeReflection.register(bundle.getClass());
             RuntimeReflection.registerForReflectiveInstantiation(bundle.getClass());
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIRuntimeAccess.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/JNIRuntimeAccess.java
@@ -49,19 +49,19 @@ private JNIRuntimeAccess() {
     }
 
     public static void register(Class<?>... classes) {
-        getSupport().register(ConfigurationCondition.objectReachable(), classes);
+        getSupport().register(ConfigurationCondition.alwaysTrue(), classes);
     }
 
     public static void register(Executable... methods) {
-        getSupport().register(ConfigurationCondition.objectReachable(), methods);
+        getSupport().register(ConfigurationCondition.alwaysTrue(), methods);
     }
 
     public static void register(Field... fields) {
         register(false, fields);
     }
 
     public static void register(boolean finalIsWritable, Field... fields) {
-        getSupport().register(ConfigurationCondition.objectReachable(), finalIsWritable, fields);
+        getSupport().register(ConfigurationCondition.alwaysTrue(), finalIsWritable, fields);
     }
 
     private static JNIRuntimeAccessibilitySupport getSupport() {
diff --git a/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java
@@ -339,7 +339,7 @@ UserException error(String format, Object... args) {
     private static void registerJNIConfiguration(JNIRuntimeAccess.JNIRuntimeAccessibilitySupport registry, ImageClassLoader loader) {
         try (JNIConfigSource source = new JNIConfigSource(loader)) {
             Map<String, Class<?>> classes = new HashMap<>();
-            ConfigurationCondition condition = ConfigurationCondition.objectReachable();
+            ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();
             for (String line : source.lines) {
                 source.lineNo++;
                 String[] tokens = line.split(" ");
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ConditionalConfigurationRegistry.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ConditionalConfigurationRegistry.java
@@ -38,7 +38,7 @@ public abstract class ConditionalConfigurationRegistry {
     private final Map<String, List<Runnable>> pendingReachabilityHandlers = new ConcurrentHashMap<>();
 
     protected void registerConditionalConfiguration(ConfigurationCondition condition, Runnable runnable) {
-        if (ConfigurationCondition.objectReachable().equals(condition)) {
+        if (ConfigurationCondition.alwaysTrue().equals(condition)) {
             /* analysis optimization to include new types as early as possible */
             runnable.run();
         } else {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAwt.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAwt.java
@@ -176,33 +176,33 @@ private static void registerFreeType(DuringAnalysisAccess access) {
 
     private static void registerColorProfiles(DuringAnalysisAccess duringAnalysisAccess) {
         ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-        resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "sun.java2d.cmm.profiles.*");
+        resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "sun.java2d.cmm.profiles.*");
     }
 
     private static void registerFlavorMapProps(DuringAnalysisAccess duringAnalysisAccess) {
         ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-        resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "sun.datatransfer.resources.flavormap.properties");
+        resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "sun.datatransfer.resources.flavormap.properties");
     }
 
     private static void registerRTFReaderCharsets(DuringAnalysisAccess duringAnalysisAccess) {
         ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-        resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "javax.swing.text.rtf.charsets.*");
+        resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "javax.swing.text.rtf.charsets.*");
     }
 
     private static void registerOceanThemeIcons(DuringAnalysisAccess duringAnalysisAccess) {
         ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-        resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "javax.swing.plaf.metal.icons.*");
-        resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "javax.swing.plaf.basic.icons.*");
+        resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "javax.swing.plaf.metal.icons.*");
+        resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "javax.swing.plaf.basic.icons.*");
     }
 
     private static void registerHtml32bdtd(DuringAnalysisAccess duringAnalysisAccess) {
         ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-        resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "javax.swing.text.html.parser.html32.bdtd");
+        resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "javax.swing.text.html.parser.html32.bdtd");
     }
 
     private static void registerDefaultCSS(DuringAnalysisAccess duringAnalysisAccess) {
         ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-        resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "javax.swing.text.html.default.css");
+        resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "javax.swing.text.html.default.css");
     }
 
     private static NativeLibraries getNativeLibraries(DuringAnalysisAccess access) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/xml/XMLParsersRegistration.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/xml/XMLParsersRegistration.java
@@ -115,9 +115,9 @@ void registerResources() {
             classInitializationSupport.setConfigurationSealed(false);
 
             ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
-            resourcesRegistry.addResourceBundles(ConfigurationCondition.objectReachable(), "com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages");
-            resourcesRegistry.addResourceBundles(ConfigurationCondition.objectReachable(), "com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMessages");
-            resourcesRegistry.addResources(ConfigurationCondition.objectReachable(), "com.sun.*.properties");
+            resourcesRegistry.addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xml.internal.serializer.utils.SerializerMessages");
+            resourcesRegistry.addResourceBundles(ConfigurationCondition.alwaysTrue(), "com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMessages");
+            resourcesRegistry.addResources(ConfigurationCondition.alwaysTrue(), "com.sun.*.properties");
 
             classInitializationSupport.setConfigurationSealed(true);
         }
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

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public final class ConfigurationCondition implements Comparable<ConfigurationCon`
`46`	`46`	`private final String typeName;`
`47`	`47`	`private static final ConfigurationCondition OBJECT_REACHABLE = new ConfigurationCondition(Object.class.getTypeName());`
`48`	`48`
`49`		`- public static ConfigurationCondition objectReachable() {`
	`49`	`+ public static ConfigurationCondition alwaysTrue() {`
`50`	`50`	`return OBJECT_REACHABLE;`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public ResourceConfiguration getResourceConfiguration() {`
`73`	`73`	`@SuppressWarnings("fallthrough")`
`74`	`74`	`public void processEntry(Map<String, ?> entry) {`
`75`	`75`	`boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));`
`76`		`- ConfigurationCondition condition = ConfigurationCondition.objectReachable();`
	`76`	`+ ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();`
`77`	`77`	`if (invalidResult) {`
`78`	`78`	`return;`
`79`	`79`	`}`
`@@ -257,7 +257,7 @@ private void addFullyQualifiedDeclaredMethod(String descriptor) {`
`257`	`257`	`String qualifiedClass = descriptor.substring(0, classend);`
`258`	`258`	`String methodName = descriptor.substring(classend + 1, sigbegin);`
`259`	`259`	`String signature = descriptor.substring(sigbegin);`
`260`		`- configuration.getOrCreateType(ConfigurationCondition.objectReachable(), qualifiedClass).addMethod(methodName, signature, ConfigurationMemberKind.DECLARED);`
	`260`	`+ configuration.getOrCreateType(ConfigurationCondition.alwaysTrue(), qualifiedClass).addMethod(methodName, signature, ConfigurationMemberKind.DECLARED);`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`private void addDynamicProxy(List<?> interfaceList, LazyValue<String> callerClass) {`
`@@ -268,7 +268,7 @@ private void addDynamicProxy(List<?> interfaceList, LazyValue<String> callerClas`
`268`	`268`	`return;`
`269`	`269`	`}`
`270`	`270`	`}`
`271`		`- proxyConfiguration.add(ConfigurationCondition.objectReachable(), interfaces);`
	`271`	`+ proxyConfiguration.add(ConfigurationCondition.alwaysTrue(), interfaces);`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`private void addDynamicProxyUnchecked(List<?> checkedInterfaceList, List<?> uncheckedInterfaceList, LazyValue<String> callerClass) {`
`@@ -285,6 +285,6 @@ private void addDynamicProxyUnchecked(List<?> checkedInterfaceList, List<?> unch`
`285`	`285`	`List<String> interfaces = new ArrayList<>();`
`286`	`286`	`interfaces.addAll(checkedInterfaces);`
`287`	`287`	`interfaces.addAll(uncheckedInterfaces);`
`288`		`- proxyConfiguration.add(ConfigurationCondition.objectReachable(), interfaces);`
	`288`	`+ proxyConfiguration.add(ConfigurationCondition.alwaysTrue(), interfaces);`
`289`	`289`	`}`
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public SerializationConfiguration getSerializationConfiguration() {`
`48`	`48`	`@Override`
`49`	`49`	`void processEntry(Map<String, ?> entry) {`
`50`	`50`	`boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));`
`51`		`- ConfigurationCondition condition = ConfigurationCondition.objectReachable();`
	`51`	`+ ConfigurationCondition condition = ConfigurationCondition.alwaysTrue();`
`52`	`52`	`if (invalidResult) {`
`53`	`53`	`return;`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ protected ConfigurationCondition parseCondition(Map<String, Object> data) {`
`156`	`156`	`warnOrFail("'" + TYPE_REACHABLE_KEY + "' should be of type string");`
`157`	`157`	`}`
`158`	`158`	`}`
`159`		`- return ConfigurationCondition.objectReachable();`
	`159`	`+ return ConfigurationCondition.alwaysTrue();`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`}`