Don't pass Uri when passing request

Author: slandelle

api/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactoryBase.java

@@ -111,7 +111,7 @@ protected String systematicProxyAuthorizationHeader(Request request, ProxyServer
  return proxyAuthorization;
  }
 
- protected String firstRequestOnlyAuthorizationHeader(Request request, Uri uri, ProxyServer proxyServer, Realm realm) throws IOException {
+ protected String firstRequestOnlyAuthorizationHeader(Request request, ProxyServer proxyServer, Realm realm) throws IOException {
  String authorizationHeader = null;
 
  if (realm != null && realm.getUsePreemptiveAuth()) {
@@ -128,7 +128,7 @@ protected String firstRequestOnlyAuthorizationHeader(Request request, Uri uri, P
  else if (request.getVirtualHost() != null)
  host = request.getVirtualHost();
  else
- host = uri.getHost();
+ host = request.getUri().getHost();
 
  try {
  authorizationHeader = "Negotiate " + SpnegoEngine.instance().generateToken(host);
@@ -144,7 +144,7 @@ else if (request.getVirtualHost() != null)
  return authorizationHeader;
  }
 
- protected String systematicAuthorizationHeader(Request request, Uri uri, Realm realm) {
+ protected String systematicAuthorizationHeader(Request request, Realm realm) {
 
  String authorizationHeader = null;
 

providers/netty3/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java

@@ -90,8 +90,7 @@ public enum STATE {
  private boolean dontWriteBodyBecauseExpectContinue;
  private boolean allowConnect;
 
- public NettyResponseFuture(Uri uri,//
- Request request,//
+ public NettyResponseFuture(Request request,//
  AsyncHandler<V> asyncHandler,//
  NettyRequest nettyRequest,//
  int maxRetry,//
@@ -101,7 +100,7 @@ public NettyResponseFuture(Uri uri,//
  this.asyncHandler = asyncHandler;
  this.request = request;
  this.nettyRequest = nettyRequest;
- this.uri = uri;
+ this.uri = request.getUri();
  this.connectionPoolPartitioning = connectionPoolPartitioning;
  this.proxyServer = proxyServer;
  this.maxRetry = maxRetry;

providers/netty3/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java

@@ -102,14 +102,13 @@ private Realm kerberosProxyChallenge(Channel channel,//
  FluentCaseInsensitiveStringsMap headers,//
  NettyResponseFuture<?> future) throws NtlmEngineException {
 
- Uri uri = request.getUri();
  try {
  String challengeHeader = SpnegoEngine.instance().generateToken(proxyServer.getHost());
  headers.remove(HttpHeaders.Names.AUTHORIZATION);
  headers.add(HttpHeaders.Names.AUTHORIZATION, "Negotiate " + challengeHeader);
 
  return proxyServer.realmBuilder()//
- .setUri(uri)//
+ .setUri(request.getUri())//
  .setMethodName(request.getMethod())//
  .setScheme(Realm.AuthScheme.KERBEROS)//
  .build();
@@ -138,8 +137,6 @@ private Realm ntlmChallenge(String authenticateHeader,//
  Realm realm,//
  NettyResponseFuture<?> future) throws NtlmEngineException {
 
- Uri uri = request.getUri();
-
  if (authenticateHeader.equals("NTLM")) {
  // server replied bare NTLM => we didn't preemptively sent Type1Msg
  String challengeHeader = NtlmEngine.INSTANCE.generateType1Msg();
@@ -153,7 +150,7 @@ private Realm ntlmChallenge(String authenticateHeader,//
  }
 
  return new Realm.RealmBuilder().clone(realm)//
- .setUri(uri)//
+ .setUri(request.getUri())//
  .setMethodName(request.getMethod())//
  .build();
  }

providers/netty3/src/main/java/org/asynchttpclient/netty/request/NettyRequestFactory.java

@@ -126,9 +126,9 @@ public void setProxyAuthorizationHeader(HttpHeaders headers, String proxyAuthori
  headers.set(PROXY_AUTHORIZATION, proxyAuthorizationHeader);
  }
 
- public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConnect, ProxyServer proxyServer)
- throws IOException {
+ public NettyRequest newNettyRequest(Request request, boolean forceConnect, ProxyServer proxyServer) throws IOException {
 
+ Uri uri = request.getUri();
  HttpMethod method = forceConnect ? HttpMethod.CONNECT : HttpMethod.valueOf(request.getMethod());
  boolean connect = method == HttpMethod.CONNECT;
 
@@ -200,7 +200,7 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
  Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
 
  // don't override authorization but append
- addAuthorizationHeader(headers, systematicAuthorizationHeader(request, uri, realm));
+ addAuthorizationHeader(headers, systematicAuthorizationHeader(request, realm));
 
  setProxyAuthorizationHeader(headers, systematicProxyAuthorizationHeader(request, proxyServer, realm, connect));
 

providers/netty3/src/main/java/org/asynchttpclient/netty/request/NettyRequestSender.java

@@ -35,7 +35,6 @@
 import org.asynchttpclient.ListenableFuture;
 import org.asynchttpclient.Realm;
 import org.asynchttpclient.Request;
-import org.asynchttpclient.channel.pool.ConnectionPoolPartitioning;
 import org.asynchttpclient.filter.FilterContext;
 import org.asynchttpclient.filter.FilterException;
 import org.asynchttpclient.filter.IOExceptionFilter;
@@ -92,24 +91,22 @@ public <T> ListenableFuture<T> sendRequest(final Request request,//
  if (closed.get())
  throw new IOException("Closed");
 
- Uri uri = request.getUri();
-
- validateWebSocketRequest(request, uri, asyncHandler);
+ validateWebSocketRequest(request, asyncHandler);
 
  ProxyServer proxyServer = getProxyServer(config, request);
  boolean resultOfAConnect = future != null && future.getNettyRequest() != null
  && future.getNettyRequest().getHttpRequest().getMethod() == HttpMethod.CONNECT;
  boolean useProxy = proxyServer != null && !resultOfAConnect;
 
- if (useProxy && useProxyConnect(uri))
+ if (useProxy && useProxyConnect(request.getUri()))
  // SSL proxy, have to handle CONNECT
  if (future != null && future.isConnectAllowed())
  // CONNECT forced
- return sendRequestWithCertainForceConnect(request, asyncHandler, future, reclaimCache, uri, proxyServer, true, true);
+ return sendRequestWithCertainForceConnect(request, asyncHandler, future, reclaimCache, proxyServer, true, true);
  else
- return sendRequestThroughSslProxy(request, asyncHandler, future, reclaimCache, uri, proxyServer);
+ return sendRequestThroughSslProxy(request, asyncHandler, future, reclaimCache, proxyServer);
  else
- return sendRequestWithCertainForceConnect(request, asyncHandler, future, reclaimCache, uri, proxyServer, useProxy, false);
+ return sendRequestWithCertainForceConnect(request, asyncHandler, future, reclaimCache, proxyServer, useProxy, false);
  }
 
  /**
@@ -123,18 +120,17 @@ private <T> ListenableFuture<T> sendRequestWithCertainForceConnect(//
  AsyncHandler<T> asyncHandler,//
  NettyResponseFuture<T> future,//
  boolean reclaimCache,//
- Uri uri,//
  ProxyServer proxyServer,//
  boolean useProxy,//
  boolean forceConnect) throws IOException {
- NettyResponseFuture<T> newFuture = newNettyRequestAndResponseFuture(request, asyncHandler, future, uri, proxyServer, forceConnect);
+ NettyResponseFuture<T> newFuture = newNettyRequestAndResponseFuture(request, asyncHandler, future, proxyServer, forceConnect);
 
- Channel channel = getCachedChannel(future, uri, request.getConnectionPoolPartitioning(), proxyServer, asyncHandler);
+ Channel channel = getCachedChannel(future, request, proxyServer, asyncHandler);
 
  if (Channels.isChannelValid(channel))
- return sendRequestWithCachedChannel(request, uri, proxyServer, newFuture, asyncHandler, channel);
+ return sendRequestWithCachedChannel(request, proxyServer, newFuture, asyncHandler, channel);
  else
- return sendRequestWithNewChannel(request, uri, proxyServer, useProxy, newFuture, asyncHandler, reclaimCache);
+ return sendRequestWithNewChannel(request, proxyServer, useProxy, newFuture, asyncHandler, reclaimCache);
  }
 
  /**
@@ -148,52 +144,51 @@ private <T> ListenableFuture<T> sendRequestThroughSslProxy(//
  AsyncHandler<T> asyncHandler,//
  NettyResponseFuture<T> future,//
  boolean reclaimCache,//
- Uri uri,//
  ProxyServer proxyServer) throws IOException {
 
  NettyResponseFuture<T> newFuture = null;
  for (int i = 0; i < 3; i++) {
- Channel channel = getCachedChannel(future, uri, request.getConnectionPoolPartitioning(), proxyServer, asyncHandler);
+ Channel channel = getCachedChannel(future, request, proxyServer, asyncHandler);
  if (Channels.isChannelValid(channel))
  if (newFuture == null)
- newFuture = newNettyRequestAndResponseFuture(request, asyncHandler, future, uri, proxyServer, false);
+ newFuture = newNettyRequestAndResponseFuture(request, asyncHandler, future, proxyServer, false);
 
  if (Channels.isChannelValid(channel))
  // if the channel is still active, we can use it, otherwise try gain
- return sendRequestWithCachedChannel(request, uri, proxyServer, newFuture, asyncHandler, channel);
+ return sendRequestWithCachedChannel(request, proxyServer, newFuture, asyncHandler, channel);
  else
  // pool is empty
  break;
  }
 
- newFuture = newNettyRequestAndResponseFuture(request, asyncHandler, future, uri, proxyServer, true);
- return sendRequestWithNewChannel(request, uri, proxyServer, true, newFuture, asyncHandler, reclaimCache);
+ newFuture = newNettyRequestAndResponseFuture(request, asyncHandler, future, proxyServer, true);
+ return sendRequestWithNewChannel(request, proxyServer, true, newFuture, asyncHandler, reclaimCache);
  }
 
  private <T> NettyResponseFuture<T> newNettyRequestAndResponseFuture(final Request request, final AsyncHandler<T> asyncHandler,
- NettyResponseFuture<T> originalFuture, Uri uri, ProxyServer proxy, boolean forceConnect) throws IOException {
+ NettyResponseFuture<T> originalFuture, ProxyServer proxy, boolean forceConnect) throws IOException {
 
- NettyRequest nettyRequest = requestFactory.newNettyRequest(request, uri, forceConnect, proxy);
+ NettyRequest nettyRequest = requestFactory.newNettyRequest(request, forceConnect, proxy);
 
  if (originalFuture == null) {
- return newNettyResponseFuture(uri, request, asyncHandler, nettyRequest, proxy);
+ return newNettyResponseFuture(request, asyncHandler, nettyRequest, proxy);
  } else {
  originalFuture.setNettyRequest(nettyRequest);
  originalFuture.setRequest(request);
  return originalFuture;
  }
  }
 
- private Channel getCachedChannel(NettyResponseFuture<?> future, Uri uri, ConnectionPoolPartitioning partitioning,
+ private Channel getCachedChannel(NettyResponseFuture<?> future, Request request,
  ProxyServer proxyServer, AsyncHandler<?> asyncHandler) {
 
  if (future != null && future.reuseChannel() && Channels.isChannelValid(future.channel()))
  return future.channel();
  else
- return pollAndVerifyCachedChannel(uri, proxyServer, partitioning, asyncHandler);
+ return pollAndVerifyCachedChannel(request, proxyServer, asyncHandler);
  }
 
- private <T> ListenableFuture<T> sendRequestWithCachedChannel(Request request, Uri uri, ProxyServer proxy,
+ private <T> ListenableFuture<T> sendRequestWithCachedChannel(Request request, ProxyServer proxy,
  NettyResponseFuture<T> future, AsyncHandler<T> asyncHandler, Channel channel) throws IOException {
 
  if (asyncHandler instanceof AsyncHandlerExtensions)
@@ -242,20 +237,19 @@ private <T> ListenableFuture<T> sendRequestWithCachedChannel(Request request, Ur
 
  private <T> ListenableFuture<T> sendRequestWithNewChannel(//
  Request request,//
- Uri uri,//
  ProxyServer proxy,//
  boolean useProxy,//
  NettyResponseFuture<T> future,//
  AsyncHandler<T> asyncHandler,//
  boolean reclaimCache) throws IOException {
 
- boolean useSSl = isSecure(uri) && !useProxy;
+ boolean useSSl = isSecure(request.getUri()) && !useProxy;
 
  // some headers are only set when performing the first request
  HttpHeaders headers = future.getNettyRequest().getHttpRequest().headers();
  Realm realm = request.getRealm() != null ? request.getRealm() : config.getRealm();
  boolean connect = future.getNettyRequest().getHttpRequest().getMethod() == HttpMethod.CONNECT;
- requestFactory.addAuthorizationHeader(headers, requestFactory.firstRequestOnlyAuthorizationHeader(request, uri, proxy, realm));
+ requestFactory.addAuthorizationHeader(headers, requestFactory.firstRequestOnlyAuthorizationHeader(request, proxy, realm));
  requestFactory.setProxyAuthorizationHeader(headers, requestFactory.firstRequestOnlyProxyAuthorizationHeader(request, proxy, connect));
 
  // Do not throw an exception when we need an extra connection for a
@@ -276,7 +270,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
  if (asyncHandler instanceof AsyncHandlerExtensions)
  AsyncHandlerExtensions.class.cast(asyncHandler).onConnectionOpen();
 
- ChannelFuture channelFuture = connect(request, uri, proxy, useProxy, bootstrap, asyncHandler);
+ ChannelFuture channelFuture = connect(request, proxy, useProxy, bootstrap, asyncHandler);
  channelFuture.addListener(new NettyConnectListener<T>(future, this, channelManager, channelPreempted, partitionKey));
 
  } catch (Throwable t) {
@@ -289,11 +283,10 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
  return future;
  }
 
- private <T> NettyResponseFuture<T> newNettyResponseFuture(Uri uri, Request request, AsyncHandler<T> asyncHandler,
+ private <T> NettyResponseFuture<T> newNettyResponseFuture(Request request, AsyncHandler<T> asyncHandler,
  NettyRequest nettyRequest, ProxyServer proxyServer) {
 
  NettyResponseFuture<T> future = new NettyResponseFuture<>(//
- uri,//
  request,//
  asyncHandler,//
  nettyRequest,//
@@ -343,9 +336,10 @@ public <T> void writeRequest(NettyResponseFuture<T> future, Channel channel) {
  }
  }
 
- private InetSocketAddress remoteAddress(Request request, Uri uri, ProxyServer proxy, boolean useProxy) throws UnknownHostException {
+ private InetSocketAddress remoteAddress(Request request, ProxyServer proxy, boolean useProxy) throws UnknownHostException {
 
  InetAddress address;
+ Uri uri = request.getUri();
  int port = getDefaultPort(uri);
 
  if (request.getInetAddress() != null) {
@@ -362,8 +356,8 @@ private InetSocketAddress remoteAddress(Request request, Uri uri, ProxyServer pr
  return new InetSocketAddress(address, port);
  }
 
- private ChannelFuture connect(Request request, Uri uri, ProxyServer proxy, boolean useProxy, ClientBootstrap bootstrap, AsyncHandler<?> asyncHandler) throws UnknownHostException {
- InetSocketAddress remoteAddress = remoteAddress(request, uri, proxy, useProxy);
+ private ChannelFuture connect(Request request, ProxyServer proxy, boolean useProxy, ClientBootstrap bootstrap, AsyncHandler<?> asyncHandler) throws UnknownHostException {
+ InetSocketAddress remoteAddress = remoteAddress(request, proxy, useProxy);
 
  if (asyncHandler instanceof AsyncHandlerExtensions)
  AsyncHandlerExtensions.class.cast(asyncHandler).onDnsResolved(remoteAddress.getAddress());
@@ -492,23 +486,26 @@ public <T> void sendNextRequest(Request request, NettyResponseFuture<T> future)
  sendRequest(request, future.getAsyncHandler(), future, true);
  }
 
- private void validateWebSocketRequest(Request request, Uri uri, AsyncHandler<?> asyncHandler) {
+ private void validateWebSocketRequest(Request request, AsyncHandler<?> asyncHandler) {
+ Uri uri = request.getUri();
+ boolean isWs = uri.getScheme().startsWith(WS);
  if (asyncHandler instanceof WebSocketUpgradeHandler) {
- if (!uri.getScheme().startsWith(WS))
+ if (!isWs)
  throw new IllegalArgumentException("WebSocketUpgradeHandler but scheme isn't ws or wss: " + uri.getScheme());
  else if (!request.getMethod().equals(HttpMethod.GET.getName()))
  throw new IllegalArgumentException("WebSocketUpgradeHandler but method isn't GET: " + request.getMethod());
- } else if (uri.getScheme().startsWith(WS)) {
+ } else if (isWs) {
  throw new IllegalArgumentException("No WebSocketUpgradeHandler but scheme is " + uri.getScheme());
  }
  }
 
- public Channel pollAndVerifyCachedChannel(Uri uri, ProxyServer proxy, ConnectionPoolPartitioning connectionPoolPartitioning, AsyncHandler<?> asyncHandler) {
+ public Channel pollAndVerifyCachedChannel(Request request, ProxyServer proxy, AsyncHandler<?> asyncHandler) {
 
  if (asyncHandler instanceof AsyncHandlerExtensions)
  AsyncHandlerExtensions.class.cast(asyncHandler).onConnectionPool();
 
- final Channel channel = channelManager.poll(uri, proxy, connectionPoolPartitioning);
+ Uri uri = request.getUri();
+ final Channel channel = channelManager.poll(uri, proxy, request.getConnectionPoolPartitioning());
 
  if (channel != null) {
  LOGGER.debug("Using cached Channel {}\n for uri {}\n", channel, uri);

providers/netty4/src/main/java/org/asynchttpclient/netty/NettyResponseFuture.java

@@ -90,8 +90,7 @@ public enum STATE {
  private boolean dontWriteBodyBecauseExpectContinue;
  private boolean allowConnect;
 
- public NettyResponseFuture(Uri uri,//
- Request request,//
+ public NettyResponseFuture(Request request,//
  AsyncHandler<V> asyncHandler,//
  NettyRequest nettyRequest,//
  int maxRetry,//
@@ -101,7 +100,7 @@ public NettyResponseFuture(Uri uri,//
  this.asyncHandler = asyncHandler;
  this.request = request;
  this.nettyRequest = nettyRequest;
- this.uri = uri;
+ this.uri = request.getUri();
  this.connectionPoolPartitioning = connectionPoolPartitioning;
  this.proxyServer = proxyServer;
  this.maxRetry = maxRetry;

providers/netty4/src/main/java/org/asynchttpclient/netty/handler/HttpProtocol.java

@@ -103,14 +103,13 @@ private Realm kerberosProxyChallenge(Channel channel,//
  FluentCaseInsensitiveStringsMap headers,//
  NettyResponseFuture<?> future) throws NtlmEngineException {
 
- Uri uri = request.getUri();
  try {
  String challengeHeader = SpnegoEngine.instance().generateToken(proxyServer.getHost());
  headers.remove(HttpHeaders.Names.AUTHORIZATION);
  headers.add(HttpHeaders.Names.AUTHORIZATION, "Negotiate " + challengeHeader);
 
  return proxyServer.realmBuilder()//
- .setUri(uri)//
+ .setUri(request.getUri())//
  .setMethodName(request.getMethod())//
  .setScheme(Realm.AuthScheme.KERBEROS)//
  .build();
@@ -139,8 +138,6 @@ private Realm ntlmChallenge(String authenticateHeader,//
  Realm realm,//
  NettyResponseFuture<?> future) throws NtlmEngineException {
 
- Uri uri = request.getUri();
-
  if (authenticateHeader.equals("NTLM")) {
  // server replied bare NTLM => we didn't preemptively sent Type1Msg
  String challengeHeader = NtlmEngine.INSTANCE.generateType1Msg();
@@ -153,7 +150,7 @@ private Realm ntlmChallenge(String authenticateHeader,//
  }
 
  return new Realm.RealmBuilder().clone(realm)//
- .setUri(uri)//
+ .setUri(request.getUri())//
  .setMethodName(request.getMethod())//
  .build();
  }