Move in proper package

Author: Stephane Landelle

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Callback.java

@@ -1,5 +1,7 @@
 package org.asynchttpclient.providers.netty4;
 
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
+
 public abstract class Callback {
 
     private final NettyResponseFuture<?> future;

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Channels.java

@@ -43,6 +43,8 @@
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.ConnectionPoolKeyStrategy;
 import org.asynchttpclient.ConnectionsPool;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
+import org.asynchttpclient.providers.netty4.pool.NettyConnectionsPool;
 import org.asynchttpclient.providers.netty4.util.CleanupChannelGroup;
 import org.asynchttpclient.util.SslUtils;
 import org.slf4j.Logger;

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyAsyncHttpProvider.java

@@ -33,7 +33,7 @@
 
 public class NettyAsyncHttpProvider implements AsyncHttpProvider {
 
-    static final Logger LOGGER = LoggerFactory.getLogger(NettyAsyncHttpProvider.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NettyAsyncHttpProvider.class);
 
     private final AsyncHttpClientConfig config;
     private final NettyAsyncHttpProviderConfig asyncHttpProviderConfig;
@@ -58,10 +58,6 @@ public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
         channels.configure(channelHandler);
 
         executeConnectAsync = asyncHttpProviderConfig.isAsyncConnect();
-        // FIXME
-        // if (!executeConnectAsync) {
-        // DefaultChannelFuture.setUseDeadLockChecker(true);
-        // }
     }
 
     @Override
@@ -75,7 +71,6 @@ public void close() {
         closed.set(true);
         try {
             channels.close();
-//            config.executorService().shutdown();
             config.reaper().shutdown();
         } catch (Throwable t) {
             LOGGER.warn("Unexpected error on close", t);

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyChannelHandler.java

@@ -49,7 +49,14 @@
 import org.asynchttpclient.ntlm.NTLMEngine;
 import org.asynchttpclient.ntlm.NTLMEngineException;
 import org.asynchttpclient.org.jboss.netty.handler.codec.http.CookieDecoder;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFutures;
+import org.asynchttpclient.providers.netty4.response.ResponseBodyPart;
+import org.asynchttpclient.providers.netty4.response.ResponseHeaders;
+import org.asynchttpclient.providers.netty4.response.ResponseStatus;
 import org.asynchttpclient.providers.netty4.spnego.SpnegoEngine;
+import org.asynchttpclient.providers.netty4.ws.NettyWebSocket;
+import org.asynchttpclient.providers.netty4.ws.WebSocketUtil;
 import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.asynchttpclient.websocket.WebSocketUpgradeHandler;
 import org.slf4j.Logger;

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyConnectListener.java

@@ -33,6 +33,8 @@
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.ProxyServer;
 import org.asynchttpclient.Request;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFutures;
 import org.asynchttpclient.util.ProxyUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyRequestSender.java

@@ -1,12 +1,12 @@
 package org.asynchttpclient.providers.netty4;
 
-import static org.asynchttpclient.providers.netty4.util.HttpUtil.WEBSOCKET;
-import static org.asynchttpclient.providers.netty4.util.HttpUtil.isSecure;
+import static org.asynchttpclient.providers.netty4.util.HttpUtil.*;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelProgressiveFuture;
+import io.netty.channel.DefaultFileRegion;
 import io.netty.channel.FileRegion;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpMethod;
@@ -44,6 +44,9 @@
 import org.asynchttpclient.listener.TransferCompletionHandler.TransferAdapter;
 import org.asynchttpclient.multipart.MultipartBody;
 import org.asynchttpclient.providers.netty4.FeedableBodyGenerator.FeedListener;
+import org.asynchttpclient.providers.netty4.future.FutureReaper;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFutures;
 import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.asynchttpclient.util.ProxyUtils;
 import org.asynchttpclient.websocket.WebSocketUpgradeHandler;
@@ -269,10 +272,10 @@ private void sendFileBody(Channel channel, File file, NettyResponseFuture<?> fut
             if (Channels.getSslHandler(channel) != null) {
                 writeFuture = channel.write(new ChunkedFile(raf, 0, fileLength, Constants.MAX_BUFFERED_BYTES), channel.newProgressivePromise());
             } else {
-                // FIXME why not use io.netty.channel.DefaultFileRegion?
-                FileRegion region = new OptimizedFileRegion(raf, 0, fileLength);
+                FileRegion region = new DefaultFileRegion(raf.getChannel(), 0, fileLength);
                 writeFuture = channel.write(region, channel.newProgressivePromise());
             }
+            // FIXME probably useless in Netty 4
             writeFuture.addListener(new ProgressListener(config, false, future.getAsyncHandler(), future) {
                 public void operationComplete(ChannelProgressiveFuture cf) {
                     try {

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyRequests.java

@@ -33,6 +33,7 @@
 import org.asynchttpclient.ntlm.NTLMEngineException;
 import org.asynchttpclient.org.jboss.netty.handler.codec.http.CookieEncoder;
 import org.asynchttpclient.providers.netty4.spnego.SpnegoEngine;
+import org.asynchttpclient.providers.netty4.ws.WebSocketUtil;
 import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.asynchttpclient.util.AuthenticatorUtils;
 import org.asynchttpclient.util.UTF8UrlEncoder;

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/OptimizedFileRegion.java

@@ -10,8 +10,14 @@
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.ProgressAsyncHandler;
 import org.asynchttpclient.Realm;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFutures;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProgressListener implements ChannelProgressiveFutureListener {
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProgressListener.class);
 
     private final AsyncHttpClientConfig config;
     private final boolean notifyHeaders;
@@ -28,32 +34,31 @@ public ProgressListener(AsyncHttpClientConfig config, boolean notifyHeaders, Asy
 
     @Override
     public void operationComplete(ChannelProgressiveFuture cf) {
-        // FIXME remove this with next 4.0.9: https://github.com/netty/netty/issues/1809
         // The write operation failed. If the channel was cached, it means it got asynchronously closed.
         // Let's retry a second time.
         Throwable cause = cf.cause();
         if (cause != null && future.getState() != NettyResponseFuture.STATE.NEW) {
 
             if (cause instanceof IllegalStateException) {
-                NettyAsyncHttpProvider.LOGGER.debug(cause.getMessage(), cause);
+                LOGGER.debug(cause.getMessage(), cause);
                 try {
                     cf.channel().close();
                 } catch (RuntimeException ex) {
-                    NettyAsyncHttpProvider.LOGGER.debug(ex.getMessage(), ex);
+                    LOGGER.debug(ex.getMessage(), ex);
                 }
                 return;
             }
 
             if (cause instanceof ClosedChannelException || NettyResponseFutures.abortOnReadCloseException(cause) || NettyResponseFutures.abortOnWriteCloseException(cause)) {
 
-                if (NettyAsyncHttpProvider.LOGGER.isDebugEnabled()) {
-                    NettyAsyncHttpProvider.LOGGER.debug(cf.cause() == null ? "" : cf.cause().getMessage(), cf.cause());
+                if (LOGGER.isDebugEnabled()) {
+                    LOGGER.debug(cf.cause() == null ? "" : cf.cause().getMessage(), cf.cause());
                 }
 
                 try {
                     cf.channel().close();
                 } catch (RuntimeException ex) {
-                    NettyAsyncHttpProvider.LOGGER.debug(ex.getMessage(), ex);
+                    LOGGER.debug(ex.getMessage(), ex);
                 }
                 return;
             } else {

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/ProgressListener.java

@@ -12,6 +12,8 @@
  */
 package org.asynchttpclient.providers.netty4;
 
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
+
 import io.netty.channel.ChannelHandlerContext;
 
 public interface Protocol{

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Protocol.java

@@ -1,4 +1,4 @@
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.future;
 
 import static org.asynchttpclient.util.DateUtil.millisTime;
 
@@ -9,12 +9,17 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.providers.netty4.Channels;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Because some implementation of the ThreadSchedulingService do not clean up cancel task until they try to run them, we wrap the task with the future so the when the NettyResponseFuture cancel the reaper future this wrapper will release the references to the channel and the
  * nettyResponseFuture immediately. Otherwise, the memory referenced this way will only be released after the request timeout period which can be arbitrary long.
  */
 public final class FutureReaper implements Runnable {
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(FutureReaper.class);
 
     private final AtomicBoolean closed;
     private final Channels channels;
@@ -70,7 +75,7 @@ public boolean isDone() {
     }
 
     private void expire(String message) {
-        NettyAsyncHttpProvider.LOGGER.debug("{} for {}", message, nettyResponseFuture);
+        LOGGER.debug("{} for {}", message, nettyResponseFuture);
         channels.abort(nettyResponseFuture, new TimeoutException(message));
         nettyResponseFuture = null;
     }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/ThreadLocalBoolean.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.future;
 
 import static org.asynchttpclient.util.DateUtil.millisTime;
 import io.netty.channel.Channel;
@@ -38,6 +38,8 @@
 import org.asynchttpclient.ProxyServer;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.listenable.AbstractListenableFuture;
+import org.asynchttpclient.providers.netty4.Channels;
+import org.asynchttpclient.providers.netty4.DiscardEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/FutureReaper.java renamed to providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/future/FutureReaper.java

@@ -1,4 +1,4 @@
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.future;
 
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpRequest;

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyResponseFuture.java renamed to providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/future/NettyResponseFuture.java

@@ -10,7 +10,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.pool;
 
 import static org.asynchttpclient.util.DateUtil.millisTime;
 import io.netty.channel.Channel;
@@ -26,6 +26,9 @@
 
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.ConnectionsPool;
+import org.asynchttpclient.providers.netty4.Channels;
+import org.asynchttpclient.providers.netty4.DiscardEvent;
+import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyResponseFutures.java renamed to providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/future/NettyResponseFutures.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.response;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyConnectionsPool.java renamed to providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/pool/NettyConnectionsPool.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.response;
 
 import io.netty.buffer.ByteBuf;
 

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyResponse.java renamed to providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/response/NettyResponse.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.response;
 
 import io.netty.handler.codec.http.HttpHeaders;
 

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/ResponseBodyPart.java renamed to providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/response/ResponseBodyPart.java

@@ -14,7 +14,7 @@
  * under the License.
  *
  */
-package org.asynchttpclient.providers.netty4;
+package org.asynchttpclient.providers.netty4.response;
 
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHttpProvider;