Moving binary tests to endpoint

Author: arun-gupta

…vaee7/websocket/endpoint/MyEndpoint.java …socket/endpoint/MyEndpointByteArray.javawebsocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpoint.java renamed to websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArray.java websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpoint.java renamed to websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArray.java

@@ -46,14 +46,8 @@
 /**
  * @author Arun Gupta
  */
-@ServerEndpoint("/websocket")
-public class MyEndpoint {
-    
-    @OnMessage
-    public String echoText(String name) {
-        return name;
-    }
-
+@ServerEndpoint("/bytearray")
+public class MyEndpointByteArray {
     @OnMessage
     public byte[] echoBinary(byte[] data) throws IOException {
         return data;

…ket/endpoint/MyEndpointBinaryClient.java …/endpoint/MyEndpointByteArrayClient.javawebsocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointBinaryClient.java renamed to websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArrayClient.java websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointBinaryClient.java renamed to websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteArrayClient.java

@@ -13,8 +13,9 @@
  * @author Arun Gupta
  */
 @ClientEndpoint
-public class MyEndpointBinaryClient {
+public class MyEndpointByteArrayClient {
     public static CountDownLatch latch;
+    public static byte[] response;
 
     @OnOpen
     public void onOpen(Session session) {
@@ -27,6 +28,7 @@ public void onOpen(Session session) {
 
     @OnMessage
     public void processMessage(byte[] message) {
+        response = message;
         latch.countDown();
     }
 }

websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteBuffer.java

@@ -0,0 +1,57 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package org.javaee7.websocket.endpoint;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import javax.websocket.OnMessage;
+import javax.websocket.server.ServerEndpoint;
+
+/**
+ * @author Arun Gupta
+ */
+@ServerEndpoint("/bytebuffer")
+public class MyEndpointByteBuffer {
+    @OnMessage
+    public ByteBuffer echoBinary(ByteBuffer data) throws IOException {
+        System.out.println("echoBinary");
+        return data;
+    }
+}

websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointByteBufferClient.java

@@ -0,0 +1,34 @@
+package org.javaee7.websocket.endpoint;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+/**
+ * @author Arun Gupta
+ */
+@ClientEndpoint
+public class MyEndpointByteBufferClient {
+    public static CountDownLatch latch;
+    public static byte[] response;
+
+    @OnOpen
+    public void onOpen(Session session) {
+        try {
+            session.getBasicRemote().sendBinary(ByteBuffer.wrap("Hello World!".getBytes()));
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+    }
+    
+    @OnMessage
+    public void processMessage(byte[] message) {
+        response = message;
+        latch.countDown();
+    }
+}

websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointInputStream.java

@@ -0,0 +1,62 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package org.javaee7.websocket.endpoint;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import javax.websocket.OnMessage;
+import javax.websocket.Session;
+import javax.websocket.server.ServerEndpoint;
+
+/**
+ * @author Arun Gupta
+ */
+@ServerEndpoint("/inputstream")
+public class MyEndpointInputStream {
+
+    @OnMessage
+    public void echoStream(InputStream stream, Session session) throws IOException {
+        System.out.println("echoStream: " + stream);
+        byte[] b = new byte[12];
+        stream.read(b);
+        session.getBasicRemote().sendBinary(ByteBuffer.wrap(b));
+    }
+}

websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointInputStreamClient.java

@@ -0,0 +1,34 @@
+package org.javaee7.websocket.endpoint;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+/**
+ * @author Arun Gupta
+ */
+@ClientEndpoint
+public class MyEndpointInputStreamClient {
+    public static CountDownLatch latch;
+    public static byte[] response;
+
+    @OnOpen
+    public void onOpen(Session session) {
+        try {
+            session.getBasicRemote().sendBinary(ByteBuffer.wrap("Hello World!".getBytes()));
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+    }
+    
+    @OnMessage
+    public void processMessage(byte[] message) {
+        response = message;
+        latch.countDown();
+    }
+}

websocket/endpoint/src/main/java/org/javaee7/websocket/endpoint/MyEndpointText.java

@@ -0,0 +1,55 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+package org.javaee7.websocket.endpoint;
+
+import javax.websocket.OnMessage;
+import javax.websocket.server.ServerEndpoint;
+
+/**
+ * @author Arun Gupta
+ */
+@ServerEndpoint("/text")
+public class MyEndpointText {
+    
+    @OnMessage
+    public String echoText(String name) {
+        return name;
+    }
+}

websocket/endpoint/src/test/java/org/javaee7/websocket/endpoint/MyEndpointTest.java

@@ -33,15 +33,20 @@ public class MyEndpointTest {
     @Deployment(testable=false)
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
-                .addClasses(MyEndpoint.class,
+                .addClasses(MyEndpointText.class,
                         MyEndpointTextClient.class,
-                        MyEndpointBinaryClient.class);
+                        MyEndpointByteArray.class,
+                        MyEndpointByteArrayClient.class,
+                        MyEndpointByteBuffer.class,
+                        MyEndpointByteBufferClient.class,
+                        MyEndpointInputStream.class,
+                        MyEndpointInputStreamClient.class);
     }
 
     @Test
     public void testTextEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         MyEndpointTextClient.latch = new CountDownLatch(1);
-        Session session = connectToServer(MyEndpointTextClient.class);
+        Session session = connectToServer(MyEndpointTextClient.class, "/text");
         assertNotNull(session);
         session.addMessageHandler(new MessageHandler.Whole<String>() {
             @Override
@@ -54,29 +59,45 @@ public void onMessage(String text) {
     }
 
     @Test
-    public void testBinaryEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
-        MyEndpointBinaryClient.latch = new CountDownLatch(1);
-        Session session = connectToServer(MyEndpointBinaryClient.class);
+    public void testEndpointByteBuffer() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
+        MyEndpointByteBufferClient.latch = new CountDownLatch(1);
+        Session session = connectToServer(MyEndpointByteBufferClient.class, "bytebuffer");
         assertNotNull(session);
-        session.addMessageHandler(new MessageHandler.Whole<ByteBuffer>() {
-            @Override
-            public void onMessage(ByteBuffer binary) {
-                MyEndpointBinaryClient.latch.countDown();
-                assertEquals(TEXT, binary);
-            }
-        });
-        assertTrue(MyEndpointBinaryClient.latch.await(2, TimeUnit.SECONDS));
+        assertTrue(MyEndpointByteBufferClient.latch.await(2, TimeUnit.SECONDS));
+        assertArrayEquals(TEXT.getBytes(), MyEndpointByteBufferClient.response);
+    }
+
+    @Test
+    public void testEndpointByteArray() throws DeploymentException, IOException, URISyntaxException, InterruptedException {
+        MyEndpointByteArrayClient.latch = new CountDownLatch(1);
+        Session session = connectToServer(MyEndpointByteArrayClient.class, "bytearray");
+        assertNotNull(session);
+        assertTrue(MyEndpointByteArrayClient.latch.await(2, TimeUnit.SECONDS));
+        assertNotNull(MyEndpointByteArrayClient.response);
+        assertArrayEquals(TEXT.getBytes(), MyEndpointByteArrayClient.response);
     }
 
-    public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException {
+    @Test
+    public void testEndpointInputStream() throws DeploymentException, IOException, URISyntaxException, InterruptedException {
+        MyEndpointInputStreamClient.latch = new CountDownLatch(1);
+        Session session = connectToServer(MyEndpointInputStreamClient.class, "inputstream");
+        assertNotNull(session);
+        assertTrue(MyEndpointInputStreamClient.latch.await(2, TimeUnit.SECONDS));
+        assertNotNull(MyEndpointInputStreamClient.response);
+        assertArrayEquals(TEXT.getBytes(), MyEndpointInputStreamClient.response);
+    }
+    
+    
+    public Session connectToServer(Class endpoint, String uriPart) throws DeploymentException, IOException, URISyntaxException {
         WebSocketContainer container = ContainerProvider.getWebSocketContainer();
         URI uri = new URI("ws://"
                         + base.getHost()
                         + ":"
                         + base.getPort()
                         + "/"
                         + base.getPath()
-                        + "/websocket");
+                        + "/"
+                        + uriPart);
         System.out.println("Connecting to: " + uri);
         return container.connectToServer(endpoint, uri);
     }

websocket/pom.xml

@@ -14,7 +14,6 @@
     <name>Java EE 7 WebSocket Samples</name>
 
     <modules>
-        <module>binary</module>
         <module>chat</module>
         <module>encoder</module>
         <module>encoder-client</module>