Fix the build

SeleniumHQ · Jan 19, 2021 · 0471451 · 0471451
1 parent 92e0daf
commit 0471451
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 29 deletions.
diff --git a/java/client/src/org/openqa/selenium/internal/Require.java b/java/client/src/org/openqa/selenium/internal/Require.java
@@ -135,20 +135,18 @@ public static Duration nonNegative(Duration arg) {
     return arg;
   }
 
-  public static int nonNegative(String argName, Integer number) {
-    if (number == null) {
-      throw new IllegalArgumentException(String.format(ARG_MUST_BE_SET, argName));
-    }
+  public static int nonNegative(String argName, int number) {
     if (number < 0) {
       throw new IllegalArgumentException(argName + " cannot be less than 0");
     }
     return number;
   }
 
-  public static int positive(String argName, Integer number, String message) {
-    if (number == null) {
-      throw new IllegalArgumentException(String.format(ARG_MUST_BE_SET, argName));
-    }
+  public static int positive(String argName, int number) {
+    return positive(argName, number, null);
+  }
+
+  public static int positive(String argName, int number, String message) {
     if (number <= 0) {
       if (message == null) {
         throw new IllegalArgumentException(argName + " must be greater than 0");
@@ -159,6 +157,10 @@ public static int positive(String argName, Integer number, String message) {
     return number;
   }
 
+  public static double positive(String argName, double number) {
+    return positive(argName, number, null);
+  }
+
   public static double positive(String argName, double number, String message) {
     if (number <= 0) {
       if (message == null) {
@@ -170,32 +172,19 @@ public static double positive(String argName, double number, String message) {
     return number;
   }
 
-  public static double positive(String argName, double number) {
-    return positive(argName, number, null);
-  }
-
-  public static int positive(String argName, Integer number) {
-    return positive(argName, number, null);
-  }
-
-  public static IntChecker argument(String argName, Integer number) {
-    return new IntChecker(argName, number);
+  public static IntChecker argument(int number) {
+    return new IntChecker(number);
   }
 
   public static class IntChecker {
 
-    private final String argName;
-    private final Integer number;
+    private final int number;
 
-    IntChecker(String argName, Integer number) {
-      this.argName = argName;
+    IntChecker(int number) {
       this.number = number;
     }
 
     public int greaterThan(int max, String message) {
-      if (number == null) {
-        throw new IllegalArgumentException(String.format(ARG_MUST_BE_SET, argName));
-      }
       if (number <= max) {
         throw new IllegalArgumentException(message);
       }

diff --git a/java/client/test/org/openqa/selenium/RequireTest.java b/java/client/test/org/openqa/selenium/RequireTest.java
@@ -159,12 +159,12 @@ public void canCheckIntegersWithMessages() {
   @Test
   public void canCheckIntegerArgumentWithCheckerObject() {
     assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> Require.argument("Timeout", (Integer) null).greaterThan(5, "It should be longer"))
+        .isThrownBy(() -> Require.argument((Integer) null).greaterThan(5, "It should be longer"))
         .withMessage("Timeout must be set");
     assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> Require.argument("Timeout", 3).greaterThan(5, "It should be longer"))
+        .isThrownBy(() -> Require.argument( 3).greaterThan(5, "It should be longer"))
         .withMessage("It should be longer");
-    assertThat(Require.argument("Timeout", 10).greaterThan(5, "It should be longer")).isEqualTo(10);
+    assertThat(Require.argument(10).greaterThan(5, "It should be longer")).isEqualTo(10);
   }
 
   @Test

diff --git a/java/server/src/org/openqa/selenium/cli/WrappedPrintWriter.java b/java/server/src/org/openqa/selenium/cli/WrappedPrintWriter.java
@@ -37,7 +37,7 @@ public WrappedPrintWriter(OutputStream out, int lineLength, int indentBy) {
 
   public WrappedPrintWriter(Writer out, int lineLength, int indentBy) {
     super(out);
-    this.lineLength = Require.argument("Line length", lineLength).greaterThan(9, "Lines must be 10 or more characters");
+    this.lineLength = Require.argument(lineLength).greaterThan(9, "Lines must be 10 or more characters");
     this.indentBy = Require.nonNegative("An indent", indentBy);
 
   }