Issue #9293 - Jetty 12 - Relax JPMS dependencies.

Relaxed jetty-client JPMS dependencies. Signed-off-by: Simone Bordet <[email protected]>
jetty · Feb 2, 2023 · cd5031b · cd5031b
1 parent c939133
commit cd5031b
Show file tree

Hide file tree

Showing 70 changed files with 154 additions and 159 deletions.
diff --git a/jetty-core/jetty-client/src/main/java/module-info.java b/jetty-core/jetty-client/src/main/java/module-info.java
@@ -22,16 +22,12 @@
     requires static java.management;
     // Only required if using SPNEGO.
     requires static java.security.jgss;
+    // Only required if using JMX.
     requires static org.eclipse.jetty.jmx;
 
     exports org.eclipse.jetty.client;
     exports org.eclipse.jetty.client.transport;
 
     exports org.eclipse.jetty.client.jmx to
         org.eclipse.jetty.jmx;
-
-    exports org.eclipse.jetty.client.internal to
-        org.eclipse.jetty.fcgi.client,
-        org.eclipse.jetty.http2.client.transport,
-        org.eclipse.jetty.http3.client.transport;
 }
diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractConnectionPool.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import org.eclipse.jetty.client.internal.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 import org.eclipse.jetty.util.Attachable;
 import org.eclipse.jetty.util.IO;
 import org.eclipse.jetty.util.NanoTime;

diff --git a/...y-client/src/main/java/org/eclipse/jetty/client/AbstractConnectorHttpClientTransport.java b/...y-client/src/main/java/org/eclipse/jetty/client/AbstractConnectorHttpClientTransport.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.eclipse.jetty.client.internal.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.Promise;
 import org.eclipse.jetty.util.annotation.ManagedAttribute;

diff --git a/...re/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java b/...re/jetty-client/src/main/java/org/eclipse/jetty/client/AuthenticationProtocolHandler.java
@@ -25,9 +25,9 @@
 
 import org.eclipse.jetty.client.Authentication.HeaderInfo;
 import org.eclipse.jetty.client.internal.HttpContentResponse;
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpRequest;
-import org.eclipse.jetty.client.internal.ResponseNotifier;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpRequest;
+import org.eclipse.jetty.client.transport.ResponseNotifier;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ContinueProtocolHandler.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/ContinueProtocolHandler.java
@@ -16,10 +16,10 @@
 import java.util.List;
 
 import org.eclipse.jetty.client.internal.HttpContentResponse;
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpExchange;
-import org.eclipse.jetty.client.internal.HttpRequest;
-import org.eclipse.jetty.client.internal.ResponseNotifier;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpExchange;
+import org.eclipse.jetty.client.transport.HttpRequest;
+import org.eclipse.jetty.client.transport.ResponseNotifier;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpHeaderValue;
 import org.eclipse.jetty.http.HttpStatus;

diff --git a/...y-core/jetty-client/src/main/java/org/eclipse/jetty/client/EarlyHintsProtocolHandler.java b/...y-core/jetty-client/src/main/java/org/eclipse/jetty/client/EarlyHintsProtocolHandler.java
@@ -16,10 +16,10 @@
 import java.util.List;
 
 import org.eclipse.jetty.client.internal.HttpContentResponse;
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpExchange;
-import org.eclipse.jetty.client.internal.HttpRequest;
-import org.eclipse.jetty.client.internal.ResponseNotifier;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpExchange;
+import org.eclipse.jetty.client.transport.HttpRequest;
+import org.eclipse.jetty.client.transport.ResponseNotifier;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpStatus;
 

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
@@ -38,10 +38,10 @@
 import java.util.concurrent.TimeoutException;
 
 import org.eclipse.jetty.client.internal.HttpAuthenticationStore;
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpDestination;
-import org.eclipse.jetty.client.internal.HttpRequest;
 import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpRequest;
 import org.eclipse.jetty.http.HttpCompliance;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClientTransport.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpClientTransport.java
@@ -17,7 +17,7 @@
 import java.net.SocketAddress;
 import java.util.Map;
 
