Issue #12266 - InvocationType improvements and cleanups.

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpClientTransport.java

@@ -14,6 +14,7 @@
 package org.eclipse.jetty.client;
 
 import java.util.Map;
+import java.util.Objects;
 
 import org.eclipse.jetty.util.Promise;
 import org.eclipse.jetty.util.annotation.ManagedObject;
@@ -28,6 +29,7 @@ public abstract class AbstractHttpClientTransport extends ContainerLifeCycle imp
 
     private HttpClient client;
     private ConnectionPool.Factory factory;
+    private InvocationType invocationType = InvocationType.BLOCKING;
 
     protected HttpClient getHttpClient()
     {
@@ -60,4 +62,16 @@ protected void connectFailed(Map<String, Object> context, Throwable failure)
         Promise<Connection> promise = (Promise<Connection>)context.get(HTTP_CONNECTION_PROMISE_CONTEXT_KEY);
         promise.failed(failure);
     }
+
+    @Override
+    public InvocationType getInvocationType()
+    {
+        return invocationType;
+    }
+
+    @Override
+    public void setInvocationType(InvocationType invocationType)
+    {
+        this.invocationType = Objects.requireNonNull(invocationType);
+    }
 }

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java

@@ -136,13 +136,6 @@ public void onComplete(Result result)
         {
             HttpRequest request = (HttpRequest)result.getRequest();
             ContentResponse response = new HttpContentResponse(result.getResponse(), getContent(), getMediaType(), getEncoding());
-            if (result.getResponseFailure() != null)
-            {
-                if (LOG.isDebugEnabled())
-                    LOG.debug("Authentication challenge failed", result.getFailure());
-                forwardFailureComplete(request, result.getRequestFailure(), response, result.getResponseFailure());
-                return;
-            }
 
             String authenticationAttribute = getAuthenticationAttribute();
             HttpConversation conversation = request.getConversation();

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClientTransport.java

@@ -18,22 +18,23 @@
 
 import org.eclipse.jetty.client.transport.HttpDestination;
 import org.eclipse.jetty.io.ClientConnectionFactory;
+import org.eclipse.jetty.util.thread.Invocable;
 
 /**
  * {@link HttpClientTransport} represents what transport implementations should provide
- * in order to plug-in a different transport for {@link HttpClient}.
+ * in order to plug in a different transport for {@link HttpClient}.
  * <p>
  * While the {@link HttpClient} APIs define the HTTP semantic (request, response, headers, etc.)
  * <em>how</em> an HTTP exchange is carried over the network depends on implementations of this class.
  * <p>
  * The default implementation uses the HTTP protocol to carry over the network the HTTP exchange,
  * but the HTTP exchange may also be carried using the FCGI protocol, the HTTP/2 protocol or,
- * in future, other protocols.
+ * in the future, other protocols.
  */
-public interface HttpClientTransport extends ClientConnectionFactory, HttpClient.Aware
+public interface HttpClientTransport extends ClientConnectionFactory, HttpClient.Aware, Invocable
 {
-    public static final String HTTP_DESTINATION_CONTEXT_KEY = "org.eclipse.jetty.client.destination";
-    public static final String HTTP_CONNECTION_PROMISE_CONTEXT_KEY = "org.eclipse.jetty.client.connection.promise";
+    String HTTP_DESTINATION_CONTEXT_KEY = "org.eclipse.jetty.client.destination";
+    String HTTP_CONNECTION_PROMISE_CONTEXT_KEY = "org.eclipse.jetty.client.connection.promise";
 
     /**
      * Sets the {@link HttpClient} instance on this transport.
@@ -45,15 +46,15 @@ public interface HttpClientTransport extends ClientConnectionFactory, HttpClient
      * @param client the {@link HttpClient} that uses this transport.
      */
     @Override
-    public void setHttpClient(HttpClient client);
+    void setHttpClient(HttpClient client);
 
     /**
      * Creates a new Origin with the given request.
      *
      * @param request the request that triggers the creation of the Origin
      * @return an Origin that identifies a destination
      */
-    public Origin newOrigin(Request request);
+    Origin newOrigin(Request request);
 
     /**
      * Creates a new, transport-specific, {@link HttpDestination} object.
@@ -64,24 +65,38 @@ public interface HttpClientTransport extends ClientConnectionFactory, HttpClient
      * @param origin the destination origin
      * @return a new, transport-specific, {@link HttpDestination} object
      */
-    public Destination newDestination(Origin origin);
+    Destination newDestination(Origin origin);
 
     /**
      * Establishes a physical connection to the given {@code address}.
      *
      * @param address the address to connect to
      * @param context the context information to establish the connection
      */
-    public void connect(SocketAddress address, Map<String, Object> context);
+    void connect(SocketAddress address, Map<String, Object> context);
 
     /**
      * @return the factory for ConnectionPool instances
      */
-    public ConnectionPool.Factory getConnectionPoolFactory();
+    ConnectionPool.Factory getConnectionPoolFactory();
 
     /**
      * Set the factory for ConnectionPool instances.
      * @param factory the factory for ConnectionPool instances
      */
-    public void setConnectionPoolFactory(ConnectionPool.Factory factory);
+    void setConnectionPoolFactory(ConnectionPool.Factory factory);
+
+    /**
+     * @return the {@link InvocationType} associated with this {@code HttpClientTransport}.
+     */
+    @Override
+    default InvocationType getInvocationType()
+    {
+        return Invocable.super.getInvocationType();
+    }
+
+    /**
+     * @param invocationType the {@link InvocationType} associated with this {@code HttpClientTransport}.
+     */
+    void setInvocationType(InvocationType invocationType);
 }

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/RedirectProtocolHandler.java

@@ -70,9 +70,6 @@ public void onComplete(Result result)
     {
         Request request = result.getRequest();
         Response response = result.getResponse();
-        if (result.getResponseFailure() == null)
-            redirector.redirect(request, response, null);
-        else
-            redirector.fail(request, response, result.getFailure());
+        redirector.redirect(request, response, null);
     }
 }

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Response.java

