Rename sendTextMessage into sendMessage and streamText into stream, close AsyncHttpClient#671

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyAsyncHttpProvider.java

@@ -2705,13 +2705,13 @@ public WebSocket stream(byte[] fragment, int offset, int len, boolean last) {
         }
 
         @Override
-        public WebSocket sendTextMessage(String message) {
+        public WebSocket sendMessage(String message) {
             gWebSocket.send(message);
             return this;
         }
 
         @Override
-        public WebSocket streamText(String fragment, boolean last) {
+        public WebSocket stream(String fragment, boolean last) {
             gWebSocket.stream(last, fragment);
             return this;
         }

src/main/java/com/ning/http/client/providers/netty/ws/NettyWebSocket.java

@@ -91,13 +91,13 @@ public WebSocket stream(byte[] fragment, int offset, int len, boolean last) {
     }
 
     @Override
-    public WebSocket sendTextMessage(String message) {
+    public WebSocket sendMessage(String message) {
         channel.write(new TextWebSocketFrame(message));
         return this;
     }
 
     @Override
-    public WebSocket streamText(String fragment, boolean last) {
+    public WebSocket stream(String fragment, boolean last) {
         TextWebSocketFrame frame = new TextWebSocketFrame(fragment);
         frame.setFinalFragment(last);
         channel.write(frame);

src/main/java/com/ning/http/client/websocket/WebSocket.java

@@ -52,7 +52,7 @@ public interface WebSocket extends Closeable {
      * @param message a text message
      * @return this.
      */
-    WebSocket sendTextMessage(String message);
+    WebSocket sendMessage(String message);
 
     /**
      * Allows streaming of multiple text fragments.
@@ -61,7 +61,7 @@ public interface WebSocket extends Closeable {
      * @param last     flag indicating whether or not this is the last fragment.
      * @return this.
      */
-    WebSocket streamText(String fragment, boolean last);
+    WebSocket stream(String fragment, boolean last);
 
     /**
      * Send a <code>ping</ping> with an optional payload

src/test/java/com/ning/http/client/websocket/ProxyTunnellingTest.java

@@ -149,7 +149,7 @@ public void onError(Throwable t) {
                 }
             }).build()).get();
 
-            websocket.sendTextMessage("ECHO");
+            websocket.sendMessage("ECHO");
 
             latch.await();
             assertEquals(text.get(), "ECHO");

src/test/java/com/ning/http/client/websocket/TextMessageTest.java

@@ -232,7 +232,7 @@ public void onError(Throwable t) {
                 }
             }).build()).get();
 
-            websocket.sendTextMessage("ECHO");
+            websocket.sendMessage("ECHO");
 
             latch.await();
             assertEquals(text.get(), "ECHO");
@@ -294,7 +294,7 @@ public void onError(Throwable t) {
                 }
             }).build()).get();
 
-            websocket.sendTextMessage("ECHO");
+            websocket.sendMessage("ECHO");
 
             latch.await();
             assertEquals(text.get(), "ECHOECHO");
@@ -320,7 +320,7 @@ public void onMessage(String message) {
 
                 @Override
                 public void onOpen(com.ning.http.client.websocket.WebSocket websocket) {
-                    websocket.sendTextMessage("ECHO").sendTextMessage("ECHO");
+                    websocket.sendMessage("ECHO").sendMessage("ECHO");
                 }
 
                 @Override
@@ -372,8 +372,8 @@ public void onError(Throwable t) {
                 }
             }).build()).get();
 
-            websocket.streamText("ECHO", false);
-            websocket.streamText("ECHO", true);
+            websocket.stream("ECHO", false);
+            websocket.stream("ECHO", true);
 
             latch.await();
             assertEquals(text.get(), "ECHOECHO");
@@ -414,10 +414,10 @@ public void onError(Throwable t) {
                 }
             }).build()).get();
 
-            websocket.sendTextMessage("ECHO");
+            websocket.sendMessage("ECHO");
             textLatch.await();
 
-            websocket.sendTextMessage("CLOSE");
+            websocket.sendMessage("CLOSE");
             closeLatch.await();
 
             assertEquals(text.get(), "ECHO");