Change web socket package into ws

Stephane Landelle · Stephane Landelle · commit a6e2fec796b2 · 2014-12-01T11:03:42.000+01:00
diff --git a/src/main/java/com/ning/http/client/AsyncHttpClientConfig.java b/src/main/java/com/ning/http/client/AsyncHttpClientConfig.java
@@ -183,8 +183,8 @@ public int getConnectTimeout() {
     }
 
     /**
-     * Return the maximum time, in milliseconds, a {@link com.ning.http.client.websocket.WebSocket} may be idle before being timed out.
-     * @return the maximum time, in milliseconds, a {@link com.ning.http.client.websocket.WebSocket} may be idle before being timed out.
+     * Return the maximum time, in milliseconds, a {@link com.ning.http.client.ws.WebSocket} may be idle before being timed out.
+     * @return the maximum time, in milliseconds, a {@link com.ning.http.client.ws.WebSocket} may be idle before being timed out.
      */
     public int getWebSocketTimeout() {
         return webSocketTimeout;
@@ -546,10 +546,10 @@ public Builder setConnectTimeout(int connectTimeOut) {
         }
 
         /**
-         * Set the maximum time in millisecond an {@link com.ning.http.client.websocket.WebSocket} can stay idle.
+         * Set the maximum time in millisecond an {@link com.ning.http.client.ws.WebSocket} can stay idle.
          *
          * @param webSocketTimeout
-         *         the maximum time in millisecond an {@link com.ning.http.client.websocket.WebSocket} can stay idle.
+         *         the maximum time in millisecond an {@link com.ning.http.client.ws.WebSocket} can stay idle.
          * @return a {@link Builder}
          */
         public Builder setWebSocketTimeout(int webSocketTimeout) {
diff --git a/src/main/java/com/ning/http/client/UpgradeHandler.java b/src/main/java/com/ning/http/client/UpgradeHandler.java
@@ -13,7 +13,7 @@
 package com.ning.http.client;
 
 /**
- * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link com.ning.http.client.websocket.WebSocket}
+ * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link com.ning.http.client.ws.WebSocket}
  * as type.
  *
  * @param <T>
diff --git a/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java b/src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java
@@ -107,14 +107,14 @@
 import com.ning.http.client.multipart.Part;
 import com.ning.http.client.ntlm.NTLMEngine;
 import com.ning.http.client.uri.Uri;
-import com.ning.http.client.websocket.WebSocket;
-import com.ning.http.client.websocket.WebSocketByteListener;
-import com.ning.http.client.websocket.WebSocketCloseCodeReasonListener;
-import com.ning.http.client.websocket.WebSocketListener;
-import com.ning.http.client.websocket.WebSocketPingListener;
-import com.ning.http.client.websocket.WebSocketPongListener;
-import com.ning.http.client.websocket.WebSocketTextListener;
-import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketByteListener;
+import com.ning.http.client.ws.WebSocketCloseCodeReasonListener;
+import com.ning.http.client.ws.WebSocketListener;
+import com.ning.http.client.ws.WebSocketPingListener;
+import com.ning.http.client.ws.WebSocketPongListener;
+import com.ning.http.client.ws.WebSocketTextListener;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
 import com.ning.http.util.AsyncHttpProviderUtils;
 import com.ning.http.util.AuthenticatorUtils;
 import com.ning.http.util.ProxyUtils;
diff --git a/src/main/java/com/ning/http/client/providers/netty/handler/WebSocketProtocol.java b/src/main/java/com/ning/http/client/providers/netty/handler/WebSocketProtocol.java
@@ -42,7 +42,7 @@
 import com.ning.http.client.providers.netty.response.NettyResponseHeaders;
 import com.ning.http.client.providers.netty.response.NettyResponseStatus;
 import com.ning.http.client.providers.netty.ws.NettyWebSocket;
-import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
 
 import java.io.IOException;
 import java.util.Locale;
diff --git a/src/main/java/com/ning/http/client/providers/netty/request/NettyRequestSender.java b/src/main/java/com/ning/http/client/providers/netty/request/NettyRequestSender.java
@@ -54,7 +54,7 @@
 import com.ning.http.client.providers.netty.request.timeout.RequestTimeoutTimerTask;
 import com.ning.http.client.providers.netty.request.timeout.TimeoutsHolder;
 import com.ning.http.client.uri.Uri;
-import com.ning.http.client.websocket.WebSocketUpgradeHandler;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/src/main/java/com/ning/http/client/providers/netty/ws/NettyWebSocket.java b/src/main/java/com/ning/http/client/providers/netty/ws/NettyWebSocket.java
@@ -31,15 +31,15 @@
 import com.ning.http.client.HttpResponseBodyPart;
 import com.ning.http.client.providers.netty.NettyAsyncHttpProviderConfig;
 import com.ning.http.client.providers.netty.response.NettyResponseBodyPart;
-import com.ning.http.client.websocket.WebSocket;
-import com.ning.http.client.websocket.WebSocketByteFragmentListener;
-import com.ning.http.client.websocket.WebSocketByteListener;
-import com.ning.http.client.websocket.WebSocketCloseCodeReasonListener;
-import com.ning.http.client.websocket.WebSocketListener;
-import com.ning.http.client.websocket.WebSocketPingListener;
-import com.ning.http.client.websocket.WebSocketPongListener;
-import com.ning.http.client.websocket.WebSocketTextFragmentListener;
-import com.ning.http.client.websocket.WebSocketTextListener;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketByteFragmentListener;
+import com.ning.http.client.ws.WebSocketByteListener;
+import com.ning.http.client.ws.WebSocketCloseCodeReasonListener;
+import com.ning.http.client.ws.WebSocketListener;
+import com.ning.http.client.ws.WebSocketPingListener;
+import com.ning.http.client.ws.WebSocketPongListener;
+import com.ning.http.client.ws.WebSocketTextFragmentListener;
+import com.ning.http.client.ws.WebSocketTextListener;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/com/ning/http/client/ws/DefaultWebSocketListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 /**
  * Default WebSocketListener implementation.  Most methods are no-ops.  This 
diff --git a/src/main/java/com/ning/http/client/ws/WebSocket.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import java.io.Closeable;
 
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketByteFragmentListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import com.ning.http.client.HttpResponseBodyPart;
 
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketByteListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 /**
  * A {@link WebSocketListener} for bytes
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketCloseCodeReasonListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 /**
  * Extend the normal close listener with one that support the WebSocket's code and reason.
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 /**
  * A generic {@link WebSocketListener} for WebSocket events. Use the appropriate listener for receiving message bytes.
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketPingListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 /**
  * A WebSocket's Ping Listener
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketPongListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 /**
  * A WebSocket's Pong Listener
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketTextFragmentListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import com.ning.http.client.HttpResponseBodyPart;
 
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketTextListener.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 /**
  * A {@link WebSocketListener} for text message
diff --git a/src/main/java/com/ning/http/client/ws/WebSocketUpgradeHandler.java b/src/main/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import com.ning.http.client.AsyncHandler;
 import com.ning.http.client.HttpResponseBodyPart;
diff --git a/src/test/java/com/ning/http/client/ws/AbstractBasicTest.java b/src/test/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClientConfig;
diff --git a/src/test/java/com/ning/http/client/ws/ByteMessageTest.java b/src/test/java/com/ning/http/client/ws/ByteMessageTest.java
@@ -10,13 +10,16 @@
  * "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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import static org.testng.Assert.assertEquals;
 
 import org.testng.annotations.Test;
 
 import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketByteListener;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/test/java/com/ning/http/client/ws/CloseCodeReasonMessageTest.java b/src/test/java/com/ning/http/client/ws/CloseCodeReasonMessageTest.java
@@ -10,9 +10,15 @@
  * "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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketCloseCodeReasonListener;
+import com.ning.http.client.ws.WebSocketListener;
+import com.ning.http.client.ws.WebSocketTextListener;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
+
 import org.testng.annotations.Test;
 
 import java.util.concurrent.CountDownLatch;
@@ -75,11 +81,11 @@ public Listener(CountDownLatch latch, AtomicReference<String> text) {
         }
 
         @Override
-        public void onOpen(com.ning.http.client.websocket.WebSocket websocket) {
+        public void onOpen(com.ning.http.client.ws.WebSocket websocket) {
         }
 
         @Override
-        public void onClose(com.ning.http.client.websocket.WebSocket websocket) {
+        public void onClose(com.ning.http.client.ws.WebSocket websocket) {
         }
 
         public void onClose(WebSocket websocket, int code, String reason) {
@@ -108,11 +114,11 @@ public void onMessage(String message) {
                 }
 
                 @Override
-                public void onOpen(com.ning.http.client.websocket.WebSocket websocket) {
+                public void onOpen(com.ning.http.client.ws.WebSocket websocket) {
                 }
 
                 @Override
-                public void onClose(com.ning.http.client.websocket.WebSocket websocket) {
+                public void onClose(com.ning.http.client.ws.WebSocket websocket) {
                 }
 
                 @Override
@@ -144,11 +150,11 @@ public void onMessage(String message) {
                 }
 
                 @Override
-                public void onOpen(com.ning.http.client.websocket.WebSocket websocket) {
+                public void onOpen(com.ning.http.client.ws.WebSocket websocket) {
                 }
 
                 @Override
-                public void onClose(com.ning.http.client.websocket.WebSocket websocket) {
+                public void onClose(com.ning.http.client.ws.WebSocket websocket) {
                 }
 
                 @Override
diff --git a/src/test/java/com/ning/http/client/ws/ProxyTunnellingTest.java b/src/test/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import static org.testng.Assert.assertEquals;
 
@@ -25,7 +25,10 @@
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.ProxyServer;
-import com.ning.http.client.websocket.TextMessageTest.EchoTextWebSocket;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketTextListener;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
+import com.ning.http.client.ws.TextMessageTest.EchoTextWebSocket;
 
 import javax.servlet.http.HttpServletRequest;
 
diff --git a/src/test/java/com/ning/http/client/ws/RedirectTest.java b/src/test/java/com/ning/http/client/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 com.ning.http.client.websocket;
+package com.ning.http.client.ws;
 
 import static org.testng.Assert.assertEquals;
 
@@ -32,6 +32,9 @@
 
 import com.ning.http.client.AsyncHttpClient;
 import com.ning.http.client.AsyncHttpClientConfig;
+import com.ning.http.client.ws.WebSocket;
+import com.ning.http.client.ws.WebSocketListener;
+import com.ning.http.client.ws.WebSocketUpgradeHandler;
 
 public abstract class RedirectTest extends AbstractBasicTest {
 
@@ -92,13 +95,13 @@ public void testRedirectToWSResource() throws Exception {
             WebSocket websocket = client.prepareGet(getRedirectURL()).execute(new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WebSocketListener() {
 
                 @Override
-                public void onOpen(com.ning.http.client.websocket.WebSocket websocket) {
+                public void onOpen(com.ning.http.client.ws.WebSocket websocket) {
                     text.set("OnOpen");
                     latch.countDown();
                 }
 
                 @Override
-                public void onClose(com.ning.http.client.websocket.WebSocket websocket) {
+                public void onClose(com.ning.http.client.ws.WebSocket websocket) {
                 }
 
                 @Override
diff --git a/src/test/java/com/ning/http/client/ws/TextMessageTest.java b/src/test/java/com/ning/http/client/ws/TextMessageTest.java
diff --git a/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyByteMessageTest.java b/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyByteMessageTest.java
diff --git a/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyCloseCodeReasonMsgTest.java b/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyCloseCodeReasonMsgTest.java
diff --git a/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyProxyTunnellingTest.java b/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyProxyTunnellingTest.java
diff --git a/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyRedirectTest.java b/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyRedirectTest.java
diff --git a/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyTextMessageTest.java b/src/test/java/com/ning/http/client/ws/grizzly/GrizzlyTextMessageTest.java
diff --git a/src/test/java/com/ning/http/client/ws/netty/NettyByteMessageTest.java b/src/test/java/com/ning/http/client/ws/netty/NettyByteMessageTest.java
diff --git a/src/test/java/com/ning/http/client/ws/netty/NettyCloseCodeReasonMsgTest.java b/src/test/java/com/ning/http/client/ws/netty/NettyCloseCodeReasonMsgTest.java
diff --git a/src/test/java/com/ning/http/client/ws/netty/NettyProxyTunnellingTest.java b/src/test/java/com/ning/http/client/ws/netty/NettyProxyTunnellingTest.java
diff --git a/src/test/java/com/ning/http/client/ws/netty/NettyRedirectTest.java b/src/test/java/com/ning/http/client/ws/netty/NettyRedirectTest.java
diff --git a/src/test/java/com/ning/http/client/ws/netty/NettyTextMessageTest.java b/src/test/java/com/ning/http/client/ws/netty/NettyTextMessageTest.java

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`package com.ning.http.client;`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link com.ning.http.client.websocket.WebSocket}`
	`16`	`+ * Invoked when an {@link AsyncHandler.STATE#UPGRADE} is returned. Currently the library only support {@link com.ning.http.client.ws.WebSocket}`
`17`	`17`	`* as type.`
`18`	`18`	`*`
`19`	`19`	`* @param <T>`