Reducing code duplication and reducing use of guava

Author: barancev

java/server/src/org/openqa/selenium/grid/sessionqueue/AddBackToSessionQueue.java

@@ -17,13 +17,12 @@
 
 package org.openqa.selenium.grid.sessionqueue;
 
+import static java.util.Collections.singletonMap;
 import static org.openqa.selenium.remote.http.Contents.asJson;
 import static org.openqa.selenium.remote.tracing.HttpTracing.newSpanAsChildOf;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE;
 
-import com.google.common.collect.ImmutableMap;
-
 import org.openqa.selenium.grid.data.RequestId;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.http.HttpHandler;
@@ -56,7 +55,7 @@ public HttpResponse execute(HttpRequest req) {
       span.setAttribute("request.retry", value);
 
       HttpResponse response = new HttpResponse()
-        .setContent(asJson(ImmutableMap.of("value", value)));
+        .setContent(asJson(singletonMap("value", value)));
 
       HTTP_RESPONSE.accept(span, response);
 

java/server/src/org/openqa/selenium/grid/sessionqueue/GetNewSessionResponse.java

@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.grid.sessionqueue;
 
-import com.google.common.collect.ImmutableMap;
 import org.openqa.selenium.events.EventBus;
 import org.openqa.selenium.grid.data.NewSessionErrorResponse;
 import org.openqa.selenium.grid.data.NewSessionRejectedEvent;
@@ -39,6 +38,7 @@
 import java.util.logging.Logger;
 
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
+import static java.util.Collections.singletonMap;
 import static org.openqa.selenium.remote.http.Contents.asJson;
 import static org.openqa.selenium.remote.http.Contents.bytes;
 
@@ -99,9 +99,7 @@ private void setErrorResponse(NewSessionErrorResponse sessionResponse) {
 
     if (sessionRequest.isPresent()) {
       NewSessionRequest request = sessionRequest.get();
-      request.setSessionResponse(new HttpResponse()
-        .setStatus(HTTP_INTERNAL_ERROR)
-        .setContent(asJson(ImmutableMap.of("message", sessionResponse.getMessage()))));
+      request.setSessionResponse(internalErrorResponse(sessionResponse.getMessage()));
       request.getLatch().countDown();
     }
   }
@@ -116,11 +114,8 @@ public HttpResponse add(HttpRequest request) {
     knownRequests.put(requestId, requestIdentifier);
 
     if (!sessionRequests.offerLast(request, requestId)) {
-      return new HttpResponse()
-        .setStatus(HTTP_INTERNAL_ERROR)
-        .setContent(asJson(ImmutableMap.of(
-          "message",
-          "Session request could not be created. Error while adding to the session queue.")));
+      return internalErrorResponse(
+        "Session request could not be created. Error while adding to the session queue.");
     }
 
     try {
@@ -129,20 +124,24 @@ public HttpResponse add(HttpRequest request) {
       latch.await();
       return requestIdentifier.getSessionResponse();
     } catch (InterruptedException e) {
-      LOG.log(Level.WARNING, "The thread waiting for new session response interrupted. {0}",
-        e.getMessage());
+      LOG.log(Level.WARNING,
+              "The thread waiting for new session response interrupted. {0}",
+              e.getMessage());
       Thread.currentThread().interrupt();
 
-      return new HttpResponse()
-        .setStatus(HTTP_INTERNAL_ERROR)
-        .setContent(asJson(ImmutableMap.of(
-          "message",
-          "Session request could not be created. Error while processing the session request.")));
+      return internalErrorResponse(
+        "Session request could not be created. Error while processing the session request.");
     } finally {
       removeRequest(requestId);
     }
   }
 
+  private HttpResponse internalErrorResponse(String message) {
+    return new HttpResponse()
+      .setStatus(HTTP_INTERNAL_ERROR)
+      .setContent(asJson(singletonMap("message", message)));
+  }
+
   private void removeRequest(RequestId id) {
     knownRequests.remove(id);
   }