NullPointerException on null value arguments.

Author: kimeta

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ConditionalConfigurationRegistry.java

@@ -107,12 +107,21 @@ public void setAnalysisAccess(Feature.BeforeAnalysisAccess beforeAnalysisAccess)
         pendingReachabilityHandlers.clear();
     }
 
+    protected void requireNonNull(Object[] values, String kind, String accessKind) {
+        for (Object value : values) {
+            Objects.requireNonNull(value, () -> nullErrorMessage(kind, accessKind));
+        }
+    }
+
+    protected String nullErrorMessage(String elementKind, String accessKind) {
+        return "Cannot register null value as " + elementKind + " for " + accessKind + ". Please ensure that all values you register are not null.";
+    }
+
     public void setHostVM(SVMHost hostVM) {
         this.hostVM = hostVM;
     }
 
     public SVMHost getHostVM() {
         return hostVM;
     }
-
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jni/JNIAccessFeature.java

@@ -228,14 +228,14 @@ private final class JNIRuntimeAccessibilitySupportImpl extends ConditionalConfig
         @Override
         public void register(ConfigurationCondition condition, boolean unsafeAllocated, Class<?> clazz) {
             assert !unsafeAllocated : "unsafeAllocated can be only set via Unsafe.allocateInstance, not via JNI.";
-            Objects.requireNonNull(clazz, () -> nullErrorMessage("class"));
+            Objects.requireNonNull(clazz, () -> nullErrorMessage("class", "JNI access"));
             abortIfSealed();
             registerConditionalConfiguration(condition, (cnd) -> newClasses.add(clazz));
         }
 
         @Override
         public void register(ConfigurationCondition condition, boolean queriedOnly, Executable... executables) {
-            requireNonNull(executables, "executable");
+            requireNonNull(executables, "executable", "JNI access");
             abortIfSealed();
             if (!queriedOnly) {
                 registerConditionalConfiguration(condition, (cnd) -> newMethods.addAll(Arrays.asList(executables)));
@@ -244,7 +244,7 @@ public void register(ConfigurationCondition condition, boolean queriedOnly, Exec
 
         @Override
         public void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields) {
-            requireNonNull(fields, "field");
+            requireNonNull(fields, "field", "JNI access");
             abortIfSealed();
             registerConditionalConfiguration(condition, (cnd) -> registerFields(finalIsWritable, fields));
         }
@@ -758,14 +758,4 @@ private static boolean anyFieldMatches(ResolvedJavaType sub, String name) {
             return false;
         }
     }
-
-    private static void requireNonNull(Object[] values, String kind) {
-        for (Object value : values) {
-            Objects.requireNonNull(value, () -> nullErrorMessage(kind));
-        }
-    }
-
-    private static String nullErrorMessage(String kind) {
-        return "Cannot register null value as " + kind + " for JNI access. Please ensure that all values you register are not null.";
-    }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java

@@ -202,7 +202,7 @@ private boolean isQueryFlagSet(Class<?> clazz, int flag) {
 
     @Override
     public void register(ConfigurationCondition condition, boolean unsafeInstantiated, Class<?> clazz) {
-        Objects.requireNonNull(clazz, () -> nullErrorMessage("class"));
+        Objects.requireNonNull(clazz, () -> nullErrorMessage("class", "reflection"));
         runConditionalInAnalysisTask(condition, (cnd) -> {
             registerClass(cnd, clazz, unsafeInstantiated, true);
             if (FutureDefaultsOptions.completeReflectionTypes()) {
@@ -375,7 +375,7 @@ public void registerAllSignersQuery(ConfigurationCondition condition, Class<?> c
 
     @Override
     public void register(ConfigurationCondition condition, boolean queriedOnly, Executable... executables) {
-        requireNonNull(executables, "executable");
+        requireNonNull(executables, "executable", "reflection");
         runConditionalInAnalysisTask(condition, (cnd) -> registerMethods(cnd, queriedOnly, executables));
     }
 
@@ -554,7 +554,7 @@ public void registerConstructorLookup(ConfigurationCondition condition, Class<?>
 
     @Override
     public void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields) {
-        requireNonNull(fields, "field");
+        requireNonNull(fields, "field", "reflection");
         runConditionalInAnalysisTask(condition, (cnd) -> registerFields(cnd, false, fields));
     }
 
@@ -1391,16 +1391,6 @@ private static int countConditionalElements(Map<? extends AnalysisElement, ? ext
                         .reduce(0, Integer::sum);
     }
 
-    private static void requireNonNull(Object[] values, String kind) {
-        for (Object value : values) {
-            Objects.requireNonNull(value, () -> nullErrorMessage(kind));
-        }
-    }
-
-    private static String nullErrorMessage(String kind) {
-        return "Cannot register null value as " + kind + " for reflection. Please ensure that all values you register are not null.";
-    }
-
     public static class TestBackdoor {
         public static void registerField(ReflectionDataBuilder reflectionDataBuilder, boolean queriedOnly, Field field) {
             reflectionDataBuilder.runConditionalInAnalysisTask(ConfigurationCondition.alwaysTrue(), (cnd) -> reflectionDataBuilder.registerField(cnd, queriedOnly, field));

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/proxy/ProxyRegistry.java

@@ -91,4 +91,9 @@ private static boolean checkClass(List<String> interfaceNames, String className,
     private static void warning(List<String> interfaceNames, String reason) {
         LogUtils.warning("Cannot register dynamic proxy for interface list: %s. Reason: %s.", String.join(", ", interfaceNames), reason);
     }
+
+    @Override
+    protected String nullErrorMessage(String kind) {
+        return "Cannot register null value as " + kind + ". Please ensure that all values you register are not null.";
+    }
 }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/serialize/SerializationFeature.java

@@ -47,10 +47,12 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import com.oracle.svm.core.util.UserError;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
@@ -71,7 +73,6 @@
 import com.oracle.svm.core.reflect.serialize.SerializationSupport;
 import com.oracle.svm.core.reflect.target.ReflectionSubstitutionSupport;
 import com.oracle.svm.core.util.BasedOnJDKFile;
-import com.oracle.svm.core.util.UserError;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.ConditionalConfigurationRegistry;
 import com.oracle.svm.hosted.ConfigurationTypeResolver;
@@ -310,6 +311,7 @@ private void abortIfSealed() {
 
     @Override
     public void registerIncludingAssociatedClasses(ConfigurationCondition condition, Class<?> clazz) {
+        Objects.requireNonNull(clazz, () -> nullErrorMessage("class", "serialization"));
         registerIncludingAssociatedClasses(condition, clazz, new HashSet<>());
     }
 
@@ -365,7 +367,7 @@ private void registerIncludingAssociatedClasses(ConfigurationCondition condition
     @Override
     public void registerLambdaCapturingClass(ConfigurationCondition condition, String lambdaCapturingClassName) {
         abortIfSealed();
-
+        Objects.requireNonNull(lambdaCapturingClassName, () -> nullErrorMessage("lambda capturing class", "serialization"));
         Class<?> lambdaCapturingClass = typeResolver.resolveType(lambdaCapturingClassName);
         if (lambdaCapturingClass == null || lambdaCapturingClass.isPrimitive() || lambdaCapturingClass.isArray()) {
             return;
@@ -407,6 +409,7 @@ public void register(ConfigurationCondition condition, String targetClassName) {
     @Override
     public void register(ConfigurationCondition condition, Class<?> serializationTargetClass) {
         abortIfSealed();
+        Objects.requireNonNull(serializationTargetClass, () -> nullErrorMessage("class", "serialization"));
         registerConditionalConfiguration(condition, (cnd) -> {
             /*
              * Register class for reflection as it is needed when the class-value itself is