Reverted theh renaming of HttpClient.getTransport().

Signed-off-by: Simone Bordet <[email protected]>
jetty · sbordet · Nov 29, 2024 · Nov 29, 2024 · Nov 30, 2024 · Dec 1, 2024
commit 5352c0598ded15a98ea2a4c679273c085a6d16df
diff --git a/...examples/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java b/...examples/src/main/java/org/eclipse/jetty/docs/programming/client/http/HTTPClientDocs.java
@@ -1070,7  1070,7 @@ public void setConnectionPool() throws Exception
         // the transport supports multiplexing requests on the same connection.
         int maxRequestsPerConnection = 1;
 
-        HttpClientTransport transport = httpClient.getHttpClientTransport();
         HttpClientTransport transport = httpClient.getTransport();
 
         // Set the ConnectionPool.Factory using a lambda.
         transport.setConnectionPoolFactory(destination ->
@@ -1087,7  1087,7 @@ public void preCreateConnections() throws Exception
         httpClient.start();
 
         // For HTTP/1.1, you need to explicitly configure to initialize connections.
-        if (httpClient.getHttpClientTransport() instanceof HttpClientTransportOverHTTP http1)
         if (httpClient.getTransport() instanceof HttpClientTransportOverHTTP http1)
             http1.setInitializeConnections(true);
 
         // Create a dummy request to the server you want to pre-create connections to.

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
@@ -157,19  157,7 @@ public HttpClient(HttpClientTransport transport)
         installBean(decoderFactories);
     }
 
-    /**
-     * @deprecated use {@link #getHttpClientTransport()} instead
-     */
-    @Deprecated(forRemoval = true, since = "12.1.0")
     public HttpClientTransport getTransport()
-    {
-        return getHttpClientTransport();
-    }
-
-    /**
-     * @return the {@link HttpClientTransport} associated with this {@code HttpClient}.
-     */
-    public HttpClientTransport getHttpClientTransport()
     {
         return transport;
     }
