diff --git a/java/src/org/openqa/selenium/internal/Require.java b/java/src/org/openqa/selenium/internal/Require.java index 476966a597bb4..4ec171e5a305e 100644 --- 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; }