From 4104ef11540d08889e265723497de44d6fda4067 Mon Sep 17 00:00:00 2001
From: Fabio Niephaus <fabio.niephaus@oracle.com>
Date: Thu, 2 Nov 2023 14:35:01 +0100
Subject: [PATCH] Use `Objects.requireNonNull()` in
 `ConditionalConfigurationRegistry`.

(cherry picked from commit 0ba6cc2c33725a482e190525c6f2bd153ec82b2b)
---
 .../svm/hosted/ConditionalConfigurationRegistry.java  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

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
index e696f21e3031b..8af9e717078f0 100644
--- 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
@@ -26,6 +26,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
@@ -38,14 +39,8 @@ public abstract class ConditionalConfigurationRegistry {
     private final Map<String, Collection<Runnable>> pendingReachabilityHandlers = new ConcurrentHashMap<>();
 
     protected void registerConditionalConfiguration(ConfigurationCondition condition, Runnable runnable) {
-        if (condition == null) {
-            throw new NullPointerException("Cannot use null value as condition for conditional configuration. " +
-                            "Please ensure that you register a non-null condition.");
-        }
-        if (runnable == null) {
-            throw new NullPointerException("Cannot use null value as runnable for conditional configuration. " +
-                            "Please ensure that you register a non-null runnable.");
-        }
+        Objects.requireNonNull(condition, "Cannot use null value as condition for conditional configuration. Please ensure that you register a non-null condition.");
+        Objects.requireNonNull(runnable, "Cannot use null value as runnable for conditional configuration. Please ensure that you register a non-null runnable.");
         if (ConfigurationCondition.alwaysTrue().equals(condition)) {
             /* analysis optimization to include new types as early as possible */
             runnable.run();