diff --git a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http3/HTTP3ClientDocs.java b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http3/HTTP3ClientDocs.java index 662290409888..d285b654279e 100644 --- a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http3/HTTP3ClientDocs.java +++ b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/client/http3/HTTP3ClientDocs.java @@ -27,12 +27,12 @@ import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import static java.lang.System.Logger.Level.INFO; diff --git a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http3/HTTP3ServerDocs.java b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http3/HTTP3ServerDocs.java index 776fe5befa62..42cbc0eed189 100644 --- a/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http3/HTTP3ServerDocs.java +++ b/documentation/jetty-documentation/src/main/java/org/eclipse/jetty/docs/programming/server/http3/HTTP3ServerDocs.java @@ -24,11 +24,11 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.eclipse.jetty.http3.server.HTTP3ServerConnector; import org.eclipse.jetty.http3.server.RawHTTP3ServerConnectionFactory; import org.eclipse.jetty.server.Server; diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/HttpClientTransportOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/HttpClientTransportOverHTTP3.java index dcdbeb8a22e9..b9586f049ebf 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/HttpClientTransportOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/HttpClientTransportOverHTTP3.java @@ -31,7 +31,7 @@ import org.eclipse.jetty.http3.HTTP3Configuration; import org.eclipse.jetty.http3.client.HTTP3Client; import org.eclipse.jetty.http3.client.HTTP3ClientConnectionFactory; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; import org.eclipse.jetty.http3.client.transport.internal.HttpConnectionOverHTTP3; import org.eclipse.jetty.http3.client.transport.internal.SessionClientListener; import org.eclipse.jetty.io.ClientConnector; diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpChannelOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpChannelOverHTTP3.java index 5b47c58edfeb..fa151b8e5e1d 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpChannelOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpChannelOverHTTP3.java @@ -18,9 +18,9 @@ import org.eclipse.jetty.client.transport.HttpExchange; import org.eclipse.jetty.client.transport.HttpReceiver; import org.eclipse.jetty.client.transport.HttpSender; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.api.Stream; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; public class HttpChannelOverHTTP3 extends HttpChannel { diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpConnectionOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpConnectionOverHTTP3.java index 58876931cb66..e95eb664ac7e 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpConnectionOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpConnectionOverHTTP3.java @@ -28,7 +28,7 @@ import org.eclipse.jetty.client.transport.HttpRequest; import org.eclipse.jetty.client.transport.SendFailure; import org.eclipse.jetty.http.HttpVersion; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java index d970d74cfd0d..a87966e462c2 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpReceiverOverHTTP3.java @@ -21,9 +21,9 @@ import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.eclipse.jetty.io.Content; import org.eclipse.jetty.util.Promise; import org.slf4j.Logger; diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpSenderOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpSenderOverHTTP3.java index 9996f0bf09c7..2ecb1c784f60 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpSenderOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/HttpSenderOverHTTP3.java @@ -27,11 +27,11 @@ import org.eclipse.jetty.http.HttpURI; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3Stream; import org.eclipse.jetty.http3.api.Stream; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3Stream; import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; diff --git a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/SessionClientListener.java b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/SessionClientListener.java index 57fc825504bd..07ca4be94ae3 100644 --- a/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/SessionClientListener.java +++ b/jetty-core/jetty-http3/jetty-http3-client-transport/src/main/java/org/eclipse/jetty/http3/client/transport/internal/SessionClientListener.java @@ -22,10 +22,10 @@ import org.eclipse.jetty.client.Destination; import org.eclipse.jetty.client.HttpClientTransport; import org.eclipse.jetty.client.transport.HttpDestination; +import org.eclipse.jetty.http3.HTTP3Session; import org.eclipse.jetty.http3.api.Session; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.HTTP3Session; import org.eclipse.jetty.util.Promise; public class SessionClientListener implements Session.Client.Listener diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/module-info.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/module-info.java index 42f0617c5103..921e499d3f10 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/module-info.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/module-info.java @@ -23,7 +23,4 @@ requires transitive org.eclipse.jetty.util; exports org.eclipse.jetty.http3.client; - - exports org.eclipse.jetty.http3.client.internal to - org.eclipse.jetty.http3.client.transport; } diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientHTTP3Session.java similarity index 93% rename from jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientHTTP3Session.java index 07c003cbe8b5..382afa5286b8 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3Session.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientHTTP3Session.java @@ -11,23 +11,23 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.internal; +package org.eclipse.jetty.http3.client; import java.util.Map; import java.util.concurrent.CompletableFuture; +import org.eclipse.jetty.http3.ControlFlusher; +import org.eclipse.jetty.http3.DecoderStreamConnection; +import org.eclipse.jetty.http3.EncoderStreamConnection; import org.eclipse.jetty.http3.HTTP3Configuration; +import org.eclipse.jetty.http3.HTTP3ErrorCode; +import org.eclipse.jetty.http3.InstructionFlusher; +import org.eclipse.jetty.http3.InstructionHandler; +import org.eclipse.jetty.http3.MessageFlusher; +import org.eclipse.jetty.http3.UnidirectionalStreamConnection; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.frames.Frame; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.ControlFlusher; -import org.eclipse.jetty.http3.internal.DecoderStreamConnection; -import org.eclipse.jetty.http3.internal.EncoderStreamConnection; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; -import org.eclipse.jetty.http3.internal.InstructionFlusher; -import org.eclipse.jetty.http3.internal.InstructionHandler; -import org.eclipse.jetty.http3.internal.MessageFlusher; -import org.eclipse.jetty.http3.internal.UnidirectionalStreamConnection; import org.eclipse.jetty.http3.qpack.QpackDecoder; import org.eclipse.jetty.http3.qpack.QpackEncoder; import org.eclipse.jetty.io.RetainableByteBufferPool; diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java index 4f08848cf338..bbfe374dff4d 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3Client.java @@ -21,7 +21,6 @@ import org.eclipse.jetty.http3.HTTP3Configuration; import org.eclipse.jetty.http3.api.Session; -import org.eclipse.jetty.http3.client.internal.ClientHTTP3Session; import org.eclipse.jetty.io.ClientConnector; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.DatagramChannelEndPoint; diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java index a180516e4122..88e68e880495 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3ClientConnectionFactory.java @@ -16,9 +16,8 @@ import java.util.Map; import org.eclipse.jetty.http3.api.Session; -import org.eclipse.jetty.http3.client.internal.ClientHTTP3Session; import org.eclipse.jetty.http3.client.internal.ClientHTTP3StreamConnection; -import org.eclipse.jetty.http3.internal.parser.MessageParser; +import org.eclipse.jetty.http3.parser.MessageParser; import org.eclipse.jetty.io.ClientConnectionFactory; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3SessionClient.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3SessionClient.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3SessionClient.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3SessionClient.java index 92c1f3325d40..e9f44efbea4b 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3SessionClient.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3SessionClient.java @@ -11,17 +11,17 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.internal; +package org.eclipse.jetty.http3.client; import java.util.concurrent.CompletableFuture; +import org.eclipse.jetty.http3.HTTP3ErrorCode; +import org.eclipse.jetty.http3.HTTP3Session; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.Frame; import org.eclipse.jetty.http3.frames.GoAwayFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; -import org.eclipse.jetty.http3.internal.HTTP3Session; import org.eclipse.jetty.quic.common.ProtocolSession; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; import org.eclipse.jetty.quic.common.StreamType; diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3StreamClient.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3StreamClient.java similarity index 96% rename from jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3StreamClient.java rename to jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3StreamClient.java index 552ecb1cdac2..c87f0ed000e5 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/HTTP3StreamClient.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/HTTP3StreamClient.java @@ -11,17 +11,17 @@ // ======================================================================== // -package org.eclipse.jetty.http3.client.internal; +package org.eclipse.jetty.http3.client; import java.util.EnumSet; import java.util.concurrent.TimeoutException; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3Session; +import org.eclipse.jetty.http3.HTTP3Stream; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3Session; -import org.eclipse.jetty.http3.internal.HTTP3Stream; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; import org.eclipse.jetty.util.Promise; import org.slf4j.Logger; diff --git a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java index 15cdbf200339..709a18f034f7 100644 --- a/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-client/src/main/java/org/eclipse/jetty/http3/client/internal/ClientHTTP3StreamConnection.java @@ -13,8 +13,9 @@ package org.eclipse.jetty.http3.client.internal; -import org.eclipse.jetty.http3.internal.HTTP3StreamConnection; -import org.eclipse.jetty.http3.internal.parser.MessageParser; +import org.eclipse.jetty.http3.HTTP3StreamConnection; +import org.eclipse.jetty.http3.client.ClientHTTP3Session; +import org.eclipse.jetty.http3.parser.MessageParser; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; public class ClientHTTP3StreamConnection extends HTTP3StreamConnection diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/module-info.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/module-info.java index aa0a206cae24..51b05540406d 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/module-info.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/module-info.java @@ -24,15 +24,6 @@ exports org.eclipse.jetty.http3; exports org.eclipse.jetty.http3.api; exports org.eclipse.jetty.http3.frames; - - exports org.eclipse.jetty.http3.internal to - org.eclipse.jetty.http3.client, - org.eclipse.jetty.http3.server, - org.eclipse.jetty.http3.client.transport; - exports org.eclipse.jetty.http3.internal.generator to - org.eclipse.jetty.http3.client, - org.eclipse.jetty.http3.server; - exports org.eclipse.jetty.http3.internal.parser to - org.eclipse.jetty.http3.client, - org.eclipse.jetty.http3.server; + exports org.eclipse.jetty.http3.generator; + exports org.eclipse.jetty.http3.parser; } diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java similarity index 96% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlFlusher.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java index 15e36b7fe975..793d0b861bdd 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlFlusher.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/ControlFlusher.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.nio.ByteBuffer; import java.util.ArrayDeque; @@ -20,7 +20,9 @@ import java.util.Queue; import org.eclipse.jetty.http3.frames.Frame; -import org.eclipse.jetty.http3.internal.generator.ControlGenerator; +import org.eclipse.jetty.http3.generator.ControlGenerator; +import org.eclipse.jetty.http3.internal.ControlStreamConnection; +import org.eclipse.jetty.http3.internal.VarLenInt; import org.eclipse.jetty.io.RetainableByteBuffer; import org.eclipse.jetty.io.RetainableByteBufferPool; import org.eclipse.jetty.quic.common.QuicSession; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/DecoderStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/DecoderStreamConnection.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/DecoderStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/DecoderStreamConnection.java index cfff5bc350be..81085a09de71 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/DecoderStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/DecoderStreamConnection.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.nio.ByteBuffer; import java.util.concurrent.Executor; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/EncoderStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/EncoderStreamConnection.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/EncoderStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/EncoderStreamConnection.java index fbc29ce3f239..990c8cab352a 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/EncoderStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/EncoderStreamConnection.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.nio.ByteBuffer; import java.util.concurrent.Executor; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3ErrorCode.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3ErrorCode.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3ErrorCode.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3ErrorCode.java index 3a7bfa7e9ea2..0e9a0c495d72 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3ErrorCode.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3ErrorCode.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.util.concurrent.ThreadLocalRandom; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Session.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Session.java similarity index 99% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Session.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Session.java index b8d9332a564f..a38d3c7e687d 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Session.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Session.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.io.IOException; import java.net.SocketAddress; @@ -36,7 +36,7 @@ import org.eclipse.jetty.http3.frames.GoAwayFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.parser.ParserListener; +import org.eclipse.jetty.http3.parser.ParserListener; import org.eclipse.jetty.io.CyclicTimeouts; import org.eclipse.jetty.quic.common.ProtocolSession; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Stream.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Stream.java similarity index 99% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Stream.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Stream.java index 4e1dfc71da94..778d23cb7f2e 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3Stream.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3Stream.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.util.EnumSet; import java.util.concurrent.CompletableFuture; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3StreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3StreamConnection.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3StreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3StreamConnection.java index bafd858f8b48..81ab895bc791 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/HTTP3StreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/HTTP3StreamConnection.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.io.IOException; import java.io.UncheckedIOException; @@ -24,8 +24,8 @@ import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.parser.MessageParser; -import org.eclipse.jetty.http3.internal.parser.ParserListener; +import org.eclipse.jetty.http3.parser.MessageParser; +import org.eclipse.jetty.http3.parser.ParserListener; import org.eclipse.jetty.io.AbstractConnection; import org.eclipse.jetty.io.RetainableByteBuffer; import org.eclipse.jetty.io.RetainableByteBufferPool; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionFlusher.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java index d6808aa9523f..7585471aa539 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionFlusher.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionFlusher.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.nio.ByteBuffer; import java.util.ArrayDeque; @@ -19,6 +19,7 @@ import java.util.List; import java.util.Queue; +import org.eclipse.jetty.http3.internal.VarLenInt; import org.eclipse.jetty.http3.qpack.Instruction; import org.eclipse.jetty.io.RetainableByteBuffer; import org.eclipse.jetty.io.RetainableByteBufferPool; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionHandler.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionHandler.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionHandler.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionHandler.java index 7d658c470db9..0c850139383a 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionHandler.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionHandler.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.util.List; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionStreamConnection.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionStreamConnection.java index 2f96607226e0..2af6820f8cbb 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/InstructionStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/InstructionStreamConnection.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.nio.ByteBuffer; import java.util.concurrent.Executor; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/MessageFlusher.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/MessageFlusher.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java index d19405c0414e..3e75135088a0 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/MessageFlusher.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/MessageFlusher.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.nio.ByteBuffer; import java.util.ArrayDeque; @@ -19,7 +19,7 @@ import java.util.Queue; import org.eclipse.jetty.http3.frames.Frame; -import org.eclipse.jetty.http3.internal.generator.MessageGenerator; +import org.eclipse.jetty.http3.generator.MessageGenerator; import org.eclipse.jetty.http3.qpack.QpackEncoder; import org.eclipse.jetty.io.RetainableByteBufferPool; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/UnidirectionalStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/UnidirectionalStreamConnection.java similarity index 96% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/UnidirectionalStreamConnection.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/UnidirectionalStreamConnection.java index 6bf48e18a6df..bc4451a4176c 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/UnidirectionalStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/UnidirectionalStreamConnection.java @@ -11,13 +11,15 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal; +package org.eclipse.jetty.http3; import java.nio.ByteBuffer; import java.util.concurrent.Executor; -import org.eclipse.jetty.http3.internal.parser.ControlParser; -import org.eclipse.jetty.http3.internal.parser.ParserListener; +import org.eclipse.jetty.http3.internal.ControlStreamConnection; +import org.eclipse.jetty.http3.internal.VarLenInt; +import org.eclipse.jetty.http3.parser.ControlParser; +import org.eclipse.jetty.http3.parser.ParserListener; import org.eclipse.jetty.http3.qpack.QpackDecoder; import org.eclipse.jetty.http3.qpack.QpackEncoder; import org.eclipse.jetty.io.AbstractConnection; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/CancelPushGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/CancelPushGenerator.java similarity index 95% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/CancelPushGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/CancelPushGenerator.java index 50928293195a..55237a1fbcee 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/CancelPushGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/CancelPushGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/ControlGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/ControlGenerator.java similarity index 96% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/ControlGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/ControlGenerator.java index c1347dbe438f..ec9abad6b269 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/ControlGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/ControlGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/DataGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/DataGenerator.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/DataGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/DataGenerator.java index ec1909c30fcc..05a808f353a3 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/DataGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/DataGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.nio.ByteBuffer; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/FrameGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/FrameGenerator.java similarity index 95% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/FrameGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/FrameGenerator.java index c8621209c0cd..9154b60bf540 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/FrameGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/FrameGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/GoAwayGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/GoAwayGenerator.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/GoAwayGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/GoAwayGenerator.java index 97715c2249fe..90c1ba551dff 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/GoAwayGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/GoAwayGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.nio.ByteBuffer; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/HeadersGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/HeadersGenerator.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/HeadersGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/HeadersGenerator.java index b27784d89daa..3b6a4436fefa 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/HeadersGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/HeadersGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.nio.ByteBuffer; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MaxPushIdGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/MaxPushIdGenerator.java similarity index 95% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MaxPushIdGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/MaxPushIdGenerator.java index 323bbdf29c98..bf2cc54d055c 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MaxPushIdGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/MaxPushIdGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MessageGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/MessageGenerator.java similarity index 96% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MessageGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/MessageGenerator.java index a0339f7d3443..a5f5744907f5 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/MessageGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/MessageGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/PushPromiseGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/PushPromiseGenerator.java similarity index 95% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/PushPromiseGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/PushPromiseGenerator.java index 2a8491066814..ebf95c3cdf6d 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/PushPromiseGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/PushPromiseGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.util.function.Consumer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/SettingsGenerator.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/SettingsGenerator.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/SettingsGenerator.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/SettingsGenerator.java index 6e200195e752..4caf1537bad0 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/generator/SettingsGenerator.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/generator/SettingsGenerator.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.generator; +package org.eclipse.jetty.http3.generator; import java.nio.ByteBuffer; import java.util.Map; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java index 7e0aa7baab8a..c3152c465639 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/ControlStreamConnection.java @@ -16,7 +16,7 @@ import java.nio.ByteBuffer; import java.util.concurrent.Executor; -import org.eclipse.jetty.http3.internal.parser.ControlParser; +import org.eclipse.jetty.http3.parser.ControlParser; import org.eclipse.jetty.io.AbstractConnection; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.io.EndPoint; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/BodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/BodyParser.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/BodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/BodyParser.java index f01da653de40..8273ec71b50e 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/BodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/BodyParser.java @@ -11,14 +11,14 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.io.IOException; import java.nio.ByteBuffer; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.frames.GoAwayFrame; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.eclipse.jetty.util.BufferUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/CancelPushBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/CancelPushBodyParser.java similarity index 94% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/CancelPushBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/CancelPushBodyParser.java index 690ea5c51e35..cc2deb0193bf 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/CancelPushBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/CancelPushBodyParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ControlParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ControlParser.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ControlParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ControlParser.java index eaa6a22935a2..2b0cd98bdce7 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ControlParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ControlParser.java @@ -11,13 +11,13 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.io.IOException; import java.nio.ByteBuffer; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.frames.FrameType; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/DataBodyParser.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/DataBodyParser.java index 0a09e108b6b6..8c85f376b0fe 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/DataBodyParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; import java.util.function.BooleanSupplier; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/GoAwayBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/GoAwayBodyParser.java similarity index 96% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/GoAwayBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/GoAwayBodyParser.java index 0c874155b6fd..9d97fe26f238 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/GoAwayBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/GoAwayBodyParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeaderParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeaderParser.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeaderParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeaderParser.java index 3eae8e91dbea..e852356f7bdc 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeaderParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeaderParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeadersBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeadersBodyParser.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeadersBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeadersBodyParser.java index 7a3faeb2c4a0..f3b2252da03a 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/HeadersBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/HeadersBodyParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -19,8 +19,8 @@ import java.util.function.BooleanSupplier; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.eclipse.jetty.http3.qpack.QpackDecoder; import org.eclipse.jetty.http3.qpack.QpackException; import org.slf4j.Logger; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MaxPushIdBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MaxPushIdBodyParser.java similarity index 94% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MaxPushIdBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MaxPushIdBodyParser.java index c6f669346386..1bb041cbc7fe 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MaxPushIdBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MaxPushIdBodyParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MessageParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MessageParser.java similarity index 98% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MessageParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MessageParser.java index 309865583d6c..7bedf89276c1 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/MessageParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/MessageParser.java @@ -11,15 +11,15 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.io.IOException; import java.nio.ByteBuffer; import java.util.function.BooleanSupplier; import java.util.function.UnaryOperator; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.frames.FrameType; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.eclipse.jetty.http3.qpack.QpackDecoder; import org.eclipse.jetty.util.BufferUtil; import org.slf4j.Logger; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ParserListener.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ParserListener.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ParserListener.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ParserListener.java index fc90214ff110..ce5eaa6cd27d 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/ParserListener.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/ParserListener.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.GoAwayFrame; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/PushPromiseBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/PushPromiseBodyParser.java similarity index 94% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/PushPromiseBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/PushPromiseBodyParser.java index a9d672ad8aac..aabed69d3146 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/PushPromiseBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/PushPromiseBodyParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/SettingsBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/SettingsBodyParser.java similarity index 97% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/SettingsBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/SettingsBodyParser.java index 157684533721..504b41ce0587 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/SettingsBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/SettingsBodyParser.java @@ -11,14 +11,14 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; import java.util.LinkedHashMap; import java.util.Map; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.eclipse.jetty.http3.internal.VarLenInt; public class SettingsBodyParser extends BodyParser diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/UnknownBodyParser.java b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/UnknownBodyParser.java similarity index 96% rename from jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/UnknownBodyParser.java rename to jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/UnknownBodyParser.java index ccad38e6177a..01092ddd3b98 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/UnknownBodyParser.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/main/java/org/eclipse/jetty/http3/parser/UnknownBodyParser.java @@ -11,7 +11,7 @@ // ======================================================================== // -package org.eclipse.jetty.http3.internal.parser; +package org.eclipse.jetty.http3.parser; import java.nio.ByteBuffer; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java index 3adbb3c5454f..f0e003d48ef0 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/DataGenerateParseTest.java @@ -20,9 +20,9 @@ import java.util.function.UnaryOperator; import org.eclipse.jetty.http3.frames.DataFrame; -import org.eclipse.jetty.http3.internal.generator.MessageGenerator; -import org.eclipse.jetty.http3.internal.parser.MessageParser; -import org.eclipse.jetty.http3.internal.parser.ParserListener; +import org.eclipse.jetty.http3.generator.MessageGenerator; +import org.eclipse.jetty.http3.parser.MessageParser; +import org.eclipse.jetty.http3.parser.ParserListener; import org.eclipse.jetty.io.RetainableByteBufferPool; import org.eclipse.jetty.util.BufferUtil; import org.junit.jupiter.api.Test; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java index d0eae5c137c1..a3d1dfd0903a 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/GoAwayGenerateParseTest.java @@ -18,9 +18,9 @@ import java.util.List; import org.eclipse.jetty.http3.frames.GoAwayFrame; -import org.eclipse.jetty.http3.internal.generator.ControlGenerator; -import org.eclipse.jetty.http3.internal.parser.ControlParser; -import org.eclipse.jetty.http3.internal.parser.ParserListener; +import org.eclipse.jetty.http3.generator.ControlGenerator; +import org.eclipse.jetty.http3.parser.ControlParser; +import org.eclipse.jetty.http3.parser.ParserListener; import org.eclipse.jetty.io.RetainableByteBufferPool; import org.junit.jupiter.api.Test; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java index 436c8799899d..45e2e181ca38 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/HeadersGenerateParseTest.java @@ -24,9 +24,9 @@ import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.generator.MessageGenerator; -import org.eclipse.jetty.http3.internal.parser.MessageParser; -import org.eclipse.jetty.http3.internal.parser.ParserListener; +import org.eclipse.jetty.http3.generator.MessageGenerator; +import org.eclipse.jetty.http3.parser.MessageParser; +import org.eclipse.jetty.http3.parser.ParserListener; import org.eclipse.jetty.http3.qpack.QpackDecoder; import org.eclipse.jetty.http3.qpack.QpackEncoder; import org.eclipse.jetty.io.RetainableByteBufferPool; diff --git a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java index 7af1c72f48aa..38664034d3ba 100644 --- a/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java +++ b/jetty-core/jetty-http3/jetty-http3-common/src/test/java/org/eclipse/jetty/http3/internal/SettingsGenerateParseTest.java @@ -19,9 +19,9 @@ import java.util.Map; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.generator.ControlGenerator; -import org.eclipse.jetty.http3.internal.parser.ControlParser; -import org.eclipse.jetty.http3.internal.parser.ParserListener; +import org.eclipse.jetty.http3.generator.ControlGenerator; +import org.eclipse.jetty.http3.parser.ControlParser; +import org.eclipse.jetty.http3.parser.ParserListener; import org.eclipse.jetty.io.RetainableByteBufferPool; import org.junit.jupiter.api.Test; diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java index 79186e21af1b..d2c7a501ebbb 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/AbstractHTTP3ServerConnectionFactory.java @@ -18,7 +18,7 @@ import org.eclipse.jetty.http3.HTTP3Configuration; import org.eclipse.jetty.http3.api.Session; -import org.eclipse.jetty.http3.internal.parser.MessageParser; +import org.eclipse.jetty.http3.parser.MessageParser; import org.eclipse.jetty.http3.server.internal.ServerHTTP3Session; import org.eclipse.jetty.http3.server.internal.ServerHTTP3StreamConnection; import org.eclipse.jetty.io.Connection; diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java index d588addb47f5..069262e211b6 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/HTTP3ServerConnectionFactory.java @@ -17,10 +17,10 @@ import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpVersion; +import org.eclipse.jetty.http3.HTTP3Stream; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3Stream; import org.eclipse.jetty.http3.server.internal.HTTP3StreamServer; import org.eclipse.jetty.http3.server.internal.HttpStreamOverHTTP3; import org.eclipse.jetty.http3.server.internal.ServerHTTP3Session; diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java index 02af205db982..bb4fafd40a69 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3SessionServer.java @@ -13,11 +13,11 @@ package org.eclipse.jetty.http3.server.internal; +import org.eclipse.jetty.http3.HTTP3Session; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.frames.Frame; import org.eclipse.jetty.http3.frames.GoAwayFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3Session; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; import org.eclipse.jetty.util.Callback; import org.slf4j.Logger; diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java index a1190b381f66..40c07df9680b 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HTTP3StreamServer.java @@ -17,13 +17,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; +import org.eclipse.jetty.http3.HTTP3ErrorCode; +import org.eclipse.jetty.http3.HTTP3Session; +import org.eclipse.jetty.http3.HTTP3Stream; +import org.eclipse.jetty.http3.MessageFlusher; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; -import org.eclipse.jetty.http3.internal.HTTP3Session; -import org.eclipse.jetty.http3.internal.HTTP3Stream; -import org.eclipse.jetty.http3.internal.MessageFlusher; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; import org.eclipse.jetty.util.Callback; import org.eclipse.jetty.util.Promise; diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java index 899db7f305f3..c55b86c886fb 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/HttpStreamOverHTTP3.java @@ -29,10 +29,10 @@ import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; import org.eclipse.jetty.http.Trailers; +import org.eclipse.jetty.http3.HTTP3ErrorCode; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; import org.eclipse.jetty.io.Content; import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.HttpStream; diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java index 8003b737acd5..7b621be3232b 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3Session.java @@ -16,18 +16,18 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; +import org.eclipse.jetty.http3.ControlFlusher; +import org.eclipse.jetty.http3.DecoderStreamConnection; +import org.eclipse.jetty.http3.EncoderStreamConnection; import org.eclipse.jetty.http3.HTTP3Configuration; +import org.eclipse.jetty.http3.HTTP3ErrorCode; +import org.eclipse.jetty.http3.InstructionFlusher; +import org.eclipse.jetty.http3.InstructionHandler; +import org.eclipse.jetty.http3.MessageFlusher; +import org.eclipse.jetty.http3.UnidirectionalStreamConnection; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.frames.Frame; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.ControlFlusher; -import org.eclipse.jetty.http3.internal.DecoderStreamConnection; -import org.eclipse.jetty.http3.internal.EncoderStreamConnection; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; -import org.eclipse.jetty.http3.internal.InstructionFlusher; -import org.eclipse.jetty.http3.internal.InstructionHandler; -import org.eclipse.jetty.http3.internal.MessageFlusher; -import org.eclipse.jetty.http3.internal.UnidirectionalStreamConnection; import org.eclipse.jetty.http3.qpack.QpackDecoder; import org.eclipse.jetty.http3.qpack.QpackEncoder; import org.eclipse.jetty.io.RetainableByteBufferPool; diff --git a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java index 0539977f9625..b80f0526501d 100644 --- a/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java +++ b/jetty-core/jetty-http3/jetty-http3-server/src/main/java/org/eclipse/jetty/http3/server/internal/ServerHTTP3StreamConnection.java @@ -19,10 +19,10 @@ import java.util.function.BiConsumer; import org.eclipse.jetty.http.HttpVersion; +import org.eclipse.jetty.http3.HTTP3Stream; +import org.eclipse.jetty.http3.HTTP3StreamConnection; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3Stream; -import org.eclipse.jetty.http3.internal.HTTP3StreamConnection; -import org.eclipse.jetty.http3.internal.parser.MessageParser; +import org.eclipse.jetty.http3.parser.MessageParser; import org.eclipse.jetty.io.Connection; import org.eclipse.jetty.quic.common.QuicStreamEndPoint; import org.eclipse.jetty.server.ConnectionMetaData; diff --git a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java index e42e03b86b79..04a751e36af7 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java +++ b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/ClientServerTest.java @@ -26,14 +26,14 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3ErrorCode; +import org.eclipse.jetty.http3.HTTP3Session; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; -import org.eclipse.jetty.http3.internal.HTTP3Session; import org.eclipse.jetty.http3.server.AbstractHTTP3ServerConnectionFactory; import org.eclipse.jetty.http3.server.internal.HTTP3SessionServer; import org.eclipse.jetty.quic.client.ClientQuicSession; diff --git a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java index 162b934e7207..281ddc8b7334 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java +++ b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/DataDemandTest.java @@ -28,11 +28,11 @@ import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3Stream; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; -import org.eclipse.jetty.http3.internal.HTTP3Stream; import org.eclipse.jetty.io.Content; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Request; diff --git a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java index 48d94ea4d909..c5a138b16843 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java +++ b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/GoAwayTest.java @@ -25,15 +25,15 @@ import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http3.HTTP3Session; +import org.eclipse.jetty.http3.HTTP3Stream; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.api.Stream; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.GoAwayFrame; import org.eclipse.jetty.http3.frames.HeadersFrame; import org.eclipse.jetty.http3.frames.SettingsFrame; -import org.eclipse.jetty.http3.internal.HTTP3Session; -import org.eclipse.jetty.http3.internal.HTTP3Stream; import org.eclipse.jetty.http3.server.internal.HTTP3SessionServer; import org.eclipse.jetty.quic.client.ClientQuicSession; import org.eclipse.jetty.quic.common.QuicConnection; diff --git a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java index b84c6db39c5b..bfaf7b975ae0 100644 --- a/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java +++ b/jetty-core/jetty-http3/jetty-http3-tests/src/test/java/org/eclipse/jetty/http3/tests/UnexpectedFrameTest.java @@ -17,11 +17,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.eclipse.jetty.http3.HTTP3ErrorCode; +import org.eclipse.jetty.http3.HTTP3Session; import org.eclipse.jetty.http3.api.Session; import org.eclipse.jetty.http3.frames.DataFrame; import org.eclipse.jetty.http3.frames.GoAwayFrame; -import org.eclipse.jetty.http3.internal.HTTP3ErrorCode; -import org.eclipse.jetty.http3.internal.HTTP3Session; import org.eclipse.jetty.util.Callback; import org.junit.jupiter.api.Test; diff --git a/jetty-core/jetty-session/pom.xml b/jetty-core/jetty-session/pom.xml index 90dfccc91533..7924bc7a4c80 100644 --- a/jetty-core/jetty-session/pom.xml +++ b/jetty-core/jetty-session/pom.xml @@ -71,7 +71,7 @@ org.testcontainers - test + testcontainers test diff --git a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpChannelAssociationTest.java b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpChannelAssociationTest.java index 6a051079e315..460804ac4345 100644 --- a/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpChannelAssociationTest.java +++ b/jetty-core/jetty-tests/jetty-test-client-transports/src/test/java/org/eclipse/jetty/test/client/transport/HttpChannelAssociationTest.java @@ -36,7 +36,7 @@ import org.eclipse.jetty.http2.client.transport.internal.HttpChannelOverHTTP2; import org.eclipse.jetty.http2.client.transport.internal.HttpConnectionOverHTTP2; import org.eclipse.jetty.http3.client.HTTP3Client; -import org.eclipse.jetty.http3.client.internal.HTTP3SessionClient; +import org.eclipse.jetty.http3.client.HTTP3SessionClient; import org.eclipse.jetty.http3.client.transport.HttpClientTransportOverHTTP3; import org.eclipse.jetty.http3.client.transport.internal.HttpChannelOverHTTP3; import org.eclipse.jetty.http3.client.transport.internal.HttpConnectionOverHTTP3;