Starting to migrated to 82, still need to figure out how to inject HttpSession

Arun Gupta · Arun Gupta · commit 97b05efcd7ed · 2013-03-28T19:35:16.000Z
Former-commit-id: 32e3bd594384ccb077f456616e0a253dfde0088a
diff --git a/samples/websocket/httpsession/src/main/java/org/glassfish/httpsession/MyEndpoint.java b/samples/websocket/httpsession/src/main/java/org/glassfish/httpsession/MyEndpoint.java
@@ -43,7 +43,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.websocket.Endpoint;
-import javax.websocket.EndpointConfiguration;
+import javax.websocket.EndpointConfig;
 import javax.websocket.MessageHandler;
 import javax.websocket.Session;
 
@@ -53,8 +53,8 @@
 public class MyEndpoint extends Endpoint {
 
     @Override
-    public void onOpen(final Session session, EndpointConfiguration ec) {
-        session.addMessageHandler(new MessageHandler.Basic<String>() {
+    public void onOpen(final Session session, EndpointConfig ec) {
+        session.addMessageHandler(new MessageHandler.Whole<String>() {
 
             @Override
             public void onMessage(String name) {
diff --git a/samples/websocket/httpsession/src/main/java/org/glassfish/httpsession/MyEndpointConfiguration.java b/samples/websocket/httpsession/src/main/java/org/glassfish/httpsession/MyEndpointConfiguration.java
@@ -40,49 +40,37 @@
 package org.glassfish.httpsession;
 
 import java.util.Collections;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 import javax.servlet.http.HttpSession;
-import javax.websocket.Extension;
+import javax.websocket.Endpoint;
 import javax.websocket.HandshakeResponse;
-import javax.websocket.server.DefaultServerConfiguration;
 import javax.websocket.server.HandshakeRequest;
-import javax.websocket.server.ServerEndpointConfiguration;
+import javax.websocket.server.ServerApplicationConfig;
+import javax.websocket.server.ServerEndpointConfig;
 
 /**
  * @author Arun Gupta
  */
-// "implements ServerEndpointConfiguration" needs to be here,
-// most likely Servlet issue; see http://java.net/jira/browse/GLASSFISH-19551
-// (should be reopened, it is currently discussed internally)
+public class MyEndpointConfiguration implements ServerApplicationConfig {
 
-// Also providing an implementation of three methods until
-// http://java.net/jira/browse/WEBSOCKET_SPEC-128 is fixed.
-public class MyServerConfiguration extends DefaultServerConfiguration implements ServerEndpointConfiguration {
-
-    public MyServerConfiguration() {
-        super(MyEndpoint.class, "websocket");
-    }
-
-    @Override
-    public String getNegotiatedSubprotocol(List<String> requestedSubprotocols) {
-        return null;
-    }
-
-    @Override
-    public List<Extension> getNegotiatedExtensions(List<Extension> requestedExtensions) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public boolean checkOrigin(String originHeaderValue) {
-        return true;
+@Override
+    public Set<ServerEndpointConfig> getEndpointConfigs(Set<Class<? extends Endpoint>> set) {
+        return new HashSet<ServerEndpointConfig>() {{
+            add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/websocket").build());
+        }};
     }
 
     @Override
-    public void modifyHandshake(HandshakeRequest request, HandshakeResponse response) {
-        HttpSession httpSession = (HttpSession)request.getSession();
-        System.out.println(httpSession);
-        System.out.println("Invoked from: " + httpSession.getServletContext().getContextPath());
-        super.modifyHandshake(request, response);
+    public Set<Class<?>> getAnnotatedEndpointClasses(Set<Class<?>> set) {
+        return Collections.emptySet();
     }
+    
+//    @Override
+//    public void modifyHandshake(HandshakeRequest request, HandshakeResponse response) {
+//        HttpSession httpSession = (HttpSession)request.getSession();
+//        System.out.println(httpSession);
+//        System.out.println("Invoked from: " + httpSession.getServletContext().getContextPath());
+//        super.modifyHandshake(request, response);
+//    }
 }
diff --git a/samples/websocket/httpsession/src/main/webapp/index.jsp b/samples/websocket/httpsession/src/main/webapp/index.jsp
@@ -57,11 +57,6 @@
                 <input onclick="sayHello();" value="Say Hello" type="button"> 
                 <input id="myField" value="WebSocket" type="text"><br>
             </form>
-            <form action=""> 
-                <h2>Binary Data</h2>
-                <input onclick="echoBinary();" value="Echo" type="button"> 
-                <input id="myField2" value="8" type="text"><br>
-            </form>
         </div>
         <div id="output"></div>
         <script language="javascript" type="text/javascript" src="websocket.js">
