From 1ccfb31a583471122cd9207c359937add64d05d0 Mon Sep 17 00:00:00 2001
From: Diego Molina <diemol@gmail.com>
Date: Mon, 21 Dec 2020 19:39:13 +0100
Subject: [PATCH] [grid] Optimizing imports for SessionQueue classes

---
 .../selenium/grid/sessionqueue/AddBackToSessionQueue.java     | 2 --
 .../openqa/selenium/grid/sessionqueue/NewSessionQueuer.java   | 2 --
 .../sessionqueue/httpd/DefaultNewSessionQueuerConfig.java     | 4 ++--
 .../grid/sessionqueue/local/LocalNewSessionQueuer.java        | 2 --
 .../grid/sessionqueue/remote/RemoteNewSessionQueuer.java      | 4 ++--
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/AddBackToSessionQueue.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/AddBackToSessionQueue.java
index ef7667d6274c7..0b9b113f24b65 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionqueue/AddBackToSessionQueue.java
+++ b/java/server/src/org/openqa/selenium/grid/sessionqueue/AddBackToSessionQueue.java
@@ -33,8 +33,6 @@
 import org.openqa.selenium.remote.tracing.Span;
 import org.openqa.selenium.remote.tracing.Tracer;
 
-import java.util.UUID;
-
 class AddBackToSessionQueue implements HttpHandler {
 
   private final Tracer tracer;
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/NewSessionQueuer.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/NewSessionQueuer.java
index 065068255d8c6..5cb32bf88086a 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionqueue/NewSessionQueuer.java
+++ b/java/server/src/org/openqa/selenium/grid/sessionqueue/NewSessionQueuer.java
@@ -48,11 +48,9 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.logging.Logger;
 
 public abstract class NewSessionQueuer implements HasReadyState, Routable {
 
-  private static final Logger LOG = Logger.getLogger(NewSessionQueuer.class.getName());
   private final Route routes;
   protected final Tracer tracer;
 
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueuerConfig.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueuerConfig.java
index 85c9b1ad1f294..ea1b87c37ed66 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueuerConfig.java
+++ b/java/server/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueuerConfig.java
@@ -17,9 +17,9 @@
 
 package org.openqa.selenium.grid.sessionqueue.httpd;
 
-    import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap;
 
-    import org.openqa.selenium.grid.config.MapConfig;
+import org.openqa.selenium.grid.config.MapConfig;
 
 class DefaultNewSessionQueuerConfig extends MapConfig {
 
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueuer.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueuer.java
index 341397c3726bf..81f8f0c89d56c 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueuer.java
+++ b/java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueuer.java
@@ -33,11 +33,9 @@
 
 import java.time.Duration;
 import java.util.Optional;
-import java.util.logging.Logger;
 
 public class LocalNewSessionQueuer extends NewSessionQueuer {
 
-  private static final Logger LOG = Logger.getLogger(LocalNewSessionQueuer.class.getName());
   private final EventBus bus;
   public final NewSessionQueue sessionRequests;
 
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/remote/RemoteNewSessionQueuer.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/remote/RemoteNewSessionQueuer.java
index d6a4ccce9622c..9103e3cb11c30 100644
--- a/java/server/src/org/openqa/selenium/grid/sessionqueue/remote/RemoteNewSessionQueuer.java
+++ b/java/server/src/org/openqa/selenium/grid/sessionqueue/remote/RemoteNewSessionQueuer.java
@@ -18,7 +18,8 @@
 package org.openqa.selenium.grid.sessionqueue.remote;
 
 import static java.net.HttpURLConnection.HTTP_OK;
-import static org.openqa.selenium.grid.sessionqueue.NewSessionQueue.*;
+import static org.openqa.selenium.grid.sessionqueue.NewSessionQueue.SESSIONREQUEST_ID_HEADER;
+import static org.openqa.selenium.grid.sessionqueue.NewSessionQueue.SESSIONREQUEST_TIMESTAMP_HEADER;
 import static org.openqa.selenium.remote.http.HttpMethod.DELETE;
 import static org.openqa.selenium.remote.http.HttpMethod.GET;
 import static org.openqa.selenium.remote.http.HttpMethod.POST;
@@ -41,7 +42,6 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.logging.Logger;
 
 public class RemoteNewSessionQueuer extends NewSessionQueuer {