Move null checks to the beginning of register methods.

Not before the register methods, which can miss cases, nor later on in a runnable.
jerboaa · Nov 2, 2023 · f94551a · f94551a
1 parent d621dbd
commit f94551a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ReflectionRegistry.java b/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/ReflectionRegistry.java
@@ -46,13 +46,7 @@
 
 public interface ReflectionRegistry {
     default void register(ConfigurationCondition condition, Class<?>... classes) {
-        Arrays.stream(classes).forEach(clazz -> {
-            if (clazz == null) {
-                throw new NullPointerException("Cannot register null value as class for reflection. " +
-                                "Please ensure that all values you register are not null.");
-            }
-            register(condition, false, clazz);
-        });
+        Arrays.stream(classes).forEach(clazz -> register(condition, false, clazz));
     }
 
     void register(ConfigurationCondition condition, boolean unsafeAllocated, Class<?> clazz);

diff --git a/...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java b/...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java
@@ -56,6 +56,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -166,6 +167,7 @@ private void setQueryFlag(Class<?> clazz, int flag) {
 
     @Override
     public void register(ConfigurationCondition condition, boolean unsafeInstantiated, Class<?> clazz) {
+        Objects.requireNonNull(clazz, () -> nullErrorMessage("class"));
         checkNotSealed();
         register(analysisUniverse -> registerConditionalConfiguration(condition,
                         () -> analysisUniverse.getBigbang().postTask(debug -> registerClass(clazz, unsafeInstantiated))));
@@ -269,13 +271,10 @@ public void registerAllSignersQuery(ConfigurationCondition condition, Class<?> c
 
     @Override
     public void register(ConfigurationCondition condition, boolean queriedOnly, Executable... executables) {
+        requireNonNull(executables, "executable");
         checkNotSealed();
         register(analysisUniverse -> registerConditionalConfiguration(condition, () -> {
             for (Executable executable : executables) {
-                if (executable == null) {
-                    throw new NullPointerException("Cannot register null value as executable for reflection. " +
-                                    "Please ensure that all values you register are not null.");
-                }
                 analysisUniverse.getBigbang().postTask(debug -> registerMethod(queriedOnly, executable));
             }
         }));
@@ -401,17 +400,14 @@ public void registerConstructorLookup(ConfigurationCondition condition, Class<?>
 
     @Override
     public void register(ConfigurationCondition condition, boolean finalIsWritable, Field... fields) {
+        requireNonNull(fields, "field");
         checkNotSealed();
         registerInternal(condition, fields);
     }
 
     private void registerInternal(ConfigurationCondition condition, Field... fields) {
         register(analysisUniverse -> registerConditionalConfiguration(condition, () -> {
             for (Field field : fields) {
-                if (field == null) {
-                    throw new NullPointerException("Cannot register null value as field for reflection. " +
-                                    "Please ensure that all values you register are not null.");
-                }
                 analysisUniverse.getBigbang().postTask(debug -> registerField(field));
             }
         }));
@@ -1068,4 +1064,14 @@ public int getReflectionMethodsCount() {
     public int getReflectionFieldsCount() {
         return registeredFields.size();
     }
+
+    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.";
+    }
 }