diff --git a/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicConnection.java b/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicConnection.java index 5044f52b8f7..4c46cf24c95 100644 --- a/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicConnection.java +++ b/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicConnection.java @@ -54,7 +54,7 @@ public class ClientQuicConnection extends QuicConnection { InetSocketAddress remoteAddress = (InetSocketAddress)context.get(ClientDatagramConnector.REMOTE_SOCKET_ADDRESS_CONTEXT_KEY); QuicheConnection quicheConnection = QuicheConnection.connect(getQuicheConfig(), remoteAddress); - QuicSession session = new ClientQuicSession(getExecutor(), getScheduler(), getByteBufferPool(), null, quicheConnection, this, remoteAddress, context); + QuicSession session = new ClientQuicSession(getExecutor(), getScheduler(), getByteBufferPool(), quicheConnection, this, remoteAddress, context); pendingSessions.put(remoteAddress, session); session.flush(); // send the response packet(s) that connect generated. if (LOG.isDebugEnabled()) diff --git a/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicSession.java b/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicSession.java index 691de4a08fe..96c2f848768 100644 --- a/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicSession.java +++ b/jetty-http3/http3-client/src/main/java/org/eclipse/jetty/http3/client/ClientQuicSession.java @@ -33,9 +33,9 @@ public class ClientQuicSession extends QuicSession { private final Map context; - protected ClientQuicSession(Executor executor, Scheduler scheduler, ByteBufferPool byteBufferPool, QuicheConnectionId quicheConnectionId, QuicheConnection quicheConnection, QuicConnection connection, InetSocketAddress remoteAddress, Map context) + protected ClientQuicSession(Executor executor, Scheduler scheduler, ByteBufferPool byteBufferPool, QuicheConnection quicheConnection, QuicConnection connection, InetSocketAddress remoteAddress, Map context) { - super(executor, scheduler, byteBufferPool, quicheConnectionId, quicheConnection, connection, remoteAddress); + super(executor, scheduler, byteBufferPool, quicheConnection, connection, remoteAddress); this.context = context; } diff --git a/jetty-http3/http3-client/src/test/java/org/eclipse/jetty/http3/client/End2EndClientTest.java b/jetty-http3/http3-client/src/test/java/org/eclipse/jetty/http3/client/End2EndClientTest.java index 9f50276c4c8..3eacb594d44 100644 --- a/jetty-http3/http3-client/src/test/java/org/eclipse/jetty/http3/client/End2EndClientTest.java +++ b/jetty-http3/http3-client/src/test/java/org/eclipse/jetty/http3/client/End2EndClientTest.java @@ -77,7 +77,7 @@ public class End2EndClientTest } @Test - public void name() throws Exception + public void simple() throws Exception { HttpClientTransportOverQuic transport = new HttpClientTransportOverQuic(); HttpClient client = new HttpClient(transport); diff --git a/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/common/QuicSession.java b/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/common/QuicSession.java index 2fcf8d26db0..e69720297d7 100644 --- a/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/common/QuicSession.java +++ b/jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/common/QuicSession.java @@ -56,11 +56,10 @@ public abstract class QuicSession private InetSocketAddress remoteAddress; private QuicheConnectionId quicheConnectionId; - protected QuicSession(Executor executor, Scheduler scheduler, ByteBufferPool byteBufferPool, QuicheConnectionId quicheConnectionId, QuicheConnection quicheConnection, QuicConnection connection, InetSocketAddress remoteAddress) + protected QuicSession(Executor executor, Scheduler scheduler, ByteBufferPool byteBufferPool, QuicheConnection quicheConnection, QuicConnection connection, InetSocketAddress remoteAddress) { this.scheduler = scheduler; this.byteBufferPool = byteBufferPool; - this.quicheConnectionId = quicheConnectionId; this.quicheConnection = quicheConnection; this.connection = connection; this.remoteAddress = remoteAddress; diff --git a/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicConnection.java b/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicConnection.java index 94227b03b1a..700d0bfe84e 100644 --- a/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicConnection.java +++ b/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicConnection.java @@ -79,7 +79,7 @@ public class ServerQuicConnection extends QuicConnection } else { - QuicSession session = new ServerQuicSession(getExecutor(), getScheduler(), byteBufferPool, null, quicheConnection, this, remoteAddress, connector); + QuicSession session = new ServerQuicSession(getExecutor(), getScheduler(), byteBufferPool, quicheConnection, this, remoteAddress, connector); session.flush(); // send the response packet(s) that tryAccept generated. return session; } diff --git a/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicSession.java b/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicSession.java index 70b25fa9fd9..6dfae24f4fa 100644 --- a/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicSession.java +++ b/jetty-http3/http3-server/src/main/java/org/eclipse/jetty/http3/server/ServerQuicSession.java @@ -32,9 +32,9 @@ public class ServerQuicSession extends QuicSession { private final Connector connector; - protected ServerQuicSession(Executor executor, Scheduler scheduler, ByteBufferPool byteBufferPool, QuicheConnectionId quicheConnectionId, QuicheConnection quicheConnection, QuicConnection connection, InetSocketAddress remoteAddress, Connector connector) + protected ServerQuicSession(Executor executor, Scheduler scheduler, ByteBufferPool byteBufferPool, QuicheConnection quicheConnection, QuicConnection connection, InetSocketAddress remoteAddress, Connector connector) { - super(executor, scheduler, byteBufferPool, quicheConnectionId, quicheConnection, connection, remoteAddress); + super(executor, scheduler, byteBufferPool, quicheConnection, connection, remoteAddress); this.connector = connector; }