Parse the predicate in JSON

Author: vjovanov

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

@@ -25,7 +25,6 @@
 package com.oracle.svm.configure.config;
 
 import java.util.List;
-import java.util.Map;
 
 import com.oracle.svm.core.TypeResult;
 import org.graalvm.nativeimage.impl.ConfigurationPredicate;
@@ -40,17 +39,12 @@ public ParserConfigurationAdapter(TypeConfiguration configuration) {
     }
 
     @Override
-    public TypeResult<ConfigurationType> resolveTypeResult(String typeName) {
-        ConfigurationType type = configuration.get(ConfigurationPredicate.DEFAULT_CONFIGRATION_PREDICATE, typeName);
+    public TypeResult<ConfigurationType> resolveTypeResult(ConfigurationPredicate predicate, String typeName) {
+        ConfigurationType type = configuration.get(predicate, typeName);
         ConfigurationType result = type != null ? type : new ConfigurationType(typeName);
         return TypeResult.forType(typeName, result);
     }
 
-    @Override
-    public ConfigurationPredicate resolvePredicate(Map<String, Object> predicate) {
-        return ConfigurationPredicate.DEFAULT_CONFIGRATION_PREDICATE;
-    }
-
     @Override
     public void registerType(ConfigurationPredicate predicate, ConfigurationType type) {
         configuration.add(predicate, type);

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

@@ -95,7 +95,10 @@ public ConfigurationType getOrCreateType(String qualifiedForNameString) {
             }
             s = sb.toString();
         }
-        return types.computeIfAbsent(Pair.create(ConfigurationPredicate.DEFAULT_CONFIGRATION_PREDICATE, s), p -> new ConfigurationType(p.getRight()));
+
+        // the agent unconditionally includes all types
+        ConfigurationPredicate predicate = ConfigurationPredicate.DEFAULT_CONFIGRATION_PREDICATE;
+        return types.computeIfAbsent(Pair.create(predicate, s), p -> new ConfigurationType(p.getRight()));
     }
 
     @Override

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JniProcessor.java

@@ -36,6 +36,7 @@
 import com.oracle.svm.configure.config.TypeConfiguration;
 
 import jdk.vm.ci.meta.MetaUtil;
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
 
 class JniProcessor extends AbstractProcessor {
     private final TypeConfiguration configuration;

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

@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2017, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,10 +33,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.graalvm.nativeimage.impl.ConfigurationPredicate;
+
 import com.oracle.svm.core.TypeResult;
 import com.oracle.svm.core.util.json.JSONParser;
 import com.oracle.svm.core.util.json.JSONParserException;
-import org.graalvm.nativeimage.impl.ConfigurationPredicate;
 
 // Checkstyle: allow reflection
 
@@ -78,12 +80,16 @@ private void parseClass(Map<String, Object> data) {
         }
         String className = asString(classObject, "name");
         ConfigurationPredicate predicate = ConfigurationPredicate.DEFAULT_CONFIGRATION_PREDICATE;
-        if (data.containsKey("predicate")) {
-            Map<String, Object> predicateData = asMap(data.get("predicate"), "Attribute 'predicate' must be an object");
-            predicate = delegate.resolvePredicate(predicateData);
+        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) {
+                predicate = ConfigurationPredicate.create((String) predicateType);
+            }
         }
 
-        TypeResult<T> result = delegate.resolveTypeResult(className);
+        TypeResult<T> result = delegate.resolveTypeResult(predicate, className);
         if (!result.isPresent()) {
             handleError("Could not resolve " + className + " for reflection configuration.", result.getException());
             return;
@@ -195,7 +201,7 @@ private void parseMethod(ConfigurationPredicate predicate, Map<String, Object> d
             if (propertyName.equals("name")) {
                 methodName = asString(entry.getValue(), "name");
             } else if (propertyName.equals("parameterTypes")) {
-                methodParameterTypes = parseMethodParameters(clazz, methodName, asList(entry.getValue(),
+                methodParameterTypes = parseMethodParameters(predicate, clazz, methodName, asList(entry.getValue(),
                                 "Attribute 'parameterTypes' must be a list of type names"));
                 if (methodParameterTypes == null) {
                     return;
@@ -237,11 +243,11 @@ private void parseMethod(ConfigurationPredicate predicate, Map<String, Object> d
         }
     }
 
-    private List<T> parseMethodParameters(T clazz, String methodName, List<Object> types) {
+    private List<T> parseMethodParameters(ConfigurationPredicate predicate, T clazz, String methodName, List<Object> types) {
         List<T> result = new ArrayList<>();
         for (Object type : types) {
             String typeName = asString(type, "types");
-            TypeResult<T> typeResult = delegate.resolveTypeResult(typeName);
+            TypeResult<T> typeResult = delegate.resolveTypeResult(predicate, typeName);
             if (!typeResult.isPresent()) {
                 handleError("Could not register method " + formatMethod(clazz, methodName) + " for reflection.", typeResult.getException());
                 return null;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/ReflectionConfigurationParserDelegate.java

@@ -25,24 +25,13 @@
 package com.oracle.svm.core.configure;
 
 import java.util.List;
-import java.util.Map;
 
 import com.oracle.svm.core.TypeResult;
 import org.graalvm.nativeimage.impl.ConfigurationPredicate;
 
 public interface ReflectionConfigurationParserDelegate<T> {
 
-    /**
-     * @deprecated use {@link #resolveTypeResult(String)} instead.
-     */
-    @Deprecated
-    default T resolveType(String typeName) {
-        return resolveTypeResult(typeName).get();
-    }
-
-    ConfigurationPredicate resolvePredicate(Map<String, Object> predicate);
-
-    TypeResult<T> resolveTypeResult(String typeName);
+    TypeResult<T> resolveTypeResult(ConfigurationPredicate predicate, String typeName);
 
     void registerType(ConfigurationPredicate predicate, T type);
 

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

@@ -27,7 +27,6 @@
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.util.List;
-import java.util.Map;
 
 import org.graalvm.nativeimage.impl.ConfigurationPredicate;
 import org.graalvm.nativeimage.impl.ReflectionRegistry;
@@ -54,18 +53,7 @@ public void registerType(ConfigurationPredicate predicate, Class<?> type) {
     }
 
     @Override
-    public ConfigurationPredicate resolvePredicate(Map<String, Object> predicate) {
-        return ConfigurationPredicate.DEFAULT_CONFIGRATION_PREDICATE;
-    }
-
-    @Override
-    @SuppressWarnings("deprecation")
-    public Class<?> resolveType(String typeName) {
-        return resolveTypeResult(typeName).get();
-    }
-
-    @Override
-    public TypeResult<Class<?>> resolveTypeResult(String typeName) {
+    public TypeResult<Class<?>> resolveTypeResult(ConfigurationPredicate predicate, String typeName) {
         String name = typeName;
         if (name.indexOf('[') != -1) {
             /* accept "int[][]", "java.lang.String[]" */