@@ -188,7 +188,7 @@ interface AsyncContentListener extends ContentSourceListener
         @Override
         default void onContentSource(Response response, Content.Source contentSource)
         {
-            Runnable demandCallback = Invocable.from(Invocable.InvocationType.NON_BLOCKING, () -> onContentSource(response, contentSource));
+            Runnable demandCallback = Invocable.from(Invocable.getInvocationType(contentSource), () -> onContentSource(response, contentSource));
             Content.Chunk chunk = contentSource.read();
             if (chunk == null)
             {

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientConnectionFactory.java

@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.transport.internal.HttpConnectionOverHTTP;
 import org.eclipse.jetty.io.ClientConnectionFactory;
 import org.eclipse.jetty.io.EndPoint;
@@ -49,8 +50,10 @@ public void setInitializeConnections(boolean initialize)
     @Override
     public org.eclipse.jetty.io.Connection newConnection(EndPoint endPoint, Map<String, Object> context)
     {
+        HttpClient httpClient = (HttpClient)context.get(ClientConnectionFactory.CLIENT_CONTEXT_KEY);
         HttpConnectionOverHTTP connection = new HttpConnectionOverHTTP(endPoint, context);
         connection.setInitialize(isInitializeConnections());
+        connection.setInvocationType(httpClient.getHttpClientTransport().getInvocationType());
         return customize(connection, context);
     }
 

jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportOverHTTP.java

@@ -26,11 +26,12 @@
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.ManagedObject;
+import org.eclipse.jetty.util.thread.Invocable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @ManagedObject("The HTTP/1.1 client transport")
-public class HttpClientTransportOverHTTP extends AbstractConnectorHttpClientTransport
+public class HttpClientTransportOverHTTP extends AbstractConnectorHttpClientTransport implements Invocable
 {
     public static final Origin.Protocol HTTP11 = new Origin.Protocol(List.of("http/1.1"), false);
     private static final Logger LOG = LoggerFactory.getLogger(HttpClientTransportOverHTTP.class);