[java] simplified some control flows logic and removed unused imports (#11974)

iampopovich · diemol · web-flow · commit 89f1f083abd9 · 2023-05-17T11:13:18.000+02:00
* simplified some loops logic and removed unused imports

* Update CompletionCommand.java

fix imports after conflict

* Applying formatter

---------

Co-authored-by: Diego Molina &lt;diemol@gmail.com&gt;
Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java
@@ -593,19 +593,15 @@ public Either<SessionNotCreatedException, CreateSessionResponse> newSession(
             AttributeKey.EXCEPTION_MESSAGE.getKey(),
             EventAttribute.setValue("Will retry session " + request.getRequestId()));
 
-        span.setAttribute(AttributeKey.ERROR.getKey(), true);
-        span.setStatus(Status.ABORTED);
-        span.addEvent(AttributeKey.EXCEPTION_EVENT.getKey(), attributeMap);
       } else {
         EXCEPTION.accept(attributeMap, lastFailure);
         attributeMap.put(
             AttributeKey.EXCEPTION_MESSAGE.getKey(),
             EventAttribute.setValue("Unable to create session: " + lastFailure.getMessage()));
-
-        span.setAttribute(AttributeKey.ERROR.getKey(), true);
-        span.setStatus(Status.ABORTED);
-        span.addEvent(AttributeKey.EXCEPTION_EVENT.getKey(), attributeMap);
       }
+      span.setAttribute(AttributeKey.ERROR.getKey(), true);
+      span.setStatus(Status.ABORTED);
+      span.addEvent(AttributeKey.EXCEPTION_EVENT.getKey(), attributeMap);
       return Either.left(lastFailure);
     } catch (SessionNotCreatedException e) {
       span.setAttribute(AttributeKey.ERROR.getKey(), true);
diff --git a/java/src/org/openqa/selenium/remote/ErrorHandler.java b/java/src/org/openqa/selenium/remote/ErrorHandler.java
@@ -107,6 +107,7 @@ public Response throwIfResponseFailed(Response response, long duration) throws R
         try {
           rawErrorData = (Map<String, Object>) rawErrorData.get("value");
         } catch (ClassCastException cce) {
+          message = String.valueOf(cce);
         }
       }
       try {
diff --git a/java/src/org/openqa/selenium/support/ui/Quotes.java b/java/src/org/openqa/selenium/support/ui/Quotes.java
@@ -36,10 +36,7 @@ public class Quotes {
   @SuppressWarnings("JavaDoc")
   public static String escape(String toEscape) {
     if (toEscape.contains("\"") && toEscape.contains("'")) {
-      boolean quoteIsLast = false;
-      if (toEscape.lastIndexOf("\"") == toEscape.length() - 1) {
-        quoteIsLast = true;
-      }
+      boolean quoteIsLast = toEscape.lastIndexOf("\"") == toEscape.length() - 1;
       String[] substringsWithoutQuotes = toEscape.split("\"");
 
       StringBuilder quoted = new StringBuilder("concat(");

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ public Response throwIfResponseFailed(Response response, long duration) throws R`
`107`	`107`	`try {`
`108`	`108`	`rawErrorData = (Map<String, Object>) rawErrorData.get("value");`
`109`	`109`	`} catch (ClassCastException cce) {`
	`110`	`+ message = String.valueOf(cce);`
`110`	`111`	`}`
`111`	`112`	`}`
`112`	`113`	`try {`