Merge 606ddfe into de7acb9

iampopovich · web-flow · commit 60af42e2fb48 · 2023-05-05T08:07:32.000Z
diff --git a/java/src/org/openqa/selenium/bidi/Connection.java b/java/src/org/openqa/selenium/bidi/Connection.java
@@ -39,7 +39,6 @@
 import java.io.Closeable;
 import java.io.StringReader;
 import java.time.Duration;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
diff --git a/java/src/org/openqa/selenium/bidi/Event.java b/java/src/org/openqa/selenium/bidi/Event.java
@@ -18,7 +18,6 @@
 package org.openqa.selenium.bidi;
 
 import org.openqa.selenium.internal.Require;
-import org.openqa.selenium.json.JsonInput;
 
 import java.util.Map;
 import java.util.function.Function;
diff --git a/java/src/org/openqa/selenium/devtools/events/CdpEventTypes.java b/java/src/org/openqa/selenium/devtools/events/CdpEventTypes.java
@@ -27,7 +27,6 @@
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.logging.EventType;
-import org.openqa.selenium.logging.HasLogEvents;
 
 import java.io.IOException;
 import java.net.URL;
diff --git a/java/src/org/openqa/selenium/devtools/v85/V85Events.java b/java/src/org/openqa/selenium/devtools/v85/V85Events.java
@@ -31,7 +31,6 @@
 import org.openqa.selenium.devtools.v85.runtime.model.ExceptionThrown;
 import org.openqa.selenium.devtools.v85.runtime.model.StackTrace;
 
-import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
diff --git a/java/src/org/openqa/selenium/grid/commands/CompletionCommand.java b/java/src/org/openqa/selenium/grid/commands/CompletionCommand.java
@@ -38,7 +38,6 @@
 import java.util.stream.StreamSupport;
 
 import static java.util.stream.Collectors.joining;
-import static org.openqa.selenium.grid.config.StandardGridRoles.ALL_ROLES;
 
 @AutoService(CliCommand.class)
 public class CompletionCommand implements CliCommand {
diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalDistributor.java
@@ -83,7 +83,6 @@
 import dev.failsafe.Failsafe;
 import dev.failsafe.RetryPolicy;
 
-import java.io.Closeable;
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.time.Duration;
@@ -92,7 +91,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
@@ -102,7 +100,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.function.Function;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
@@ -596,18 +593,15 @@ public Either<SessionNotCreatedException, CreateSessionResponse> newSession(Sess
           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/grid/sessionqueue/local/LocalNewSessionQueue.java b/java/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java
@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableSet;
 
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.ImmutableCapabilities;
 import org.openqa.selenium.SessionNotCreatedException;
 import org.openqa.selenium.concurrent.GuardedRunnable;
 import org.openqa.selenium.grid.config.Config;
diff --git a/java/src/org/openqa/selenium/ie/InternetExplorerDriver.java b/java/src/org/openqa/selenium/ie/InternetExplorerDriver.java
@@ -29,7 +29,6 @@
 import org.openqa.selenium.remote.service.DriverCommandExecutor;
 import org.openqa.selenium.remote.service.DriverFinder;
 
-import java.io.File;
 
 public class InternetExplorerDriver extends RemoteWebDriver {
 
diff --git a/java/src/org/openqa/selenium/remote/ErrorHandler.java b/java/src/org/openqa/selenium/remote/ErrorHandler.java
@@ -110,7 +110,9 @@ public Response throwIfResponseFailed(Response response, long duration) throws R
       if (!rawErrorData.containsKey(MESSAGE) && rawErrorData.containsKey("value")) {
         try {
           rawErrorData = (Map<String, Object>) rawErrorData.get("value");
-        } catch (ClassCastException cce) {}
+        } catch (ClassCastException cce) {
+          throw new RuntimeException(cce);
+        }
       }
       try {
         message = (String) rawErrorData.get(MESSAGE);
diff --git a/java/src/org/openqa/selenium/remote/codec/w3c/W3CHttpCommandCodec.java b/java/src/org/openqa/selenium/remote/codec/w3c/W3CHttpCommandCodec.java
@@ -22,7 +22,6 @@
 
 import org.openqa.selenium.InvalidSelectorException;
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.interactions.PointerInput;
 import org.openqa.selenium.remote.codec.AbstractHttpCommandCodec;
 import org.openqa.selenium.remote.internal.WebElementToJsonConverter;
 
diff --git a/java/src/org/openqa/selenium/remote/http/Contents.java b/java/src/org/openqa/selenium/remote/http/Contents.java
@@ -23,10 +23,8 @@
 import com.google.common.io.FileBackedOutputStream;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.nio.file.Files;
 import java.util.Base64;
-import java.util.zip.ZipOutputStream;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.json.JsonInput;
diff --git a/java/src/org/openqa/selenium/remote/service/DriverCommandExecutor.java b/java/src/org/openqa/selenium/remote/service/DriverCommandExecutor.java
@@ -23,7 +23,6 @@
 import com.google.common.base.Throwables;
 
 import org.openqa.selenium.WebDriverException;
-import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.Command;
 import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.DriverCommand;
@@ -80,7 +79,7 @@ public DriverCommandExecutor(DriverService service, ClientConfig clientConfig) {
    *
    * @param service driver server
    * @param additionalCommands additional commands the remote end can process
-   * @param clientConfig 
+   * @param clientConfig
    */
 
   public DriverCommandExecutor(
diff --git a/java/src/org/openqa/selenium/support/ui/Quotes.java b/java/src/org/openqa/selenium/support/ui/Quotes.java
@@ -40,10 +40,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(");
