Clean up: have the future return its partitionId

Author: slandelle

src/main/java/com/ning/http/client/providers/netty/channel/ChannelManager.java

@@ -430,10 +430,6 @@ public void upgradeProtocol(ChannelPipeline pipeline, String scheme, String host
         }
     }
 
-    public String getPartitionId(NettyResponseFuture<?> future) {
-        return future.getConnectionPoolPartitioning().getPartitionId(future.getUri(), future.getProxyServer());
-    }
-
     public void verifyChannelPipeline(ChannelPipeline pipeline, String scheme) throws IOException, GeneralSecurityException {
 
         boolean sslHandlerConfigured = isSslHandlerConfigured(pipeline);
@@ -471,7 +467,7 @@ public void call() {
     }
 
     public void drainChannelAndOffer(final Channel channel, final NettyResponseFuture<?> future) {
-        drainChannelAndOffer(channel, future, future.isKeepAlive(), getPartitionId(future));
+        drainChannelAndOffer(channel, future, future.isKeepAlive(), future.getPartitionId());
     }
 
     public void drainChannelAndOffer(final Channel channel, final NettyResponseFuture<?> future, boolean keepAlive, String poolKey) {

src/main/java/com/ning/http/client/providers/netty/future/NettyResponseFuture.java

@@ -424,6 +424,10 @@ public long getStart() {
         return start;
     }
 
+    public String getPartitionId() {
+        return connectionPoolPartitioning.getPartitionId(uri, proxyServer);
+    }
+
     @Override
     public String toString() {
         return "NettyResponseFuture{" + //

src/main/java/com/ning/http/client/providers/netty/handler/HttpProtocol.java

@@ -185,7 +185,7 @@ private void finishUpdate(final NettyResponseFuture<?> future, Channel channel,
         if (expectOtherChunks && keepAlive)
             channelManager.drainChannelAndOffer(channel, future);
         else
-            channelManager.tryToOfferChannelToPool(channel, keepAlive, channelManager.getPartitionId(future));
+            channelManager.tryToOfferChannelToPool(channel, keepAlive, future.getPartitionId());
         markAsDone(future, channel);
     }
 

src/main/java/com/ning/http/client/providers/netty/handler/Protocol.java

@@ -144,7 +144,7 @@ protected boolean exitAfterHandlingRedirect(//
 
                     // in case of a redirect from HTTP to HTTPS, future attributes might change
                     final boolean initialConnectionKeepAlive = future.isKeepAlive();
-                    final String initialPoolKey = channelManager.getPartitionId(future);
+                    final String initialPoolKey = future.getPartitionId();
 
                     future.setUri(uri);
                     String newUrl = uri.toUrl();

src/main/java/com/ning/http/client/providers/netty/request/NettyRequestSender.java

@@ -271,7 +271,7 @@ private <T> ListenableFuture<T> sendRequestWithNewChannel(//
                 // only compute when maxConnectionPerHost is enabled
                 // FIXME clean up
                 if (config.getMaxConnectionsPerHost() > 0)
-                    poolKey = channelManager.getPartitionId(future);
+                    poolKey = future.getPartitionId();
                 channelManager.preemptChannel(poolKey);
 
                 channelPreempted = true;