Rename web socket package into ws

Author: Stephane Landelle

api/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java

@@ -220,8 +220,8 @@ public int getConnectTimeout() {
     }
 
     /**
-     * Return the maximum time, in milliseconds, a {@link org.asynchttpclient.websocket.WebSocket} may be idle before being timed out.
-     * @return the maximum time, in milliseconds, a {@link org.asynchttpclient.websocket.WebSocket} may be idle before being timed out.
+     * Return the maximum time, in milliseconds, a {@link org.asynchttpclient.ws.WebSocket} may be idle before being timed out.
+     * @return the maximum time, in milliseconds, a {@link org.asynchttpclient.ws.WebSocket} may be idle before being timed out.
      */
     public int getWebSocketTimeout() {
         return webSocketTimeout;
@@ -626,10 +626,10 @@ public Builder setConnectTimeout(int connectTimeout) {
         }
 
         /**
-         * Set the maximum time in millisecond an {@link org.asynchttpclient.websocket.WebSocket} can stay idle.
+         * Set the maximum time in millisecond an {@link org.asynchttpclient.ws.WebSocket} can stay idle.
          *
          * @param webSocketTimeout
-         *         the maximum time in millisecond an {@link org.asynchttpclient.websocket.WebSocket} can stay idle.
+         *         the maximum time in millisecond an {@link org.asynchttpclient.ws.WebSocket} can stay idle.
          * @return a {@link Builder}
          */
         public Builder setWebSocketTimeout(int webSocketTimeout) {

api/src/main/java/org/asynchttpclient/DefaultAsyncHttpClient.java

@@ -35,7 +35,8 @@ public class DefaultAsyncHttpClient implements AsyncHttpClient {
      * provider is explicitly specified by the developer.
      */
     private static final String[] DEFAULT_PROVIDERS = {//
-    "org.asynchttpclient.providers.netty.NettyAsyncHttpProvider",/**/
+    "org.asynchttpclient.providers.netty4.NettyAsyncHttpProvider",/**/
+    "org.asynchttpclient.providers.netty3.NettyAsyncHttpProvider",/**/
     "org.asynchttpclient.providers.grizzly.GrizzlyAsyncHttpProvider"//
     };
 
@@ -57,7 +58,8 @@ public class DefaultAsyncHttpClient implements AsyncHttpClient {
      *
      * The default providers will be searched for in this order:
      * <ul>
-     *     <li>netty</li>
+     *     <li>netty4</li>
+     *     <li>netty3</li>
      *     <li>grizzly</li>
      * </ul>
      *

api/src/main/java/org/asynchttpclient/Request.java

@@ -173,7 +173,7 @@ public interface Request {
      * Overrides the config default value
      * @return the request timeout
      */
-    int getRequestTimeoutInMs();
+    int getRequestTimeout();
 
     /**
      * Return the HTTP Range header value, or

api/src/main/java/org/asynchttpclient/RequestBuilderBase.java

@@ -64,7 +64,7 @@ private static final class RequestImpl implements Request {
         private Realm realm;
         private File file;
         private Boolean followRedirect;
-        private int requestTimeoutInMs;
+        private int requestTimeout;
         private long rangeOffset;
         public String charset;
         private ConnectionPoolPartitioning connectionPoolPartitioning = ConnectionPoolPartitioning.PerHostConnectionPoolPartitioning.INSTANCE;
@@ -94,7 +94,7 @@ public RequestImpl(Request prototype) {
                 this.realm = prototype.getRealm();
                 this.file = prototype.getFile();
                 this.followRedirect = prototype.getFollowRedirect();
-                this.requestTimeoutInMs = prototype.getRequestTimeoutInMs();
+                this.requestTimeout = prototype.getRequestTimeout();
                 this.rangeOffset = prototype.getRangeOffset();
                 this.charset = prototype.getBodyEncoding();
                 this.connectionPoolPartitioning = prototype.getConnectionPoolPartitioning();
@@ -202,8 +202,8 @@ public Boolean getFollowRedirect() {
         }
 
         @Override
-        public int getRequestTimeoutInMs() {
-            return requestTimeoutInMs;
+        public int getRequestTimeout() {
+            return requestTimeout;
         }
 
         @Override
@@ -537,8 +537,8 @@ public T setFollowRedirect(boolean followRedirect) {
         return derived.cast(this);
     }
 
-    public T setRequestTimeoutInMs(int requestTimeoutInMs) {
-        request.requestTimeoutInMs = requestTimeoutInMs;
+    public T setRequestTimeout(int requestTimeout) {
+        request.requestTimeout = requestTimeout;
         return derived.cast(this);
     }
 

api/src/main/java/org/asynchttpclient/UpgradeHandler.java

@@ -13,7 +13,7 @@
 package org.asynchttpclient;
 
 /**
- * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link org.asynchttpclient.websocket.WebSocket}
+ * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link org.asynchttpclient.ws.WebSocket}
  * as type.
  *
  * @param <T>

api/src/main/java/org/asynchttpclient/util/AsyncHttpProviderUtils.java

@@ -137,7 +137,7 @@ public static String keepAliveHeaderValue(AsyncHttpClientConfig config) {
     }
 
     public static int requestTimeout(AsyncHttpClientConfig config, Request request) {
-        return request.getRequestTimeoutInMs() != 0 ? request.getRequestTimeoutInMs() : config.getRequestTimeout();
+        return request.getRequestTimeout() != 0 ? request.getRequestTimeout() : config.getRequestTimeout();
     }
 
     public static boolean followRedirect(AsyncHttpClientConfig config, Request request) {

api/src/main/java/org/asynchttpclient/websocket/DefaultWebSocketListener.java renamed to api/src/main/java/org/asynchttpclient/ws/DefaultWebSocketListener.java

@@ -11,7 +11,7 @@
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
 
-package org.asynchttpclient.websocket;
+package org.asynchttpclient.ws;
 
 /**
  * Default WebSocketListener implementation.  Most methods are no-ops.  This 

api/src/main/java/org/asynchttpclient/websocket/WebSocket.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocket.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.websocket;
+package org.asynchttpclient.ws;
 
 import java.io.Closeable;
 

api/src/main/java/org/asynchttpclient/websocket/WebSocketByteFragmentListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketByteFragmentListener.java

@@ -11,7 +11,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.websocket;
+package org.asynchttpclient.ws;
 
 import org.asynchttpclient.HttpResponseBodyPart;
 

api/src/main/java/org/asynchttpclient/websocket/WebSocketByteListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketByteListener.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.websocket;
+package org.asynchttpclient.ws;
 
 /**
  * A {@link WebSocketListener} for bytes

api/src/main/java/org/asynchttpclient/websocket/WebSocketCloseCodeReasonListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketCloseCodeReasonListener.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.websocket;
+package org.asynchttpclient.ws;
 
 /**
  * Extend the normal close listener with one that support the WebSocket's code and reason.

api/src/main/java/org/asynchttpclient/websocket/WebSocketListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketListener.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.websocket;
+package org.asynchttpclient.ws;
 
 /**
  * A generic {@link WebSocketListener} for WebSocket events. Use the appropriate listener for receiving message bytes.

api/src/main/java/org/asynchttpclient/websocket/WebSocketPingListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketPingListener.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.websocket;
+package org.asynchttpclient.ws;
 
 /**
  * A WebSocket's Ping Listener

api/src/main/java/org/asynchttpclient/websocket/WebSocketPongListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketPongListener.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.websocket;
+package org.asynchttpclient.ws;
 
 /**
  * A WebSocket's Pong Listener

api/src/main/java/org/asynchttpclient/websocket/WebSocketTextFragmentListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketTextFragmentListener.java

@@ -11,7 +11,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.websocket;
+package org.asynchttpclient.ws;
 
 import org.asynchttpclient.HttpResponseBodyPart;
 

api/src/main/java/org/asynchttpclient/websocket/WebSocketTextListener.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketTextListener.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.websocket;
+package org.asynchttpclient.ws;
 
 /**
  * A {@link WebSocketListener} for text message

api/src/main/java/org/asynchttpclient/websocket/WebSocketUpgradeHandler.java renamed to api/src/main/java/org/asynchttpclient/ws/WebSocketUpgradeHandler.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.websocket;
+package org.asynchttpclient.ws;
 
 import java.util.ArrayList;
 import java.util.List;

api/src/test/java/org/asynchttpclient/async/PerRequestTimeoutTest.java

@@ -98,7 +98,7 @@ public void run() {
     public void testRequestTimeout() throws IOException {
         AsyncHttpClient client = getAsyncHttpClient(null);
         try {
-            Future<Response> responseFuture = client.prepareGet(getTargetUrl()).setRequestTimeoutInMs(100).execute();
+            Future<Response> responseFuture = client.prepareGet(getTargetUrl()).setRequestTimeout(100).execute();
             Response response = responseFuture.get(2000, TimeUnit.MILLISECONDS);
             assertNull(response);
         } catch (InterruptedException e) {
@@ -117,7 +117,7 @@ public void testRequestTimeout() throws IOException {
     public void testGlobalDefaultPerRequestInfiniteTimeout() throws IOException {
         AsyncHttpClient client = getAsyncHttpClient(new AsyncHttpClientConfig.Builder().setRequestTimeout(100).build());
         try {
-            Future<Response> responseFuture = client.prepareGet(getTargetUrl()).setRequestTimeoutInMs(-1).execute();
+            Future<Response> responseFuture = client.prepareGet(getTargetUrl()).setRequestTimeout(-1).execute();
             Response response = responseFuture.get();
             assertNotNull(response);
         } catch (InterruptedException e) {

api/src/test/java/org/asynchttpclient/websocket/AbstractBasicTest.java renamed to api/src/test/java/org/asynchttpclient/ws/AbstractBasicTest.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.websocket;
+package org.asynchttpclient.ws;
 
 import static org.asynchttpclient.async.util.TestUtils.findFreePort;
 import static org.asynchttpclient.async.util.TestUtils.newJettyHttpServer;

api/src/test/java/org/asynchttpclient/websocket/ByteMessageTest.java renamed to api/src/test/java/org/asynchttpclient/ws/ByteMessageTest.java

@@ -10,11 +10,14 @@
  * "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.websocket;
+package org.asynchttpclient.ws;
 
 import static org.testng.Assert.assertEquals;
 
 import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketByteListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.eclipse.jetty.websocket.server.WebSocketHandler;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
 import org.testng.annotations.Test;

api/src/test/java/org/asynchttpclient/websocket/CloseCodeReasonMessageTest.java renamed to api/src/test/java/org/asynchttpclient/ws/CloseCodeReasonMessageTest.java

@@ -10,13 +10,18 @@
  * "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.websocket;
+package org.asynchttpclient.ws;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
 import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketCloseCodeReasonListener;
+import org.asynchttpclient.ws.WebSocketListener;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.eclipse.jetty.websocket.server.WebSocketHandler;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
 import org.testng.annotations.Test;

api/src/test/java/org/asynchttpclient/websocket/EchoSocket.java renamed to api/src/test/java/org/asynchttpclient/ws/EchoSocket.java

@@ -1,4 +1,4 @@
-package org.asynchttpclient.websocket;
+package org.asynchttpclient.ws;
 
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WebSocketAdapter;

api/src/test/java/org/asynchttpclient/websocket/ProxyTunnellingTest.java renamed to api/src/test/java/org/asynchttpclient/ws/ProxyTunnellingTest.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.websocket;
+package org.asynchttpclient.ws;
 
 import static org.asynchttpclient.async.util.TestUtils.findFreePort;
 import static org.asynchttpclient.async.util.TestUtils.newJettyHttpServer;
@@ -23,6 +23,9 @@
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
 import org.asynchttpclient.ProxyServer;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.eclipse.jetty.proxy.ConnectHandler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.websocket.server.WebSocketHandler;

api/src/test/java/org/asynchttpclient/websocket/RedirectTest.java renamed to api/src/test/java/org/asynchttpclient/ws/RedirectTest.java

@@ -11,7 +11,7 @@
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
 
-package org.asynchttpclient.websocket;
+package org.asynchttpclient.ws;
 
 import static org.asynchttpclient.async.util.TestUtils.addHttpConnector;
 import static org.asynchttpclient.async.util.TestUtils.findFreePort;
@@ -20,6 +20,9 @@
 
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.HandlerList;

api/src/test/java/org/asynchttpclient/websocket/TextMessageTest.java renamed to api/src/test/java/org/asynchttpclient/ws/TextMessageTest.java

@@ -10,13 +10,17 @@
  * "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.websocket;
+package org.asynchttpclient.ws;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
 import org.asynchttpclient.AsyncHttpClient;
+import org.asynchttpclient.ws.WebSocket;
+import org.asynchttpclient.ws.WebSocketListener;
+import org.asynchttpclient.ws.WebSocketTextListener;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.eclipse.jetty.websocket.server.WebSocketHandler;
 import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
 import org.testng.annotations.Test;

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/EventHandler.java

@@ -33,9 +33,9 @@
 import org.asynchttpclient.providers.grizzly.statushandler.ProxyAuthorizationHandler;
 import org.asynchttpclient.providers.grizzly.statushandler.RedirectHandler;
 import org.asynchttpclient.providers.grizzly.statushandler.StatusHandler;
-import org.asynchttpclient.providers.grizzly.websocket.GrizzlyWebSocketAdapter;
+import org.asynchttpclient.providers.grizzly.ws.GrizzlyWebSocketAdapter;
 import org.asynchttpclient.uri.Uri;
-import org.asynchttpclient.websocket.WebSocketUpgradeHandler;
+import org.asynchttpclient.ws.WebSocketUpgradeHandler;
 import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 import org.glassfish.grizzly.http.HttpContent;
@@ -55,6 +55,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.http.HttpRequestPacket;
 

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/HttpTxContext.java

@@ -20,7 +20,7 @@
 import org.asynchttpclient.providers.grizzly.statushandler.StatusHandler.InvocationStatus;
 import org.asynchttpclient.uri.Uri;
 import org.asynchttpclient.util.AsyncHttpProviderUtils;
-import org.asynchttpclient.websocket.WebSocket;
+import org.asynchttpclient.ws.WebSocket;
 import org.glassfish.grizzly.CloseListener;
 import org.glassfish.grizzly.CloseType;
 import org.glassfish.grizzly.Closeable;

providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/websocket/AHCWebSocketListenerAdapter.java renamed to providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/ws/AHCWebSocketListenerAdapter.java

@@ -11,14 +11,14 @@
  * See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
  */
 
-package org.asynchttpclient.providers.grizzly.websocket;
-
-import org.asynchttpclient.websocket.WebSocketByteListener;
-import org.asynchttpclient.websocket.WebSocketCloseCodeReasonListener;
-import org.asynchttpclient.websocket.WebSocketListener;
-import org.asynchttpclient.websocket.WebSocketPingListener;
-import org.asynchttpclient.websocket.WebSocketPongListener;
-import org.asynchttpclient.websocket.WebSocketTextListener;
+package org.asynchttpclient.providers.grizzly.ws;
+
+import org.asynchttpclient.ws.WebSocketByteListener;
+import org.asynchttpclient.ws.WebSocketCloseCodeReasonListener;
+import org.asynchttpclient.ws.WebSocketListener;
+import org.asynchttpclient.ws.WebSocketPingListener;
+import org.asynchttpclient.ws.WebSocketPongListener;
+import org.asynchttpclient.ws.WebSocketTextListener;
 import org.glassfish.grizzly.websockets.ClosingFrame;
 import org.glassfish.grizzly.websockets.DataFrame;