Predicated serialization configuration

vjovanov · vjovanov · commit 70044a1fcca3 · 2021-09-08T12:03:13.000+02:00
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
@@ -43,6 +43,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
 import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
 
 /**
@@ -60,7 +61,7 @@ public final class RuntimeSerialization {
      * @since 21.3
      */
     public static void register(Class<?>... classes) {
-        ImageSingletons.lookup(RuntimeSerializationSupport.class).register(classes);
+        ImageSingletons.lookup(RuntimeSerializationSupport.class).register(ConfigurationPredicate.objectPredicate(), classes);
     }
 
     /**
@@ -75,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(clazz, customTargetConstructorClazz);
+        ImageSingletons.lookup(RuntimeSerializationSupport.class).registerWithTargetConstructorClass(ConfigurationPredicate.objectPredicate(), clazz, customTargetConstructorClazz);
     }
 
     private RuntimeSerialization() {
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationPredicate.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ConfigurationPredicate.java
@@ -42,7 +42,7 @@
 
 import java.util.Objects;
 
-public final class ConfigurationPredicate {
+public final class ConfigurationPredicate implements Comparable<ConfigurationPredicate> {
     private final String typeName;
     private static final ConfigurationPredicate OBJECT_PREDICATE = new ConfigurationPredicate(Object.class.getTypeName());
 
@@ -51,6 +51,7 @@ public static ConfigurationPredicate objectPredicate() {
     }
 
     public static ConfigurationPredicate create(String typeReachability) {
+        Objects.requireNonNull(typeReachability);
         if (OBJECT_PREDICATE.typeName.equals(typeReachability)) {
             return OBJECT_PREDICATE;
         }
@@ -82,4 +83,8 @@ public int hashCode() {
         return Objects.hash(typeName);
     }
 
+    @Override
+    public int compareTo(ConfigurationPredicate o) {
+        return this.typeName.compareTo(o.typeName);
+    }
 }
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeSerializationSupport.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/RuntimeSerializationSupport.java
@@ -42,9 +42,10 @@
 
 public interface RuntimeSerializationSupport {
 
-    void register(Class<?>... classes);
+    void register(ConfigurationPredicate predicate, Class<?>... classes);
 
-    void registerWithTargetConstructorClass(Class<?> clazz, Class<?> customTargetConstructorClazz);
+    void registerWithTargetConstructorClass(ConfigurationPredicate predicate, Class<?> clazz, Class<?> customTargetConstructorClazz);
+
+    void registerWithTargetConstructorClass(ConfigurationPredicate predicate, String className, String customTargetConstructorClassName);
 
-    void registerWithTargetConstructorClass(String className, String customTargetConstructorClassName);
 }
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
@@ -195,8 +195,9 @@ private static void doTestResourceConfig(ResourceConfiguration resourceConfig) {
     }
 
     private static void doTestSerializationConfig(SerializationConfiguration serializationConfig) {
-        Assert.assertFalse(serializationConfig.contains("seenType", null));
-        Assert.assertTrue(serializationConfig.contains("unseenType", null));
+        ConfigurationPredicate predicate = ConfigurationPredicate.objectPredicate();
+        Assert.assertFalse(serializationConfig.contains(predicate, "seenType", null));
+        Assert.assertTrue(serializationConfig.contains(predicate, "unseenType", null));
     }
 
     private static ConfigurationType getConfigTypeOrFail(TypeConfiguration typeConfig, String typeName) {
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ConfigurationPredicatePrintable.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ConfigurationPredicatePrintable.java
@@ -24,6 +24,9 @@
  */
 package com.oracle.svm.configure.config;
 
+import static com.oracle.svm.core.configure.ConfigurationParser.PREDICATE_KEY;
+import static com.oracle.svm.core.configure.ConfigurationParser.TYPE_REACHABLE_KEY;
+
 import java.io.IOException;
 
 import org.graalvm.nativeimage.impl.ConfigurationPredicate;