-import org.eclipse.jetty.client.internal.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 import org.eclipse.jetty.io.ClientConnectionFactory;
 
 /**

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpProxy.java
@@ -21,10 +21,10 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpDestination;
-import org.eclipse.jetty.client.internal.HttpRequest;
 import org.eclipse.jetty.client.internal.TunnelRequest;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpRequest;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpScheme;

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/HttpRedirector.java
@@ -25,9 +25,9 @@
 import java.util.regex.Pattern;
 
 import org.eclipse.jetty.client.internal.HttpContentResponse;
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpRequest;
-import org.eclipse.jetty.client.internal.ResponseNotifier;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpRequest;
+import org.eclipse.jetty.client.transport.ResponseNotifier;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;

diff --git a/...y-core/jetty-client/src/main/java/org/eclipse/jetty/client/ProcessingProtocolHandler.java b/...y-core/jetty-client/src/main/java/org/eclipse/jetty/client/ProcessingProtocolHandler.java
@@ -16,10 +16,10 @@
 import java.util.List;
 
 import org.eclipse.jetty.client.internal.HttpContentResponse;
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpExchange;
-import org.eclipse.jetty.client.internal.HttpRequest;
-import org.eclipse.jetty.client.internal.ResponseNotifier;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpExchange;
+import org.eclipse.jetty.client.transport.HttpRequest;
+import org.eclipse.jetty.client.transport.ResponseNotifier;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpStatus;
 

diff --git a/...tty-client/src/main/java/org/eclipse/jetty/client/ProxyAuthenticationProtocolHandler.java b/...tty-client/src/main/java/org/eclipse/jetty/client/ProxyAuthenticationProtocolHandler.java
@@ -15,7 +15,7 @@
 
 import java.net.URI;
 
-import org.eclipse.jetty.client.internal.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
 

diff --git a/...y-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java b/...y-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java
@@ -26,7 +26,7 @@
 import java.util.Objects;
 import java.util.concurrent.Executor;
 
-import org.eclipse.jetty.client.internal.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 import org.eclipse.jetty.io.AbstractConnection;
 import org.eclipse.jetty.io.ClientConnectionFactory;
 import org.eclipse.jetty.io.Connection;

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/Socks4Proxy.java
@@ -23,7 +23,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.eclipse.jetty.client.internal.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpDestination;
 import org.eclipse.jetty.io.AbstractConnection;
 import org.eclipse.jetty.io.ClientConnectionFactory;
 import org.eclipse.jetty.io.ClientConnector;

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/UpgradeProtocolHandler.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/UpgradeProtocolHandler.java
@@ -15,10 +15,10 @@
 
 import java.util.List;
 
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpRequest;
-import org.eclipse.jetty.client.internal.HttpResponse;
-import org.eclipse.jetty.client.internal.ResponseNotifier;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpRequest;
+import org.eclipse.jetty.client.transport.HttpResponse;
+import org.eclipse.jetty.client.transport.ResponseNotifier;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;

diff --git a/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/internal/TunnelRequest.java b/jetty-core/jetty-client/src/main/java/org/eclipse/jetty/client/internal/TunnelRequest.java
@@ -17,6 +17,8 @@
 
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.Origin;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpRequest;
 
 public class TunnelRequest extends HttpRequest
 {

diff --git a/...se/jetty/client/internal/HttpChannel.java → ...e/jetty/client/transport/HttpChannel.java b/...se/jetty/client/internal/HttpChannel.java → ...e/jetty/client/transport/HttpChannel.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import org.eclipse.jetty.client.Result;
 import org.eclipse.jetty.io.CyclicTimeouts;

diff --git a/...y-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportDynamic.java b/...y-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportDynamic.java
@@ -33,8 +33,6 @@
 import org.eclipse.jetty.client.MultiplexConnectionPool;
 import org.eclipse.jetty.client.Origin;
 import org.eclipse.jetty.client.Request;
-import org.eclipse.jetty.client.internal.HttpDestination;
-import org.eclipse.jetty.client.internal.HttpRequest;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.io.ClientConnectionFactory;

diff --git a/...-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportOverHTTP.java b/...-client/src/main/java/org/eclipse/jetty/client/transport/HttpClientTransportOverHTTP.java
@@ -23,7 +23,6 @@
 import org.eclipse.jetty.client.DuplexConnectionPool;
 import org.eclipse.jetty.client.Origin;
 import org.eclipse.jetty.client.Request;
-import org.eclipse.jetty.client.internal.HttpDestination;
 import org.eclipse.jetty.io.ClientConnectionFactory;
 import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.io.EndPoint;

diff --git a/...jetty/client/internal/HttpConnection.java → ...etty/client/transport/HttpConnection.java b/...jetty/client/internal/HttpConnection.java → ...etty/client/transport/HttpConnection.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.net.CookieStore;
 import java.net.HttpCookie;

diff --git a/...tty/client/internal/HttpConversation.java → ...ty/client/transport/HttpConversation.java b/...tty/client/internal/HttpConversation.java → ...ty/client/transport/HttpConversation.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.util.ArrayList;
 import java.util.Deque;
@@ -22,12 +22,12 @@
 import org.eclipse.jetty.client.RedirectProtocolHandler;
 import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.client.Response;
-import org.eclipse.jetty.util.AttributesMap;
+import org.eclipse.jetty.util.Attributes;
 import org.eclipse.jetty.util.Promise;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class HttpConversation extends AttributesMap
+public class HttpConversation extends Attributes.Lazy
 {
     private static final Logger LOG = LoggerFactory.getLogger(HttpConversation.class);
 

diff --git a/...etty/client/internal/HttpDestination.java → ...tty/client/transport/HttpDestination.java b/...etty/client/internal/HttpDestination.java → ...tty/client/transport/HttpDestination.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.io.IOException;
 import java.nio.channels.AsynchronousCloseException;

diff --git a/...e/jetty/client/internal/HttpExchange.java → .../jetty/client/transport/HttpExchange.java b/...e/jetty/client/internal/HttpExchange.java → .../jetty/client/transport/HttpExchange.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.util.List;
 

diff --git a/...e/jetty/client/internal/HttpReceiver.java → .../jetty/client/transport/HttpReceiver.java b/...e/jetty/client/internal/HttpReceiver.java → .../jetty/client/transport/HttpReceiver.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.net.URI;
 import java.util.List;

diff --git a/...se/jetty/client/internal/HttpRequest.java → ...e/jetty/client/transport/HttpRequest.java b/...se/jetty/client/internal/HttpRequest.java → ...e/jetty/client/transport/HttpRequest.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.io.IOException;
 import java.net.HttpCookie;

diff --git a/...e/jetty/client/internal/HttpResponse.java → .../jetty/client/transport/HttpResponse.java b/...e/jetty/client/internal/HttpResponse.java → .../jetty/client/transport/HttpResponse.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...pse/jetty/client/internal/HttpSender.java → ...se/jetty/client/transport/HttpSender.java b/...pse/jetty/client/internal/HttpSender.java → ...se/jetty/client/transport/HttpSender.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.net.URI;
 import java.nio.ByteBuffer;

diff --git a/...se/jetty/client/internal/IConnection.java → ...e/jetty/client/transport/IConnection.java b/...se/jetty/client/internal/IConnection.java → ...e/jetty/client/transport/IConnection.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import org.eclipse.jetty.client.Connection;
 

diff --git a/...etty/client/internal/RequestNotifier.java → ...tty/client/transport/RequestNotifier.java b/...etty/client/internal/RequestNotifier.java → ...tty/client/transport/RequestNotifier.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.nio.ByteBuffer;
 import java.util.List;

diff --git a/...tty/client/internal/ResponseNotifier.java → ...ty/client/transport/ResponseNotifier.java b/...tty/client/internal/ResponseNotifier.java → ...ty/client/transport/ResponseNotifier.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 import java.nio.ByteBuffer;
 import java.util.Iterator;

diff --git a/...se/jetty/client/internal/SendFailure.java → ...e/jetty/client/transport/SendFailure.java b/...se/jetty/client/internal/SendFailure.java → ...e/jetty/client/transport/SendFailure.java
@@ -11,7 +11,7 @@
 // ========================================================================
 //
 
-package org.eclipse.jetty.client.internal;
+package org.eclipse.jetty.client.transport;
 
 public class SendFailure
 {

diff --git a/...client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpChannelOverHTTP.java b/...client/src/main/java/org/eclipse/jetty/client/transport/internal/HttpChannelOverHTTP.java
@@ -17,8 +17,8 @@
 
 import org.eclipse.jetty.client.Response;
 import org.eclipse.jetty.client.Result;
-import org.eclipse.jetty.client.internal.HttpChannel;
-import org.eclipse.jetty.client.internal.HttpExchange;
+import org.eclipse.jetty.client.transport.HttpChannel;
+import org.eclipse.jetty.client.transport.HttpExchange;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpHeaderValue;

diff --git a/...ent/src/main/java/org/eclipse/jetty/client/transport/internal/HttpConnectionOverHTTP.java b/...ent/src/main/java/org/eclipse/jetty/client/transport/internal/HttpConnectionOverHTTP.java
@@ -29,15 +29,15 @@
 import org.eclipse.jetty.client.HttpUpgrader;
 import org.eclipse.jetty.client.Request;
 import org.eclipse.jetty.client.Response;
-import org.eclipse.jetty.client.internal.HttpChannel;
-import org.eclipse.jetty.client.internal.HttpConnection;
-import org.eclipse.jetty.client.internal.HttpConversation;
-import org.eclipse.jetty.client.internal.HttpDestination;
-import org.eclipse.jetty.client.internal.HttpExchange;
-import org.eclipse.jetty.client.internal.HttpRequest;
-import org.eclipse.jetty.client.internal.IConnection;
-import org.eclipse.jetty.client.internal.SendFailure;
 import org.eclipse.jetty.client.internal.TunnelRequest;
+import org.eclipse.jetty.client.transport.HttpChannel;
+import org.eclipse.jetty.client.transport.HttpConnection;
+import org.eclipse.jetty.client.transport.HttpConversation;
+import org.eclipse.jetty.client.transport.HttpDestination;
+import org.eclipse.jetty.client.transport.HttpExchange;
+import org.eclipse.jetty.client.transport.HttpRequest;
+import org.eclipse.jetty.client.transport.IConnection;
+import org.eclipse.jetty.client.transport.SendFailure;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.io.AbstractConnection;

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
@@ -20,10 +20,10 @@
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.HttpResponseException;
-import org.eclipse.jetty.client.internal.HttpExchange;
-import org.eclipse.jetty.client.internal.HttpReceiver;
-import org.eclipse.jetty.client.internal.HttpResponse;
 import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.client.transport.HttpExchange;
+import org.eclipse.jetty.client.transport.HttpReceiver;
+import org.eclipse.jetty.client.transport.HttpResponse;
 import org.eclipse.jetty.http.BadMessageException;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpMethod;