Store the handshake as part of the WebsocketChannel.

projectodd · Jan 16, 2015 · 9c6aaf0 · 9c6aaf0
1 parent df7b436
commit 9c6aaf0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/...eb/src/main/java/org/projectodd/wunderboss/web/async/websocket/JavaxWebsocketChannel.java b/...eb/src/main/java/org/projectodd/wunderboss/web/async/websocket/JavaxWebsocketChannel.java
@@ -36,7 +36,7 @@ public JavaxWebsocketChannel(final OnOpen onOpen,
     }
 
     @Override
-    public Endpoint getEndpoint() {
+    public Endpoint endpoint() {
         final JavaxWebsocketChannel channel = this;
         return new Endpoint() {
             @Override

diff --git a/...src/main/java/org/projectodd/wunderboss/web/async/websocket/UndertowWebsocketChannel.java b/...src/main/java/org/projectodd/wunderboss/web/async/websocket/UndertowWebsocketChannel.java
@@ -36,7 +36,7 @@ public UndertowWebsocketChannel(final OnOpen onOpen,
     }
 
     @Override
-    public UndertowEndpoint getEndpoint() {
+    public UndertowEndpoint endpoint() {
         final UndertowWebsocketChannel channel = this;
         return new UndertowEndpoint() {
             @Override

diff --git a/...les/web/src/main/java/org/projectodd/wunderboss/web/async/websocket/WebsocketChannel.java b/...les/web/src/main/java/org/projectodd/wunderboss/web/async/websocket/WebsocketChannel.java
@@ -19,7 +19,10 @@
 import org.projectodd.wunderboss.web.async.Channel;
 
 public interface WebsocketChannel extends Channel {
-    Object getEndpoint();
+    Object endpoint();
+    Object handshake();
+
+    void setHandshake(Object handshake);
     void setUnderlyingChannel(Object channel);
 
     interface OnMessage {

diff --git a/...src/main/java/org/projectodd/wunderboss/web/async/websocket/WebsocketChannelSkeleton.java b/...src/main/java/org/projectodd/wunderboss/web/async/websocket/WebsocketChannelSkeleton.java
@@ -26,6 +26,16 @@ public WebsocketChannelSkeleton(final OnOpen onOpen, final OnClose onClose, fina
         this.onError = onError;
     }
 
+    @Override
+    public Object handshake() {
+        return this.handshake;
+    }
+
+    @Override
+    public void setHandshake(Object handshake) {
+        this.handshake = handshake;
+    }
+
     @Override
     public void notifyOpen(final Object context) {
         if (!this.openNotified &&
@@ -64,6 +74,7 @@ protected void notifyError(Throwable error) {
     private final OnClose onClose;
     private final OnMessage onMessage;
     private final OnError onError;
+    private Object handshake;
     private boolean closeNotified = false;
     private boolean openNotified = false;
 }