@@ -33,8 +36,8 @@
 final class ConfigurationPredicatePrintable {
     static void printPredicateAttribute(ConfigurationPredicate predicate, JsonWriter writer) throws IOException {
         if (!predicate.equals(ConfigurationPredicate.objectPredicate())) {
-            writer.append("\"predicate\":{");
-            writer.append("\"whenTypeReachable\":").quote(predicate.getTypeName());
+            writer.quote(PREDICATE_KEY).append(":{");
+            writer.quote(TYPE_REACHABLE_KEY).append(':').quote(predicate.getTypeName());
             writer.append("},").newline();
         }
     }
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfiguration.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfiguration.java
@@ -32,9 +32,11 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
+import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
+
 import com.oracle.svm.configure.ConfigurationBase;
 import com.oracle.svm.configure.json.JsonWriter;
-import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
 
 public class SerializationConfiguration implements ConfigurationBase, RuntimeSerializationSupport {
 
@@ -51,8 +53,8 @@ public void removeAll(SerializationConfiguration other) {
         serializations.removeAll(other.serializations);
     }
 
-    public boolean contains(String serializationTargetClass, String customTargetConstructorClass) {
-        return serializations.contains(createConfigurationType(serializationTargetClass, customTargetConstructorClass));
+    public boolean contains(ConfigurationPredicate predicate, String serializationTargetClass, String customTargetConstructorClass) {
+        return serializations.contains(createConfigurationType(predicate, serializationTargetClass, customTargetConstructorClass));
     }
 
     @Override
@@ -71,30 +73,30 @@ public void printJson(JsonWriter writer) throws IOException {
     }
 
     @Override
-    public void register(Class<?>... classes) {
+    public void register(ConfigurationPredicate predicate, Class<?>... classes) {
         for (Class<?> clazz : classes) {
-            registerWithTargetConstructorClass(clazz, null);
+            registerWithTargetConstructorClass(predicate, clazz, null);
         }
     }
 
     @Override
-    public void registerWithTargetConstructorClass(Class<?> clazz, Class<?> customTargetConstructorClazz) {
-        registerWithTargetConstructorClass(clazz.getName(), customTargetConstructorClazz == null ? null : customTargetConstructorClazz.getName());
+    public void registerWithTargetConstructorClass(ConfigurationPredicate predicate, Class<?> clazz, Class<?> customTargetConstructorClazz) {
+        registerWithTargetConstructorClass(predicate, clazz.getName(), customTargetConstructorClazz == null ? null : customTargetConstructorClazz.getName());
     }
 
     @Override
-    public void registerWithTargetConstructorClass(String className, String customTargetConstructorClassName) {
-        serializations.add(createConfigurationType(className, customTargetConstructorClassName));
+    public void registerWithTargetConstructorClass(ConfigurationPredicate predicate, String className, String customTargetConstructorClassName) {
+        serializations.add(createConfigurationType(predicate, className, customTargetConstructorClassName));
     }
 
     @Override
     public boolean isEmpty() {
         return serializations.isEmpty();
     }
 
-    private static SerializationConfigurationType createConfigurationType(String className, String customTargetConstructorClassName) {
+    private static SerializationConfigurationType createConfigurationType(ConfigurationPredicate predicate, String className, String customTargetConstructorClassName) {
         String convertedClassName = SignatureUtil.toInternalClassName(className);
         String convertedCustomTargetConstructorClassName = customTargetConstructorClassName == null ? null : SignatureUtil.toInternalClassName(customTargetConstructorClassName);
-        return new SerializationConfigurationType(convertedClassName, convertedCustomTargetConstructorClassName);
+        return new SerializationConfigurationType(predicate, convertedClassName, convertedCustomTargetConstructorClassName);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfigurationType.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfigurationType.java
@@ -24,39 +24,37 @@
  */
 package com.oracle.svm.configure.config;
 
-import com.oracle.svm.configure.json.JsonPrintable;
-import com.oracle.svm.configure.json.JsonWriter;
-import com.oracle.svm.core.configure.SerializationConfigurationParser;
-
 import java.io.IOException;
 import java.util.Comparator;
 import java.util.Objects;
 
-public class SerializationConfigurationType implements JsonPrintable, Comparable<SerializationConfigurationType> {
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
 
+import com.oracle.svm.configure.json.JsonPrintable;
+import com.oracle.svm.configure.json.JsonWriter;
+import com.oracle.svm.core.configure.SerializationConfigurationParser;
+
+public class SerializationConfigurationType implements JsonPrintable, Comparable<SerializationConfigurationType> {
+    private final ConfigurationPredicate predicate;
     private final String qualifiedJavaName;
     private final String qualifiedCustomTargetConstructorJavaName;
 
-    public SerializationConfigurationType(String qualifiedJavaName, String qualifiedCustomTargetConstructorJavaName) {
+    public SerializationConfigurationType(ConfigurationPredicate predicate, String qualifiedJavaName, String qualifiedCustomTargetConstructorJavaName) {
         assert qualifiedJavaName.indexOf('/') == -1 : "Requires qualified Java name, not internal representation";
         assert !qualifiedJavaName.startsWith("[") : "Requires Java source array syntax, for example java.lang.String[]";
         assert qualifiedCustomTargetConstructorJavaName == null || qualifiedCustomTargetConstructorJavaName.indexOf('/') == -1 : "Requires qualified Java name, not internal representation";
         assert qualifiedCustomTargetConstructorJavaName == null || !qualifiedCustomTargetConstructorJavaName.startsWith("[") : "Requires Java source array syntax, for example java.lang.String[]";
+        Objects.requireNonNull(predicate);
+        this.predicate = predicate;
+        Objects.requireNonNull(qualifiedJavaName);
         this.qualifiedJavaName = qualifiedJavaName;
         this.qualifiedCustomTargetConstructorJavaName = qualifiedCustomTargetConstructorJavaName;
     }
 
-    public String getQualifiedJavaName() {
-        return qualifiedJavaName;
-    }
-
-    public String getQualifiedCustomTargetConstructorJavaName() {
-        return qualifiedCustomTargetConstructorJavaName;
-    }
-
     @Override
     public void printJson(JsonWriter writer) throws IOException {
         writer.append('{').indent().newline();
+        ConfigurationPredicatePrintable.printPredicateAttribute(predicate, writer);
         writer.quote(SerializationConfigurationParser.NAME_KEY).append(':').quote(qualifiedJavaName);
         if (qualifiedCustomTargetConstructorJavaName != null) {
             writer.append(',').newline();
@@ -75,13 +73,14 @@ public boolean equals(Object o) {
             return false;
         }
         SerializationConfigurationType that = (SerializationConfigurationType) o;
-        return Objects.equals(qualifiedJavaName, that.qualifiedJavaName) &&
+        return predicate.equals(that.predicate) &&
+                        qualifiedJavaName.equals(that.qualifiedJavaName) &&
                         Objects.equals(qualifiedCustomTargetConstructorJavaName, that.qualifiedCustomTargetConstructorJavaName);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(qualifiedJavaName, qualifiedCustomTargetConstructorJavaName);
+        return Objects.hash(predicate, qualifiedJavaName, qualifiedCustomTargetConstructorJavaName);
     }
 
     @Override
@@ -90,6 +89,10 @@ public int compareTo(SerializationConfigurationType other) {
         if (compareName != 0) {
             return compareName;
         }
+        int comparePredicate = predicate.compareTo(other.predicate);
+        if (comparePredicate != 0) {
+            return comparePredicate;
+        }
         Comparator<String> nullsFirstCompare = Comparator.nullsFirst(Comparator.naturalOrder());
         return nullsFirstCompare.compare(qualifiedCustomTargetConstructorJavaName, other.qualifiedCustomTargetConstructorJavaName);
     }
diff --git a/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/TypeConfiguration.java b/substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/TypeConfiguration.java
@@ -83,7 +83,7 @@ public ConfigurationType getOrCreateType(ConfigurationPredicate predicate, Strin
     @Override
     public void printJson(JsonWriter writer) throws IOException {
         List<ConfigurationType> typesList = new ArrayList<>(this.types.values());
-        typesList.sort(Comparator.comparing(ConfigurationType::getQualifiedJavaName));
+        typesList.sort(Comparator.comparing(ConfigurationType::getQualifiedJavaName).thenComparing(ConfigurationType::getPredicate));
 
         writer.append('[');
         String prefix = "";
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
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
+
 import com.oracle.svm.configure.config.SerializationConfiguration;
 
 public class SerializationProcessor extends AbstractProcessor {
@@ -46,6 +48,7 @@ public SerializationConfiguration getSerializationConfiguration() {
     @Override
     void processEntry(Map<String, ?> entry) {
         boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));
+        ConfigurationPredicate predicate = ConfigurationPredicate.objectPredicate();
         if (invalidResult) {
             return;
         }
@@ -58,7 +61,7 @@ void processEntry(Map<String, ?> entry) {
                 return;
             }
 
-            serializationConfiguration.registerWithTargetConstructorClass((String) args.get(0), (String) args.get(1));
+            serializationConfiguration.registerWithTargetConstructorClass(predicate, (String) args.get(0), (String) args.get(1));
         }
     }
 }
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
@@ -36,9 +36,13 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
+
 import com.oracle.svm.core.util.json.JSONParserException;
 
 public abstract class ConfigurationParser {
+    public static final String PREDICATE_KEY = "predicate";
+    public static final String TYPE_REACHABLE_KEY = "whenTypeReachable";
     private final Map<String, Set<String>> seenUnknownAttributesByType = new HashMap<>();
     private final boolean strictConfiguration;
 
@@ -97,7 +101,7 @@ protected void warnOrFail(String message) {
             throw new JSONParserException(message);
         } else {
             // Checkstyle: stop
-            System.err.println("WARNING: " + message);
+            System.err.println("Warning: " + message);
             // Checkstyle: resume
         }
     }
@@ -140,4 +144,19 @@ protected static long asLong(Object value, String propertyName) {
         }
         throw new JSONParserException("Invalid long value '" + value + "' for element '" + propertyName + "'");
     }
+
+    protected ConfigurationPredicate parsePredicate(Map<String, Object> data) {
+        Object predicateData = data.get(PREDICATE_KEY);
+        if (predicateData != null) {
+            Map<String, Object> predicateObject = asMap(predicateData, "Attribute 'predicate' must be an object");
+            Object predicateType = predicateObject.get(TYPE_REACHABLE_KEY);
+            if (predicateType instanceof String) {
+                return ConfigurationPredicate.create((String) predicateType);
+            } else {
+                warnOrFail("'" + TYPE_REACHABLE_KEY + "' should be of type string");
+            }
+        }
+        return ConfigurationPredicate.objectPredicate();
+    }
+
 }
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
@@ -52,7 +52,7 @@ public final class ReflectionConfigurationParser<T> extends ConfigurationParser
     private final boolean allowIncompleteClasspath;
     private static final List<String> OPTIONAL_REFLECT_CONFIG_OBJECT_ATTRS = Arrays.asList("allDeclaredConstructors", "allPublicConstructors",
                     "allDeclaredMethods", "allPublicMethods", "allDeclaredFields", "allPublicFields",
-                    "allDeclaredClasses", "allPublicClasses", "methods", "fields", "predicate");
+                    "allDeclaredClasses", "allPublicClasses", "methods", "fields", PREDICATE_KEY);
 
     public ReflectionConfigurationParser(ReflectionConfigurationParserDelegate<T> delegate) {
         this(delegate, false, true);
@@ -82,22 +82,12 @@ private void parseClass(Map<String, Object> data) {
 
         Object classObject = data.get("name");
         String className = asString(classObject, "name");
-        ConfigurationPredicate predicate = ConfigurationPredicate.objectPredicate();
-        Object predicateData = data.get("predicate");
-        if (predicateData != null) {
-            Map<String, Object> predicateObject = asMap(predicateData, "Attribute 'predicate' must be an object");
-            Object predicateType = predicateObject.get("whenTypeReachable");
-            if (predicateType instanceof String) {
-                TypeResult<ConfigurationPredicate> predicateResult = delegate.resolvePredicate((String) predicateType);
-                if (!predicateResult.isPresent()) {
-                    handleError("Could not resolve predicate " + predicateType + " for reflection configuration.", predicateResult.getException());
-                    return;
-                }
-                predicate = predicateResult.get();
-            } else {
-                warnOrFail("'whenTypeReachable' should be of type string");
-            }
+
+        TypeResult<ConfigurationPredicate> predicateResult = delegate.resolvePredicate(parsePredicate(data).getTypeName());
+        if (!predicateResult.isPresent()) {
+            handleError("Could not resolve predicate " + parsePredicate(data).getTypeName() + " for reflection.", predicateResult.getException());
         }
+        ConfigurationPredicate predicate = predicateResult.get();
 
         TypeResult<T> result = delegate.resolveType(predicate, className);
         if (!result.isPresent()) {
@@ -275,10 +265,10 @@ private void handleError(String msg, Throwable cause) {
         if (cause != null) {
             message += " Reason: " + formatError(cause) + '.';
         }
-        if (this.allowIncompleteClasspath) {
-            System.out.println("Warning: " + message);
+        if (allowIncompleteClasspath) {
+            System.err.println("Warning: " + message);
         } else {
-            throw new JSONParserException(message + " To allow unresolvable reflection configuration, use option -H:+AllowIncompleteClasspath");
+            throw new JSONParserException(message + " To allow unresolvable reflection configuration, use option --allow-incomplete-classpath");
         }
         // Checkstyle: resume
     }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationConfigurationParser.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/SerializationConfigurationParser.java
@@ -27,9 +27,11 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Map;
 
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
 import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;
 
 import com.oracle.svm.core.util.json.JSONParser;
@@ -56,10 +58,12 @@ public void parseAndRegister(Reader reader) throws IOException {
     }
 
     private void parseSerializationDescriptorObject(Map<String, Object> data) {
-        checkAttributes(data, "serialization descriptor object", Collections.singleton(NAME_KEY), Collections.singleton(CUSTOM_TARGET_CONSTRUCTOR_CLASS_KEY));
+        checkAttributes(data, "serialization descriptor object", Collections.singleton(NAME_KEY), Arrays.asList(CUSTOM_TARGET_CONSTRUCTOR_CLASS_KEY, PREDICATE_KEY));
+        ConfigurationPredicate unresolvedPredicate = parsePredicate(data);
         String targetSerializationClass = asString(data.get(NAME_KEY));
         Object optionalCustomCtorValue = data.get(CUSTOM_TARGET_CONSTRUCTOR_CLASS_KEY);
         String customTargetConstructorClass = optionalCustomCtorValue != null ? asString(optionalCustomCtorValue) : null;
-        serializationSupport.registerWithTargetConstructorClass(targetSerializationClass, customTargetConstructorClass);
+
+        serializationSupport.registerWithTargetConstructorClass(unresolvedPredicate, targetSerializationClass, customTargetConstructorClass);
     }
 }
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/doc-files/SerializationConfigurationFilesHelp.txt b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/doc-files/SerializationConfigurationFilesHelp.txt
diff --git a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionDataBuilder.java b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/hosted/ReflectionDataBuilder.java
diff --git a/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/serialize/hosted/SerializationFeature.java b/substratevm/src/com.oracle.svm.reflect/src/com/oracle/svm/reflect/serialize/hosted/SerializationFeature.java

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`
`43`	`43`	`import java.util.Objects;`
`44`	`44`
`45`		`-public final class ConfigurationPredicate {`
	`45`	`+public final class ConfigurationPredicate implements Comparable<ConfigurationPredicate> {`
`46`	`46`	`private final String typeName;`
`47`	`47`	`private static final ConfigurationPredicate OBJECT_PREDICATE = new ConfigurationPredicate(Object.class.getTypeName());`
`48`	`48`
`@@ -51,6 +51,7 @@ public static ConfigurationPredicate objectPredicate() {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public static ConfigurationPredicate create(String typeReachability) {`
	`54`	`+ Objects.requireNonNull(typeReachability);`
`54`	`55`	`if (OBJECT_PREDICATE.typeName.equals(typeReachability)) {`
`55`	`56`	`return OBJECT_PREDICATE;`
`56`	`57`	`}`
`@@ -82,4 +83,8 @@ public int hashCode() {`
`82`	`83`	`return Objects.hash(typeName);`
`83`	`84`	`}`
`84`	`85`
	`86`	`+ @Override`
	`87`	`+ public int compareTo(ConfigurationPredicate o) {`
	`88`	`+ return this.typeName.compareTo(o.typeName);`
	`89`	`+ }`
`85`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,9 @@ private static void doTestResourceConfig(ResourceConfiguration resourceConfig) {`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`private static void doTestSerializationConfig(SerializationConfiguration serializationConfig) {`
`198`		`- Assert.assertFalse(serializationConfig.contains("seenType", null));`
`199`		`- Assert.assertTrue(serializationConfig.contains("unseenType", null));`
	`198`	`+ ConfigurationPredicate predicate = ConfigurationPredicate.objectPredicate();`
	`199`	`+ Assert.assertFalse(serializationConfig.contains(predicate, "seenType", null));`
	`200`	`+ Assert.assertTrue(serializationConfig.contains(predicate, "unseenType", null));`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`private static ConfigurationType getConfigTypeOrFail(TypeConfiguration typeConfig, String typeName) {`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,11 @@`
`32`	`32`	`import java.util.Set;`
`33`	`33`	`import java.util.concurrent.ConcurrentHashMap;`
`34`	`34`
	`35`	`+import org.graalvm.nativeimage.impl.ConfigurationPredicate;`
	`36`	`+import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;`
	`37`	`+`
`35`	`38`	`import com.oracle.svm.configure.ConfigurationBase;`
`36`	`39`	`import com.oracle.svm.configure.json.JsonWriter;`
`37`		`-import org.graalvm.nativeimage.impl.RuntimeSerializationSupport;`
`38`	`40`
`39`	`41`	`public class SerializationConfiguration implements ConfigurationBase, RuntimeSerializationSupport {`
`40`	`42`
`@@ -51,8 +53,8 @@ public void removeAll(SerializationConfiguration other) {`
`51`	`53`	`serializations.removeAll(other.serializations);`
`52`	`54`	`}`
`53`	`55`
`54`		`- public boolean contains(String serializationTargetClass, String customTargetConstructorClass) {`
`55`		`- return serializations.contains(createConfigurationType(serializationTargetClass, customTargetConstructorClass));`
	`56`	`+ public boolean contains(ConfigurationPredicate predicate, String serializationTargetClass, String customTargetConstructorClass) {`
	`57`	`+ return serializations.contains(createConfigurationType(predicate, serializationTargetClass, customTargetConstructorClass));`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`@Override`
`@@ -71,30 +73,30 @@ public void printJson(JsonWriter writer) throws IOException {`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`@Override`
`74`		`- public void register(Class<?>... classes) {`
	`76`	`+ public void register(ConfigurationPredicate predicate, Class<?>... classes) {`
`75`	`77`	`for (Class<?> clazz : classes) {`
`76`		`- registerWithTargetConstructorClass(clazz, null);`
	`78`	`+ registerWithTargetConstructorClass(predicate, clazz, null);`
`77`	`79`	`}`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`@Override`
`81`		`- public void registerWithTargetConstructorClass(Class<?> clazz, Class<?> customTargetConstructorClazz) {`
`82`		`- registerWithTargetConstructorClass(clazz.getName(), customTargetConstructorClazz == null ? null : customTargetConstructorClazz.getName());`
	`83`	`+ public void registerWithTargetConstructorClass(ConfigurationPredicate predicate, Class<?> clazz, Class<?> customTargetConstructorClazz) {`
	`84`	`+ registerWithTargetConstructorClass(predicate, clazz.getName(), customTargetConstructorClazz == null ? null : customTargetConstructorClazz.getName());`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`@Override`
`86`		`- public void registerWithTargetConstructorClass(String className, String customTargetConstructorClassName) {`
`87`		`- serializations.add(createConfigurationType(className, customTargetConstructorClassName));`
	`88`	`+ public void registerWithTargetConstructorClass(ConfigurationPredicate predicate, String className, String customTargetConstructorClassName) {`
	`89`	`+ serializations.add(createConfigurationType(predicate, className, customTargetConstructorClassName));`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`@Override`
`91`	`93`	`public boolean isEmpty() {`
`92`	`94`	`return serializations.isEmpty();`
`93`	`95`	`}`
`94`	`96`
`95`		`- private static SerializationConfigurationType createConfigurationType(String className, String customTargetConstructorClassName) {`
	`97`	`+ private static SerializationConfigurationType createConfigurationType(ConfigurationPredicate predicate, String className, String customTargetConstructorClassName) {`
`96`	`98`	`String convertedClassName = SignatureUtil.toInternalClassName(className);`
`97`	`99`	`String convertedCustomTargetConstructorClassName = customTargetConstructorClassName == null ? null : SignatureUtil.toInternalClassName(customTargetConstructorClassName);`
`98`		`- return new SerializationConfigurationType(convertedClassName, convertedCustomTargetConstructorClassName);`
	`100`	`+ return new SerializationConfigurationType(predicate, convertedClassName, convertedCustomTargetConstructorClassName);`
`99`	`101`	`}`
`100`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@`
`28`	`28`	`import java.util.List;`
`29`	`29`	`import java.util.Map;`
`30`	`30`
	`31`	`+import org.graalvm.nativeimage.impl.ConfigurationPredicate;`
	`32`	`+`
`31`	`33`	`import com.oracle.svm.configure.config.SerializationConfiguration;`
`32`	`34`
`33`	`35`	`public class SerializationProcessor extends AbstractProcessor {`
`@@ -46,6 +48,7 @@ public SerializationConfiguration getSerializationConfiguration() {`
`46`	`48`	`@Override`
`47`	`49`	`void processEntry(Map<String, ?> entry) {`
`48`	`50`	`boolean invalidResult = Boolean.FALSE.equals(entry.get("result"));`
	`51`	`+ ConfigurationPredicate predicate = ConfigurationPredicate.objectPredicate();`
`49`	`52`	`if (invalidResult) {`
`50`	`53`	`return;`
`51`	`54`	`}`
`@@ -58,7 +61,7 @@ void processEntry(Map<String, ?> entry) {`
`58`	`61`	`return;`
`59`	`62`	`}`
`60`	`63`
`61`		`- serializationConfiguration.registerWithTargetConstructorClass((String) args.get(0), (String) args.get(1));`
	`64`	`+ serializationConfiguration.registerWithTargetConstructorClass(predicate, (String) args.get(0), (String) args.get(1));`
`62`	`65`	`}`
`63`	`66`	`}`
`64`	`67`	`}`