From ec273b7cf024cf075c3845ff82f260a6b32fe944 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Wed, 3 Apr 2019 19:13:19 +0200
Subject: [PATCH] Fixes after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
---
 .../jetty/client/AbstractHttpClientServerTest.java  |  3 ++-
 .../jetty/client/TLSServerConnectionCloseTest.java  |  1 +
 .../jetty/fcgi/server/proxy/TryFilesFilterTest.java |  1 +
 .../test/resources/jetty-websocket-httpclient.xml   |  5 +----
 .../jetty/http/client/HttpClientLoadTest.java       | 13 ++++++++-----
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
index 174330da7d7..d5c7218362f 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/AbstractHttpClientServerTest.java
@@ -79,9 +79,10 @@ public abstract class AbstractHttpClientServerTest
         HttpClientTransport transport = new HttpClientTransportOverHTTP(clientConnector);
         QueuedThreadPool executor = new QueuedThreadPool();
         executor.setName("client");
+        clientConnector.setExecutor(executor);
         Scheduler scheduler = new ScheduledExecutorScheduler("client-scheduler", false);
+        clientConnector.setScheduler(scheduler);
         client = newHttpClient(transport);
-        client.setScheduler(scheduler);
         client.setSocketAddressResolver(new SocketAddressResolver.Sync());
         if (config != null)
             config.accept(client);
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/TLSServerConnectionCloseTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/TLSServerConnectionCloseTest.java
index 4bee634598d..9568b69eb28 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/TLSServerConnectionCloseTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/TLSServerConnectionCloseTest.java
@@ -52,6 +52,7 @@ public class TLSServerConnectionCloseTest
         clientConnector.setSelectors(1);
 
         SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
+        sslContextFactory.setEndpointIdentificationAlgorithm(null);
         sslContextFactory.setKeyStorePath("src/test/resources/keystore.jks");
         sslContextFactory.setKeyStorePassword("storepwd");
         clientConnector.setSslContextFactory(sslContextFactory);
diff --git a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java
index 63e29ffd6e2..e62eb00ec62 100644
--- a/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java
+++ b/jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/proxy/TryFilesFilterTest.java
@@ -71,6 +71,7 @@ public class TryFilesFilterTest
 
         ClientConnector clientConnector = new ClientConnector();
         SslContextFactory.Client clientSslContextFactory = new SslContextFactory.Client();
+        clientSslContextFactory.setEndpointIdentificationAlgorithm(null);
         clientSslContextFactory.setKeyStorePath("src/test/resources/keystore.jks");
         clientSslContextFactory.setKeyStorePassword("storepwd");
         clientSslContextFactory.setTrustStorePath("src/test/resources/truststore.jks");
diff --git a/jetty-websocket/javax-websocket-server/src/test/resources/jetty-websocket-httpclient.xml b/jetty-websocket/javax-websocket-server/src/test/resources/jetty-websocket-httpclient.xml
index 5530e171db7..ee97fb070fa 100644
--- a/jetty-websocket/javax-websocket-server/src/test/resources/jetty-websocket-httpclient.xml
+++ b/jetty-websocket/javax-websocket-server/src/test/resources/jetty-websocket-httpclient.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <Configure class="org.eclipse.jetty.client.HttpClient">
-  <Arg>
-    <New class="org.eclipse.jetty.util.ssl.SslContextFactory"/>
-  </Arg>
   <Call name="getAuthenticationStore">
     <Call name="addAuthentication">
       <Arg>
@@ -18,4 +15,4 @@
       </Arg>
     </Call>
   </Call>
-</Configure>
\ No newline at end of file
+</Configure>
diff --git a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java
index 7858edebdc9..570ab405b83 100644
--- a/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java
+++ b/tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/HttpClientLoadTest.java
@@ -47,6 +47,7 @@ import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.io.ArrayByteBufferPool;
 import org.eclipse.jetty.io.ByteBufferPool;
+import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.io.LeakTrackingByteBufferPool;
 import org.eclipse.jetty.io.MappedByteBufferPool;
 import org.eclipse.jetty.server.Connector;
@@ -369,9 +370,8 @@ public class HttpClientLoadTest extends AbstractTest<HttpClientLoadTest.LoadTran
         {
             if (transport == Transport.UNIX_SOCKET)
             {
-                UnixSocketConnector
-                        unixSocketConnector = new UnixSocketConnector( server, provideServerConnectionFactory( transport ));
-                unixSocketConnector.setUnixSocket( sockFile.toString() );
+                UnixSocketConnector unixSocketConnector = new UnixSocketConnector(server, provideServerConnectionFactory(transport));
+                unixSocketConnector.setUnixSocket(sockFile.toString());
                 return unixSocketConnector;
             }
             int cores = ProcessorUtils.availableProcessors();
@@ -389,7 +389,10 @@ public class HttpClientLoadTest extends AbstractTest<HttpClientLoadTest.LoadTran
                 case HTTP:
                 case HTTPS:
                 {
-                    HttpClientTransport clientTransport = new HttpClientTransportOverHTTP(1);
+                    ClientConnector clientConnector = new ClientConnector();
+                    clientConnector.setSelectors(1);
+                    clientConnector.setSslContextFactory(sslContextFactory);
+                    HttpClientTransport clientTransport = new HttpClientTransportOverHTTP(clientConnector);
                     clientTransport.setConnectionPoolFactory(destination -> new LeakTrackingConnectionPool(destination, client.getMaxConnectionsPerDestination(), destination)
                     {
                         @Override
@@ -417,7 +420,7 @@ public class HttpClientLoadTest extends AbstractTest<HttpClientLoadTest.LoadTran
                 }
                 case UNIX_SOCKET:
                 {
-                    HttpClientTransportOverUnixSockets clientTransport = new HttpClientTransportOverUnixSockets( sockFile.toString() );
+                    HttpClientTransportOverUnixSockets clientTransport = new HttpClientTransportOverUnixSockets(sockFile.toString());
                     clientTransport.setConnectionPoolFactory(destination -> new LeakTrackingConnectionPool(destination, client.getMaxConnectionsPerDestination(), destination)
                     {
                         @Override