@@ -463,7  451,7 @@ private HttpRequest newHttpRequest(HttpConversation conversation, URI uri)
 
     public Destination resolveDestination(Request request)
     {
-        HttpClientTransport transport = getHttpClientTransport();
         HttpClientTransport transport = getTransport();
         Origin origin = transport.newOrigin(request);
         Destination destination = resolveDestination(origin);
         if (LOG.isDebugEnabled())
@@ -500,7  488,7 @@ public Destination resolveDestination(Origin origin)
         {
             if (v == null || v.stale())
             {
-                HttpDestination newDestination = (HttpDestination)getHttpClientTransport().newDestination(k);
                 HttpDestination newDestination = (HttpDestination)getTransport().newDestination(k);
                 // Start the destination before it's published to other threads.
                 addManaged(newDestination);
                 if (destinationSweeper != null)

diff --git a/...-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientConnectionFactory.java b/...-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientConnectionFactory.java
@@ -53,7  53,7 @@ public org.eclipse.jetty.io.Connection newConnection(EndPoint endPoint, Map<Stri
         HttpClient httpClient = (HttpClient)context.get(ClientConnectionFactory.CLIENT_CONTEXT_KEY);
         HttpConnectionOverHTTP connection = new HttpConnectionOverHTTP(endPoint, context);
         connection.setInitialize(isInitializeConnections());
-        connection.setInvocationType(httpClient.getHttpClientTransport().getInvocationType());
         connection.setInvocationType(httpClient.getTransport().getInvocationType());
         return customize(connection, context);
     }
 

diff --git a/...y-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpDestination.java b/...y-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpDestination.java
@@ -92,7  92,7 @@ public HttpDestination(HttpClient client, Origin origin)
             host  = ":"   port;
         hostField = new HttpField(HttpHeader.HOST, host);
 
-        ClientConnectionFactory connectionFactory = client.getHttpClientTransport();
         ClientConnectionFactory connectionFactory = client.getTransport();
         boolean intrinsicallySecure = origin.getTransport().isIntrinsicallySecure();
 
         ProxyConfiguration proxyConfig = client.getProxyConfiguration();
@@ -186,7  186,7 @@ protected void doStop() throws Exception
 
     protected ConnectionPool newConnectionPool(HttpClient client)
     {
-        return client.getHttpClientTransport().getConnectionPoolFactory().newConnectionPool(this);
         return client.getTransport().getConnectionPoolFactory().newConnectionPool(this);
     }
 
     protected Queue<HttpExchange> newExchangeQueue(HttpClient client)

diff --git a/...lient/src/main/java/org/eclipse/jetty/client/transport/internal/HttpReceiverOverHTTP.java b/...lient/src/main/java/org/eclipse/jetty/client/transport/internal/HttpReceiverOverHTTP.java
@@ -63,7  63,7 @@ public HttpReceiverOverHTTP(HttpChannelOverHTTP channel)
         super(channel);
         HttpClient httpClient = channel.getHttpDestination().getHttpClient();
         parser = new HttpParser(this, httpClient.getMaxResponseHeadersSize(), httpClient.getHttpCompliance());
-        HttpClientTransport transport = httpClient.getHttpClientTransport();
         HttpClientTransport transport = httpClient.getTransport();
         if (transport instanceof HttpClientTransportOverHTTP httpTransport)
         {
             parser.setHeaderCacheSize(httpTransport.getHeaderCacheSize());

diff --git a/...lient/src/main/java/org/eclipse/jetty/client/transport/internal/ProtocolHttpUpgrader.java b/...lient/src/main/java/org/eclipse/jetty/client/transport/internal/ProtocolHttpUpgrader.java
@@ -65,7  65,7 @@ public void upgrade(Response response, EndPoint endPoint, Callback callback)
         if (response.getHeaders().contains(HttpHeader.UPGRADE, protocol))
         {
             HttpClient httpClient = destination.getHttpClient();
-            HttpClientTransport transport = httpClient.getHttpClientTransport();
             HttpClientTransport transport = httpClient.getTransport();
             if (transport instanceof HttpClientTransportDynamic dynamic)
             {
                 Origin origin = destination.getOrigin();

diff --git a/...nt/src/main/java/org/eclipse/jetty/fcgi/client/transport/internal/HttpSenderOverFCGI.java b/...nt/src/main/java/org/eclipse/jetty/fcgi/client/transport/internal/HttpSenderOverFCGI.java
@@ -95,7  95,8 @@ protected void sendHeaders(HttpExchange exchange, ByteBuffer contentBuffer, bool
         }
 
         // Give a chance to the transport implementation to customize the FastCGI headers
-        HttpClientTransportOverFCGI transport = (HttpClientTransportOverFCGI)getHttpChannel().getHttpDestination().getHttpClient().getHttpClientTransport();
         HttpClient httpClient = getHttpChannel().getHttpDestination().getHttpClient();
         HttpClientTransportOverFCGI transport = (HttpClientTransportOverFCGI)httpClient.getTransport();
         transport.customize(request, fcgiHeaders);
 
         ByteBufferPool.Accumulator accumulator = new ByteBufferPool.Accumulator();

diff --git a/...in/java/org/eclipse/jetty/http2/client/transport/internal/HTTPSessionListenerPromise.java b/...in/java/org/eclipse/jetty/http2/client/transport/internal/HTTPSessionListenerPromise.java
@@ -97,7  97,7 @@ protected Connection newConnection(Destination destination, Session session, HTT
     {
         HttpClient httpClient = (HttpClient)context.get(ClientConnectionFactory.CLIENT_CONTEXT_KEY);
         HttpConnectionOverHTTP2 result = new HttpConnectionOverHTTP2(destination, session, connection);
-        result.setInvocationType(httpClient.getHttpClientTransport().getInvocationType());
         result.setInvocationType(httpClient.getTransport().getInvocationType());
         return result;
     }
 

diff --git a/...tty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MaxConcurrentStreamsTest.java b/...tty-http2-tests/src/test/java/org/eclipse/jetty/http2/tests/MaxConcurrentStreamsTest.java
@@ -380,7  380,7 @@ public boolean handle(Request request, org.eclipse.jetty.server.Response respons
 
         httpClient.setMaxConnectionsPerDestination(32768);
         httpClient.setMaxRequestsQueuedPerDestination(1024 * 1024);
-        httpClient.getHttpClientTransport().setConnectionPoolFactory(destination ->
         httpClient.getTransport().setConnectionPoolFactory(destination ->
         {
             try
             {

diff --git a/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/ConnectionPoolTest.java b/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/ConnectionPoolTest.java
@@ -48,7  48,7 @@ public void testPreCreateConnections(Transport transport) throws Exception
         startClient(transport);
         client.setMaxConnectionsPerDestination(maxConnectionsPerDestination);
         if (transport == Transport.HTTPS)
-            ((HttpClientTransportOverHTTP)client.getHttpClientTransport()).setInitializeConnections(true);
             ((HttpClientTransportOverHTTP)client.getTransport()).setInitializeConnections(true);
 
         var request = client.newRequest(newURI(transport));
         Destination destination = client.resolveDestination(request);

diff --git a/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/HTTP1TransportTest.java b/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/HTTP1TransportTest.java
@@ -81,7  81,7 @@ public void testDefaultTransport() throws Exception
         Destination destination = destinations.get(0);
         assertThat(destination.getOrigin().getTransport(), sameInstance(Transport.TCP_IP));
 
-        HttpClientTransportOverHTTP httpClientTransport = (HttpClientTransportOverHTTP)httpClient.getHttpClientTransport();
         HttpClientTransportOverHTTP httpClientTransport = (HttpClientTransportOverHTTP)httpClient.getTransport();
         int networkConnections = httpClientTransport.getClientConnector().getSelectorManager().getTotalKeys();
         assertThat(networkConnections, is(1));
     }
@@ -117,7  117,7 @@ public void testMemoryTransport() throws Exception
 
         assertThat(response.getStatus(), is(HttpStatus.OK_200));
 
-        HttpClientTransportOverHTTP httpClientTransport = (HttpClientTransportOverHTTP)httpClient.getHttpClientTransport();
         HttpClientTransportOverHTTP httpClientTransport = (HttpClientTransportOverHTTP)httpClient.getTransport();
         int networkConnections = httpClientTransport.getClientConnector().getSelectorManager().getTotalKeys();
         assertThat(networkConnections, is(0));
     }

diff --git a/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/HTTP2TransportTest.java b/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/HTTP2TransportTest.java
@@ -96,7  96,7 @@ public void testDefaultTransport() throws Exception
         Destination destination = destinations.get(0);
         assertThat(destination.getOrigin().getTransport(), sameInstance(Transport.TCP_IP));
 
-        HttpClientTransportOverHTTP2 httpClientTransport = (HttpClientTransportOverHTTP2)httpClient.getHttpClientTransport();
         HttpClientTransportOverHTTP2 httpClientTransport = (HttpClientTransportOverHTTP2)httpClient.getTransport();
         int networkConnections = httpClientTransport.getHTTP2Client().getClientConnector().getSelectorManager().getTotalKeys();
         assertThat(networkConnections, is(1));
     }
@@ -132,7  132,7 @@ public void testMemoryTransport() throws Exception
 
         assertThat(response.getStatus(), is(HttpStatus.OK_200));
 
-        HttpClientTransportOverHTTP2 httpClientTransport = (HttpClientTransportOverHTTP2)httpClient.getHttpClientTransport();
         HttpClientTransportOverHTTP2 httpClientTransport = (HttpClientTransportOverHTTP2)httpClient.getTransport();
         int networkConnections = httpClientTransport.getHTTP2Client().getClientConnector().getSelectorManager().getTotalKeys();
         assertThat(networkConnections, is(0));
     }
@@ -201,7  201,7 @@ public void testQUICTransportWithH2(WorkDir workDir) throws Exception
 
         SslContextFactory.Client sslClient = new SslContextFactory.Client(true);
         httpClient.setSslContextFactory(sslClient);
-        HttpClientTransportOverHTTP2 httpClientTransport = (HttpClientTransportOverHTTP2)httpClient.getHttpClientTransport();
         HttpClientTransportOverHTTP2 httpClientTransport = (HttpClientTransportOverHTTP2)httpClient.getTransport();
         // ALPN is negotiated by QUIC.
         httpClientTransport.setUseALPN(false);
         ClientQuicConfiguration clientQuicConfig = new ClientQuicConfiguration(sslClient, null);

diff --git a/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/HTTP3TransportTest.java b/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/HTTP3TransportTest.java
@@ -108,7  108,7 @@ public void testDefaultTransport() throws Exception
             transport = wrapper.unwrap();
         assertThat(transport, sameInstance(Transport.UDP_IP));
 
-        HttpClientTransportOverHTTP3 httpClientTransport = (HttpClientTransportOverHTTP3)httpClient.getHttpClientTransport();
         HttpClientTransportOverHTTP3 httpClientTransport = (HttpClientTransportOverHTTP3)httpClient.getTransport();
         int networkConnections = httpClientTransport.getHTTP3Client().getClientConnector().getSelectorManager().getTotalKeys();
         assertThat(networkConnections, is(1));
     }
@@ -148,7  148,7 @@ public void testMemoryTransport() throws Exception
 
         assertThat(response.getStatus(), is(HttpStatus.OK_200));
 
-        HttpClientTransportOverHTTP3 httpClientTransport = (HttpClientTransportOverHTTP3)httpClient.getHttpClientTransport();
         HttpClientTransportOverHTTP3 httpClientTransport = (HttpClientTransportOverHTTP3)httpClient.getTransport();
         int networkConnections = httpClientTransport.getHTTP3Client().getClientConnector().getSelectorManager().getTotalKeys();
         assertThat(networkConnections, is(0));
     }

diff --git a/...ransports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientStreamTest.java b/...ransports/src/test/java/org/eclipse/jetty/test/client/transport/HttpClientStreamTest.java
@@ -1253,7  1253,7 @@ public boolean handle(Request request, org.eclipse.jetty.server.Response respons
         // - the connection can be used by two concurrent requests;
         // - the connection is pre-created.
         client.setMaxConnectionsPerDestination(1);
-        client.getHttpClientTransport().setConnectionPoolFactory(destination ->
         client.getTransport().setConnectionPoolFactory(destination ->
         {
             MultiplexConnectionPool pool = new MultiplexConnectionPool(destination, 1, 2);
             LifeCycle.start(pool);

diff --git a/...s/src/test/java/org/eclipse/jetty/test/client/transport/RoundRobinConnectionPoolTest.java b/...s/src/test/java/org/eclipse/jetty/test/client/transport/RoundRobinConnectionPoolTest.java
@@ -66,7  66,7 @@ public boolean handle(Request request, Response response, Callback callback)
 
         int maxConnections = 3;
         CompletableFuture<Void> setup = new CompletableFuture<>();
-        client.getHttpClientTransport().setConnectionPoolFactory(destination ->
         client.getTransport().setConnectionPoolFactory(destination ->
         {
             RoundRobinConnectionPool pool = new RoundRobinConnectionPool(destination, maxConnections);
             LifeCycle.start(pool);
@@ -146,7  146,7 @@ public boolean handle(Request request, Response response, Callback callback)
         });
 
         CompletableFuture<Void> setup = new CompletableFuture<>();
-        client.getHttpClientTransport().setConnectionPoolFactory(destination ->
         client.getTransport().setConnectionPoolFactory(destination ->
         {
             RoundRobinConnectionPool pool = new RoundRobinConnectionPool(destination, maxConnections);
             LifeCycle.start(pool);
@@ -226,7  226,7 @@ public boolean handle(Request request, Response response, Callback callback)
         });
         if (transport == Transport.H3)
             ((QuicServerConnector)connector).getQuicConfiguration().setMaxBidirectionalRemoteStreams(maxUsage);
-        client.getHttpClientTransport().setConnectionPoolFactory(destination ->
         client.getTransport().setConnectionPoolFactory(destination ->
         {
             RoundRobinConnectionPool pool = new RoundRobinConnectionPool(destination, maxConnections, maxMultiplex);
             pool.setMaxUsage(maxUsage);

diff --git a/...sports/src/test/java/org/eclipse/jetty/test/client/transport/TLSHandshakeFailureTest.java b/...sports/src/test/java/org/eclipse/jetty/test/client/transport/TLSHandshakeFailureTest.java
@@ -87,7  87,7 @@ private void testTLSWrapFailure(Transport transport, TLSHandshakeAction action,
     {
         start(transport, new EmptyServerHandler());
         client.stop();
-        client = new HttpClient(client.getHttpClientTransport())
         client = new HttpClient(client.getTransport())
         {
             @Override
             public ClientConnectionFactory newSslClientConnectionFactory(SslContextFactory.Client sslContextFactory, ClientConnectionFactory connectionFactory)
@@ -163,7  163,7 @@ private void testTLSUnwrapFailure(Transport transport, TLSHandshakeAction action
     {
         start(transport, new EmptyServerHandler());
         client.stop();
-        client = new HttpClient(client.getHttpClientTransport())
         client = new HttpClient(client.getTransport())
         {
             @Override
             public ClientConnectionFactory newSslClientConnectionFactory(SslContextFactory.Client sslContextFactory, ClientConnectionFactory connectionFactory)

diff --git a/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/VirtualThreadsTest.java b/...-transports/src/test/java/org/eclipse/jetty/test/client/transport/VirtualThreadsTest.java
@@ -116,7  116,7 @@ public boolean handle(Request request, Response response, Callback callback) thr
         vtp.setName("green-");
         executor.setVirtualThreadsExecutor(vtp);
         Invocable.InvocationType invocationType = blocking ? Invocable.InvocationType.BLOCKING : Invocable.InvocationType.NON_BLOCKING;
-        client.getHttpClientTransport().setInvocationType(invocationType);
         client.getTransport().setInvocationType(invocationType);
         client.start();
 
         for (int i = 0; i < 2;   i)

diff --git a/...sports/src/test/java/org/eclipse/jetty/ee10/test/client/transport/ServerTimeoutsTest.java b/...sports/src/test/java/org/eclipse/jetty/ee10/test/client/transport/ServerTimeoutsTest.java
@@ -609,7  609,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
                 }
             }
         });
-        ((HttpClientTransportOverHTTP2)client.getHttpClientTransport()).getHTTP2Client().setInitialStreamRecvWindow(FlowControlStrategy.DEFAULT_WINDOW_SIZE);
         ((HttpClientTransportOverHTTP2)client.getTransport()).getHTTP2Client().setInitialStreamRecvWindow(FlowControlStrategy.DEFAULT_WINDOW_SIZE);
 
         // Setup the client to read slower than the min data rate.
         BlockingQueue<Object> objects = new LinkedBlockingQueue<>();

diff --git a/...sports/src/test/java/org/eclipse/jetty/ee11/test/client/transport/ServerTimeoutsTest.java b/...sports/src/test/java/org/eclipse/jetty/ee11/test/client/transport/ServerTimeoutsTest.java
@@ -609,7  609,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
                 }
             }
         });
-        ((HttpClientTransportOverHTTP2)client.getHttpClientTransport()).getHTTP2Client().setInitialStreamRecvWindow(FlowControlStrategy.DEFAULT_WINDOW_SIZE);
         ((HttpClientTransportOverHTTP2)client.getTransport()).getHTTP2Client().setInitialStreamRecvWindow(FlowControlStrategy.DEFAULT_WINDOW_SIZE);
 
         // Setup the client to read slower than the min data rate.
         BlockingQueue<Object> objects = new LinkedBlockingQueue<>();

diff --git a/...nsports/src/test/java/org/eclipse/jetty/ee9/test/client/transport/ServerTimeoutsTest.java b/...nsports/src/test/java/org/eclipse/jetty/ee9/test/client/transport/ServerTimeoutsTest.java
@@ -592,7  592,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
                 }
             }
         });
-        ((HttpClientTransportOverHTTP2)client.getHttpClientTransport()).getHTTP2Client().setInitialStreamRecvWindow(FlowControlStrategy.DEFAULT_WINDOW_SIZE);
         ((HttpClientTransportOverHTTP2)client.getTransport()).getHTTP2Client().setInitialStreamRecvWindow(FlowControlStrategy.DEFAULT_WINDOW_SIZE);
 
         // Setup the client to read slower than the min data rate.
         BlockingQueue<Object> objects = new LinkedBlockingQueue<>();