[java] type casting and numeric improvements (#13909)

* replaced condition controll flow with switch * remove casting from double to int division operation with integer ergument is equal to cast to int Math.floor() * remove division by 1 in tests * replaced manual calculation of hashcode with Long.hashCode() * removed redundand toString method call * removed cast to string in string concat * applying code formatting
SeleniumHQ · May 6, 2024 · 4b41538 · 4b41538
1 parent 72562d8
commit 4b41538
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/java/src/org/openqa/selenium/devtools/CdpClientGenerator.java b/java/src/org/openqa/selenium/devtools/CdpClientGenerator.java
@@ -913,18 +913,23 @@ public TypeDeclaration<?> toTypeDeclaration() {
       fromJson.getBody().get().addStatement(String.format("return new %s(%s);", name, getMapper()));
 
       MethodDeclaration toJson = classDecl.addMethod("toJson").setPublic(true);
-      if (type.equals("object")) {
-        toJson.setType("java.util.Map<String, Object>");
-        toJson.getBody().get().addStatement(String.format("return %s;", propertyName));
-      } else if (type.equals("number")) {
-        toJson.setType(Number.class);
-        toJson.getBody().get().addStatement(String.format("return %s;", propertyName));
-      } else if (type.equals("integer")) {
-        toJson.setType(Integer.class);
-        toJson.getBody().get().addStatement(String.format("return %s;", propertyName));
-      } else {
-        toJson.setType(String.class);
-        toJson.getBody().get().addStatement(String.format("return %s.toString();", propertyName));
+      switch (type) {
+        case "object":
+          toJson.setType("java.util.Map<String, Object>");
+          toJson.getBody().get().addStatement(String.format("return %s;", propertyName));
+          break;
+        case "number":
+          toJson.setType(Number.class);
+          toJson.getBody().get().addStatement(String.format("return %s;", propertyName));
+          break;
+        case "integer":
+          toJson.setType(Integer.class);
+          toJson.getBody().get().addStatement(String.format("return %s;", propertyName));
+          break;
+        default:
+          toJson.setType(String.class);
+          toJson.getBody().get().addStatement(String.format("return %s.toString();", propertyName));
+          break;
       }
 
       MethodDeclaration toString = classDecl.addMethod("toString").setPublic(true);

diff --git a/java/src/org/openqa/selenium/support/AbstractFindByBuilder.java b/java/src/org/openqa/selenium/support/AbstractFindByBuilder.java
@@ -109,7 +109,7 @@ protected void assertValidFindBy(FindBy findBy) {
       throw new IllegalArgumentException(
           String.format(
               "You must specify at most one location strategy. Number found: %d (%s)",
-              finders.size(), finders.toString()));
+              finders.size(), finders));
     }
   }
 

diff --git a/java/src/org/openqa/selenium/support/Color.java b/java/src/org/openqa/selenium/support/Color.java
@@ -116,7 +116,7 @@ public int hashCode() {
     result = 31 * result + green;
     result = 31 * result + blue;
     temp = alpha != +0.0d ? Double.doubleToLongBits(alpha) : 0L;
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
+    result = 31 * result + Long.hashCode(temp);
     return result;
   }
 

diff --git a/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java b/java/test/org/openqa/selenium/bidi/input/DefaultMouseTest.java
@@ -481,7 +481,7 @@ public void testCanMoveOverAndOutOfAnElement() {
     inputModule.perform(
         windowHandle,
         getBuilder(driver)
-            .moveToElement(redbox, redSize.getWidth() / 1 + 1, redSize.getHeight() / 1 + 1)
+            .moveToElement(redbox, redSize.getWidth() + 1, redSize.getHeight() + 1)
             .getSequences());
 
     wait.until(attributeToBe(redbox, "background-color", Colors.GREEN.getColorValue().asRgba()));

diff --git a/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java b/java/test/org/openqa/selenium/bidi/input/DragAndDropTest.java
@@ -57,7 +57,7 @@ private static void sleep(int ms) {
     try {
       Thread.sleep(ms);
     } catch (InterruptedException e) {
-      throw new RuntimeException("Interrupted: " + e.toString());
+      throw new RuntimeException("Interrupted: " + e);
     }
   }
 

diff --git a/java/test/org/openqa/selenium/interactions/DefaultMouseTest.java b/java/test/org/openqa/selenium/interactions/DefaultMouseTest.java
@@ -404,7 +404,7 @@ public void testCanMoveOverAndOutOfAnElement() {
         .isEqualTo(RED.getColorValue());
 
     getBuilder(driver)
-        .moveToElement(redbox, redSize.getWidth() / 1 + 1, redSize.getHeight() / 1 + 1)
+        .moveToElement(redbox, redSize.getWidth() + 1, redSize.getHeight() + 1)
         .perform();
 
     wait.until(attributeToBe(redbox, "background-color", Colors.GREEN.getColorValue().asRgba()));

diff --git a/java/test/org/openqa/selenium/interactions/PenPointerTest.java b/java/test/org/openqa/selenium/interactions/PenPointerTest.java
@@ -367,7 +367,7 @@ public void testCanMoveOverAndOutOfAnElement() {
         .isEqualTo(RED.getColorValue());
 
     setDefaultPen(driver)
-        .moveToElement(redbox, redSize.getWidth() / 1 + 1, redSize.getHeight() / 1 + 1)
+        .moveToElement(redbox, redSize.getWidth() + 1, redSize.getHeight() + 1)
         .perform();
 
     wait.until(attributeToBe(redbox, "background-color", Colors.GREEN.getColorValue().asRgba()));
@@ -407,8 +407,8 @@ public void setPointerEventProperties() {
 
     Rectangle rect = pointerArea.getRect();
 
-    int centerX = (int) Math.floor(rect.width / 2 + rect.getX());
-    int centerY = (int) Math.floor(rect.height / 2 + rect.getY());
+    int centerX = rect.width / 2 + rect.getX();
+    int centerY = rect.height / 2 + rect.getY();
     Assertions.assertThat(moveTo.get("button")).isEqualTo("-1");
     Assertions.assertThat(moveTo.get("pageX")).isEqualTo("" + centerX);
     Assertions.assertThat(moveTo.get("pageY")).isEqualTo("" + centerY);