rename client datagram connector

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2021-03-23 11:45:33 +01:00 committed by Simone Bordet
parent c562262768
commit 3c1f1d3fe0
4 changed files with 7 additions and 7 deletions

View File

@ -49,7 +49,7 @@ import org.eclipse.jetty.util.thread.Scheduler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class QuicClientConnector extends ContainerLifeCycle implements IClientConnector
public class ClientDatagramConnector extends ContainerLifeCycle implements IClientConnector
{
public static final String CLIENT_CONNECTOR_CONTEXT_KEY = "org.eclipse.jetty.client.connector";
public static final String REMOTE_SOCKET_ADDRESS_CONTEXT_KEY = CLIENT_CONNECTOR_CONTEXT_KEY + ".remoteSocketAddress";
@ -69,7 +69,7 @@ public class QuicClientConnector extends ContainerLifeCycle implements IClientCo
private SocketAddress bindAddress;
private boolean reuseAddress = true;
public QuicClientConnector(Origin.Protocol... protocols)
public ClientDatagramConnector(Origin.Protocol... protocols)
{
String[] applicationProtos = Arrays.stream(protocols)
.flatMap(protocol -> protocol.getProtocols().stream())
@ -342,7 +342,7 @@ public class QuicClientConnector extends ContainerLifeCycle implements IClientCo
@Override
protected EndPoint newEndPoint(SelectableChannel channel, ManagedSelector selector, SelectionKey selectionKey)
{
EndPoint endPoint = QuicClientConnector.this.newEndPoint((DatagramChannel)channel, selector, selectionKey);
EndPoint endPoint = ClientDatagramConnector.this.newEndPoint((DatagramChannel)channel, selector, selectionKey);
endPoint.setIdleTimeout(getIdleTimeout().toMillis());
return endPoint;
}

View File

@ -36,14 +36,14 @@ import org.eclipse.jetty.util.annotation.ManagedObject;
public class HttpClientTransportOverQuic extends AbstractHttpClientTransport
{
private final ClientConnectionFactory connectionFactory = new HttpClientConnectionFactory();
private final QuicClientConnector connector;
private final ClientDatagramConnector connector;
private final Origin.Protocol protocol;
public HttpClientTransportOverQuic()
{
//TODO the ClientConnectionFactory should be built according to the Protocol instance. See HttpClientTransportDynamic
protocol = new Origin.Protocol(HttpClientConnectionFactory.HTTP11.getProtocols(true), false);
connector = new QuicClientConnector(protocol);
connector = new ClientDatagramConnector(protocol);
addBean(connector);
setConnectionPoolFactory(destination ->
{

View File

@ -38,7 +38,7 @@ import org.eclipse.jetty.util.thread.Scheduler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.eclipse.jetty.http3.client.QuicClientConnector.REMOTE_SOCKET_ADDRESS_CONTEXT_KEY;
import static org.eclipse.jetty.http3.client.ClientDatagramConnector.REMOTE_SOCKET_ADDRESS_CONTEXT_KEY;
public class QuicConnection extends AbstractConnection
{

View File

@ -227,7 +227,7 @@ public class QuicSession
private QuicStreamEndPoint createQuicStreamEndPoint(long streamId)
{
ClientConnectionFactory connectionFactory = (ClientConnectionFactory)context.get(QuicClientConnector.CLIENT_CONNECTION_FACTORY_CONTEXT_KEY);
ClientConnectionFactory connectionFactory = (ClientConnectionFactory)context.get(ClientDatagramConnector.CLIENT_CONNECTION_FACTORY_CONTEXT_KEY);
QuicStreamEndPoint endPoint = new QuicStreamEndPoint(scheduler, this, streamId);
try
{