Rename attachment into attribute

Author: Stephane Landelle

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

@@ -293,9 +293,9 @@ public void close() {
         openChannels.close();
 
         for (Channel channel : openChannels) {
-            Object attachment = Channels.getAttachment(channel);
-            if (attachment instanceof NettyResponseFuture<?>) {
-                NettyResponseFuture<?> future = (NettyResponseFuture<?>) attachment;
+            Object attribute = Channels.getAttribute(channel);
+            if (attribute instanceof NettyResponseFuture<?>) {
+                NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
                 future.cancelTimeouts();
             }
         }
@@ -351,19 +351,26 @@ public SslHandler createSslHandler(String peerHost, int peerPort) throws General
                 : new SslHandler(sslEngine);
     }
 
+    public SslHandler getSslHandler(ChannelPipeline pipeline) {
+        return (SslHandler) pipeline.get(SSL_HANDLER);
+    }
+
+    private boolean isSslHandlerConfigured(ChannelPipeline pipeline) {
+        return pipeline.get(SSL_HANDLER) != null;
+    }
+    
     public void upgradeProtocol(ChannelPipeline pipeline, String scheme, String host, int port) throws IOException,
             GeneralSecurityException {
         if (pipeline.get(HTTP_HANDLER) != null)
             pipeline.remove(HTTP_HANDLER);
 
         if (isSecure(scheme))
-            if (pipeline.get(SSL_HANDLER) == null) {
+            if (isSslHandlerConfigured(pipeline)){
+                pipeline.addAfter(SSL_HANDLER, HTTP_HANDLER, newHttpClientCodec());
+            } else {
                 pipeline.addFirst(HTTP_HANDLER, newHttpClientCodec());
                 pipeline.addFirst(SSL_HANDLER, createSslHandler(host, port));
-            } else {
-                pipeline.addAfter(SSL_HANDLER, HTTP_HANDLER, newHttpClientCodec());
             }
-
         else
             pipeline.addFirst(HTTP_HANDLER, newHttpClientCodec());
 
@@ -377,13 +384,14 @@ public String getPoolKey(NettyResponseFuture<?> future) {
 
     public void verifyChannelPipeline(ChannelPipeline pipeline, String scheme) throws IOException, GeneralSecurityException {
 
-        boolean isSecure = isSecure(scheme);
-        if (pipeline.get(SSL_HANDLER) != null) {
-            if (!isSecure)
-                pipeline.remove(SSL_HANDLER);
+        boolean sslHandlerConfigured = isSslHandlerConfigured(pipeline);
+
+        if (isSecure(scheme)) {
+            if (!sslHandlerConfigured)
+                pipeline.addFirst(SSL_HANDLER, new SslInitializer(this));
 
-        } else if (isSecure)
-            pipeline.addFirst(SSL_HANDLER, new SslInitializer(this));
+        } else if (sslHandlerConfigured)
+            pipeline.remove(SSL_HANDLER);
     }
 
     public ClientBootstrap getBootstrap(String scheme, boolean useProxy, boolean useSSl) {
@@ -408,6 +416,6 @@ public void call() throws Exception {
     }
 
     public void drainChannel(final Channel channel, final NettyResponseFuture<?> future) {
-        Channels.setAttachment(channel, newDrainCallback(future, channel, future.isKeepAlive(), getPoolKey(future)));
+        Channels.setAttribute(channel, newDrainCallback(future, channel, future.isKeepAlive(), getPoolKey(future)));
     }
 }

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

@@ -22,16 +22,16 @@ public final class Channels {
     private Channels() {
     }
 
-    public static void setAttachment(Channel channel, Object attachment) {
-        channel.setAttachment(attachment);
+    public static void setAttribute(Channel channel, Object attribute) {
+        channel.setAttachment(attribute);
     }
 
-    public static Object getAttachment(Channel channel) {
+    public static Object getAttribute(Channel channel) {
         return channel.getAttachment();
     }
 
     public static void setDiscard(Channel channel) {
-        setAttachment(channel, DiscardEvent.INSTANCE);
+        setAttribute(channel, DiscardEvent.INSTANCE);
     }
 
     public static boolean isChannelValid(Channel channel) {

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

@@ -146,9 +146,9 @@ private List<IdleChannel> expiredChannels(ConcurrentLinkedQueue<IdleChannel> poo
         }
 
         private boolean isChannelCloseable(Channel channel) {
-            Object attachment = Channels.getAttachment(channel);
-            if (attachment instanceof NettyResponseFuture) {
-                NettyResponseFuture<?> future = (NettyResponseFuture<?>) attachment;
+            Object attribute = Channels.getAttribute(channel);
+            if (attribute instanceof NettyResponseFuture) {
+                NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
                 if (!future.isDone())
                     LOGGER.error("Future not in appropriate state %s, not closing", future);
             }

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

@@ -246,7 +246,7 @@ public void call() throws Exception {
                 if (future.isKeepAlive() && HttpHeaders.isTransferEncodingChunked(response))
                     // We must make sure there is no bytes left
                     // before executing the next request.
-                    Channels.setAttachment(channel, callback);
+                    Channels.setAttribute(channel, callback);
                 else
                     callback.call();
 

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

@@ -69,14 +69,14 @@ public void messageReceived(final ChannelHandlerContext ctx, MessageEvent e) thr
         super.messageReceived(ctx, e);
 
         Channel channel = ctx.getChannel();
-        Object attachment = Channels.getAttachment(channel);
+        Object attribute = Channels.getAttribute(channel);
 
-        if (attachment == null)
-            LOGGER.debug("ChannelHandlerContext doesn't have any attachment");
+        if (attribute == null)
+            LOGGER.debug("ChannelHandlerContext doesn't have any attribute");
 
-        if (attachment instanceof Callback) {
+        if (attribute instanceof Callback) {
             Object message = e.getMessage();
-            Callback ac = (Callback) attachment;
+            Callback ac = (Callback) attribute;
             if (message instanceof HttpChunk) {
                 // the AsyncCallable is to be processed on the last chunk
                 if (HttpChunk.class.cast(message).isLast())
@@ -88,11 +88,11 @@ public void messageReceived(final ChannelHandlerContext ctx, MessageEvent e) thr
                 Channels.setDiscard(channel);
             }
 
-        } else if (attachment instanceof NettyResponseFuture<?>) {
-            NettyResponseFuture<?> future = (NettyResponseFuture<?>) attachment;
+        } else if (attribute instanceof NettyResponseFuture<?>) {
+            NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
             protocol.handle(channel, future, e.getMessage());
 
-        } else if (attachment != DiscardEvent.INSTANCE) {
+        } else if (attribute != DiscardEvent.INSTANCE) {
             // unhandled message
             try {
                 ctx.getChannel().close();
@@ -117,16 +117,16 @@ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws
             LOGGER.trace("super.channelClosed", ex);
         }
 
-        Object attachment = Channels.getAttachment(channel);
-        LOGGER.debug("Channel Closed: {} with attachment {}", channel, attachment);
+        Object attribute = Channels.getAttribute(channel);
+        LOGGER.debug("Channel Closed: {} with attribute {}", channel, attribute);
 
-        if (attachment instanceof Callback) {
-            Callback callback = (Callback) attachment;
-            Channels.setAttachment(channel, callback.future());
+        if (attribute instanceof Callback) {
+            Callback callback = (Callback) attribute;
+            Channels.setAttribute(channel, callback.future());
             callback.call();
 
-        } else if (attachment instanceof NettyResponseFuture<?>) {
-            NettyResponseFuture<?> future = (NettyResponseFuture<?>) attachment;
+        } else if (attribute instanceof NettyResponseFuture<?>) {
+            NettyResponseFuture<?> future = (NettyResponseFuture<?>) attribute;
             future.touch();
 
             if (!config.getIOExceptionFilters().isEmpty()
@@ -155,9 +155,9 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws
         LOGGER.debug("Unexpected I/O exception on channel {}", channel, cause);
 
         try {
-            Object attachment = Channels.getAttachment(channel);
-            if (attachment instanceof NettyResponseFuture<?>) {
-                future = (NettyResponseFuture<?>) attachment;
+            Object attribute = Channels.getAttribute(channel);
+            if (attribute instanceof NettyResponseFuture<?>) {
+                future = (NettyResponseFuture<?>) attribute;
                 future.attachChannel(null, false);
                 future.touch();
 
@@ -182,8 +182,8 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws
                     LOGGER.debug("Trying to recover from dead Channel: {}", channel);
                     return;
                 }
-            } else if (attachment instanceof Callback) {
-                future = ((Callback) attachment).future();
+            } else if (attribute instanceof Callback) {
+                future = ((Callback) attribute).future();
             }
         } catch (Throwable t) {
             cause = t;

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

@@ -145,7 +145,7 @@ protected boolean exitAfterHandlingRedirect(//
                         // We must make sure there is no bytes left before
                         // executing the next request.
                         // FIXME investigate this
-                        Channels.setAttachment(channel, callback);
+                        Channels.setAttribute(channel, callback);
                     } else {
                         // FIXME don't understand: this offers the connection to the pool, or even closes it, while the
                         // request has not been sent, right?

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

@@ -177,7 +177,7 @@ public void setContent(ChannelBuffer content) {
     @Override
     public void onError(Channel channel, Throwable e) {
         try {
-            Object attribute = Channels.getAttachment(channel);
+            Object attribute = Channels.getAttribute(channel);
             logger.warn("onError {}", e);
             if (!(attribute instanceof NettyResponseFuture)) {
                 return;
@@ -199,7 +199,7 @@ public void onError(Channel channel, Throwable e) {
     @Override
     public void onClose(Channel channel) {
         logger.trace("onClose {}");
-        Object attribute = Channels.getAttachment(channel);
+        Object attribute = Channels.getAttribute(channel);
         if (!(attribute instanceof NettyResponseFuture))
             return;
 

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

@@ -202,7 +202,7 @@ private <T> ListenableFuture<T> sendRequestWithCachedChannel(Request request, Ur
         future.attachChannel(channel, false);
 
         LOGGER.debug("\nUsing cached Channel {}\n for request \n{}\n", channel, future.getNettyRequest().getHttpRequest());
-        Channels.setAttachment(channel, future);
+        Channels.setAttribute(channel, future);
 
         try {
             writeRequest(future, channel);
@@ -416,9 +416,9 @@ public boolean retry(NettyResponseFuture<?> future, Channel channel) {
         // channelManager.removeAll(channel);
 
         if (future == null) {
-            Object attachment = Channels.getAttachment(channel);
-            if (attachment instanceof NettyResponseFuture)
-                future = (NettyResponseFuture<?>) attachment;
+            Object attribute = Channels.getAttribute(channel);
+            if (attribute instanceof NettyResponseFuture)
+                future = (NettyResponseFuture<?>) attribute;
         }
 
         if (future != null && future.canBeReplayed()) {

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

@@ -90,8 +90,8 @@ private void writeRequest(Channel channel, String poolKey) {
     public final void operationComplete(ChannelFuture f) throws Exception {
         Channel channel = f.getChannel();
         if (f.isSuccess()) {
-            Channels.setAttachment(channel, future);
-            final SslHandler sslHandler = (SslHandler) channel.getPipeline().get(ChannelManager.SSL_HANDLER);
+            Channels.setAttribute(channel, future);
+            final SslHandler sslHandler = channelManager.getSslHandler(channel.getPipeline());
 
             final HostnameVerifier hostnameVerifier = config.getHostnameVerifier();
             if (hostnameVerifier != null && sslHandler != null) {