[java] Properly converting URLs and logging exceptions in the netty-based http client

Author: barancev

java/client/src/org/openqa/selenium/remote/http/WebSocket.java

@@ -18,14 +18,13 @@
 package org.openqa.selenium.remote.http;
 
 import java.io.Closeable;
-import java.io.UncheckedIOException;
 
 public interface WebSocket extends Closeable {
 
   WebSocket sendText(CharSequence data);
 
   @Override
-  void close() throws UncheckedIOException;
+  void close();
 
   void abort();
 

java/client/src/org/openqa/selenium/remote/http/netty/NettyClient.java

@@ -25,7 +25,6 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.WebSocket;
 
-import java.io.UncheckedIOException;
 import java.util.Objects;
 import java.util.function.BiFunction;
 
@@ -40,7 +39,7 @@ private NettyClient(HttpHandler handler, BiFunction<HttpRequest, WebSocket.Liste
   }
 
   @Override
-  public HttpResponse execute(HttpRequest request) throws UncheckedIOException {
+  public HttpResponse execute(HttpRequest request) {
     return handler.execute(request);
   }
 

java/client/src/org/openqa/selenium/remote/http/netty/NettyHttpHandler.java

@@ -54,8 +54,11 @@ private HttpResponse makeCall(HttpRequest request) {
     try {
       Response response = whenResponse.get();
       return NettyMessages.toSeleniumResponse(response);
-    } catch (InterruptedException | ExecutionException e) {
-      throw new RuntimeException(e);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new RuntimeException("NettyHttpHandler request interrupted", e);
+    } catch (ExecutionException e) {
+      throw new RuntimeException("NettyHttpHandler request execution error", e);
     }
   }
 }

java/client/src/org/openqa/selenium/remote/http/netty/NettyWebSocket.java

@@ -26,51 +26,60 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.WebSocket;
 
-import java.io.UncheckedIOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
 import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 class NettyWebSocket implements WebSocket {
 
+  private static final Logger log = Logger.getLogger(NettyWebSocket.class.getName());
+
   private org.asynchttpclient.ws.WebSocket socket;
 
   private NettyWebSocket(AsyncHttpClient client, org.asynchttpclient.Request request, Listener listener) {
     Objects.requireNonNull(client, "HTTP client to use must be set.");
     Objects.requireNonNull(listener, "WebSocket listener must be set.");
 
     try {
-      socket = client.prepareGet(request.toString().replace("http://", "ws://"))
+      URL origUrl = new URL(request.getUrl());
+      URI wsUri = new URI("ws", null, origUrl.getHost(), origUrl.getPort(), origUrl.getPath(), null, null);
+      socket = client.prepareGet(wsUri.toString())
           .execute(new WebSocketUpgradeHandler.Builder()
-                       .addWebSocketListener(new WebSocketListener() {
-                         @Override
-                         public void onOpen(org.asynchttpclient.ws.WebSocket websocket) {
-
-                         }
-
-                         @Override
-                         public void onClose(org.asynchttpclient.ws.WebSocket websocket, int code, String reason) {
-                           listener.onClose(code, reason);
-                         }
-
-                         @Override
-                         public void onError(Throwable t) {
-                           listener.onError(t);
-                         }
-
-                         @Override
-                         public void onTextFrame(String payload, boolean finalFragment, int rsv) {
-                           if (payload != null) {
-                             listener.onText(payload);
-                           }
-                         }
-                       }).build()).get();
+              .addWebSocketListener(new WebSocketListener() {
+                @Override
+                public void onOpen(org.asynchttpclient.ws.WebSocket websocket) {
+                }
+
+                @Override
+                public void onClose(org.asynchttpclient.ws.WebSocket websocket, int code, String reason) {
+                  listener.onClose(code, reason);
+                }
+
+                @Override
+                public void onError(Throwable t) {
+                  listener.onError(t);
+                }
+
+                @Override
+                public void onTextFrame(String payload, boolean finalFragment, int rsv) {
+                  if (payload != null) {
+                    listener.onText(payload);
+                  }
+                }
+              }).build()).get();
     } catch (InterruptedException e) {
-      e.printStackTrace();
-    } catch (ExecutionException e) {
-      e.printStackTrace();
+      Thread.currentThread().interrupt();
+      log.log(Level.WARNING, "NettyWebSocket initial request interrupted", e);
+    } catch (ExecutionException | MalformedURLException | URISyntaxException e) {
+      throw new RuntimeException("NettyWebSocket initial request execution error", e);
     }
   }
 
@@ -103,7 +112,7 @@ public WebSocket sendText(CharSequence data) {
   }
 
   @Override
-  public void close() throws UncheckedIOException {
+  public void close() {
     socket.sendCloseFrame(1000, "WebDriver closing socket");
   }
 

java/client/src/org/openqa/selenium/remote/http/okhttp/OkHttpClient.java

@@ -26,7 +26,6 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.WebSocket;
 
-import java.io.UncheckedIOException;
 import java.util.Objects;
 import java.util.function.BiFunction;
 
@@ -41,7 +40,7 @@ private OkHttpClient(HttpHandler handler, BiFunction<HttpRequest, WebSocket.List
   }
 
   @Override
-  public HttpResponse execute(HttpRequest request) throws UncheckedIOException {
+  public HttpResponse execute(HttpRequest request) {
     return handler.execute(request);
   }
 

java/client/src/org/openqa/selenium/remote/http/okhttp/OkHttpWebSocket.java

@@ -27,7 +27,6 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.WebSocket;
 
-import java.io.UncheckedIOException;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
@@ -91,7 +90,7 @@ public WebSocket sendText(CharSequence data) {
   }
 
   @Override
-  public void close() throws UncheckedIOException {
+  public void close() {
     socket.close(1000, "WebDriver closing socket");
   }