[java] Enhance Null Check in Exception Handling (SeleniumHQ#14810)

sandeepsuryaprasad · Dec 4, 2024 · 454ae25 · 454ae25
1 parent 966bed6
commit 454ae25
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/java/src/org/openqa/selenium/internal/Require.java b/java/src/org/openqa/selenium/internal/Require.java
@@ -129,11 +129,8 @@ public static int positive(String argName, Integer number, String message) {
       throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
     }
     if (number <= 0) {
-      if (message == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
-      } else {
-        throw new IllegalArgumentException(message);
-      }
+      throw new IllegalArgumentException(
+          Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
     }
     return number;
   }
@@ -143,11 +140,8 @@ public static double positive(String argName, Double number, String message) {
       throw new IllegalArgumentException(String.format(MUST_BE_SET, argName));
     }
     if (number <= 0) {
-      if (message == null) {
-        throw new IllegalArgumentException(String.format(MUST_BE_POSITIVE, argName));
-      } else {
-        throw new IllegalArgumentException(message);
-      }
+      throw new IllegalArgumentException(
+          Objects.requireNonNullElseGet(message, () -> String.format(MUST_BE_POSITIVE, argName)));
     }
     return number;
   }