Issue jetty#3341 - Use HttpClientProvider in WebSocketCoreClient

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
lachlan-roberts · Feb 14, 2019 · c6fd7a6 · c6fd7a6
1 parent b9797b0
commit c6fd7a6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 27 deletions.
diff --git a/jetty-websocket/jetty-websocket-client/pom.xml b/jetty-websocket/jetty-websocket-client/pom.xml
@@ -32,13 +32,6 @@
       <artifactId>jetty-client</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-xml</artifactId>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>

diff --git a/jetty-websocket/websocket-core/pom.xml b/jetty-websocket/websocket-core/pom.xml
@@ -31,6 +31,12 @@
       <artifactId>jetty-http</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-xml</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>

diff --git a/jetty-websocket/websocket-core/src/main/java/module-info.java b/jetty-websocket/websocket-core/src/main/java/module-info.java
@@ -37,6 +37,7 @@
     requires org.eclipse.jetty.io;
     requires org.eclipse.jetty.http;
     requires org.eclipse.jetty.server;
+    requires static org.eclipse.jetty.xml;
     requires org.eclipse.jetty.util;
 
     uses Extension;

diff --git a/...lient/impl/DefaultHttpClientProvider.java → ...ore/client/DefaultHttpClientProvider.java b/...lient/impl/DefaultHttpClientProvider.java → ...ore/client/DefaultHttpClientProvider.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.websocket.client.impl;
+package org.eclipse.jetty.websocket.core.client;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -26,13 +26,14 @@ class DefaultHttpClientProvider
 {
     public static HttpClient newHttpClient()
     {
-        SslContextFactory sslContextFactory = new SslContextFactory();
-        HttpClient client = new HttpClient(sslContextFactory);
+        HttpClient client = new HttpClient(new SslContextFactory());
+        client.getSslContextFactory().setEndpointIdentificationAlgorithm("HTTPS");
+
         QueuedThreadPool threadPool = new QueuedThreadPool();
-        String name = "WebSocketClient@" + client.hashCode();
-        threadPool.setName(name);
+        threadPool.setName("WebSocketClient@" + client.hashCode());
         threadPool.setDaemon(true);
         client.setExecutor(threadPool);
+
         return client;
     }
 }
diff --git a/...ocket/client/impl/HttpClientProvider.java → ...ocket/core/client/HttpClientProvider.java b/...ocket/client/impl/HttpClientProvider.java → ...ocket/core/client/HttpClientProvider.java
@@ -16,13 +16,13 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.websocket.client.impl;
+package org.eclipse.jetty.websocket.core.client;
+
+import java.lang.reflect.Method;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.util.log.Log;
 
-import java.lang.reflect.Method;
-
 public final class HttpClientProvider
 {
     public static HttpClient get()
@@ -31,7 +31,7 @@ public static HttpClient get()
         {
             if (Class.forName("org.eclipse.jetty.xml.XmlConfiguration") != null)
             {
-                Class<?> xmlClazz = Class.forName("org.eclipse.jetty.websocket.client.XmlBasedHttpClientProvider");
+                Class<?> xmlClazz = Class.forName("org.eclipse.jetty.websocket.core.client.XmlBasedHttpClientProvider");
                 Method getMethod = xmlClazz.getMethod("get");
                 Object ret = getMethod.invoke(null);
                 if ((ret != null) && (ret instanceof HttpClient))

diff --git a/...ocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/...ocket-core/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
@@ -27,7 +27,6 @@
 import org.eclipse.jetty.util.component.ContainerLifeCycle;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.ShutdownThread;
 import org.eclipse.jetty.websocket.core.ExtensionConfig;
 import org.eclipse.jetty.websocket.core.FrameHandler;
@@ -61,12 +60,9 @@ public WebSocketCoreClient(HttpClient httpClient)
 
     public WebSocketCoreClient(HttpClient httpClient, FrameHandler.Customizer customizer)
     {
-        if (httpClient==null)
-        {
-            httpClient = new HttpClient(new SslContextFactory());
-            httpClient.getSslContextFactory().setEndpointIdentificationAlgorithm("HTTPS");
-            httpClient.setName(String.format("%s@%x",getClass().getSimpleName(),hashCode()));
-        }
+        if (httpClient == null)
+            httpClient = HttpClientProvider.get();
+
         this.httpClient = httpClient;
         this.extensionRegistry = new WebSocketExtensionRegistry();
         this.objectFactory = new DecoratedObjectFactory();

diff --git a/...ient/impl/XmlBasedHttpClientProvider.java → ...re/client/XmlBasedHttpClientProvider.java b/...ient/impl/XmlBasedHttpClientProvider.java → ...re/client/XmlBasedHttpClientProvider.java
@@ -16,15 +16,15 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.websocket.client.impl;
+package org.eclipse.jetty.websocket.core.client;
+
+import java.io.InputStream;
+import java.net.URL;
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.xml.XmlConfiguration;
 
-import java.io.InputStream;
-import java.net.URL;
-
 class XmlBasedHttpClientProvider
 {
     public static HttpClient get()