Fixing expectations of internal impl now that WebSocketSession exists

3 files changed, 40 insertions, 6 deletions

diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketBlockingConnection.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketBlockingConnection.java
index 7d278aa8bc..624f18e285 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketBlockingConnection.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketBlockingConnection.java
@@ -20,7 +20,7 @@ import java.util.concurrent.ExecutionException;
 
 import org.eclipse.jetty.util.FutureCallback;
 import org.eclipse.jetty.websocket.api.WebSocketConnection;
-import org.eclipse.jetty.websocket.io.RawConnection;
+import org.eclipse.jetty.websocket.io.WebSocketSession;
 import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
 
 /**
@@ -30,17 +30,17 @@ import org.eclipse.jetty.websocket.protocol.WebSocketFrame;
  */
 public class WebSocketBlockingConnection
 {
-    private final RawConnection conn;
+    private final WebSocketSession conn;
 
     public WebSocketBlockingConnection(WebSocketConnection conn)
     {
-        if (conn instanceof RawConnection)
+        if (conn instanceof WebSocketSession)
         {
-            this.conn = (RawConnection)conn;
+            this.conn = (WebSocketSession)conn;
         }
         else
         {
-            throw new IllegalArgumentException("WebSocketConnection must implement internal RawConnection interface");
+            throw new IllegalArgumentException("WebSocketConnection must implement internal WebSocketSession interface");
         }
     }
 
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketOutputStream.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketOutputStream.java
index 94aedf841a..4da62a0fec 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketOutputStream.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketOutputStream.java
@@ -18,8 +18,24 @@ package org.eclipse.jetty.websocket.api.io;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.eclipse.jetty.websocket.api.WebSocketConnection;
+import org.eclipse.jetty.websocket.io.WebSocketSession;
+
 public class WebSocketOutputStream extends OutputStream
 {
+    private final WebSocketSession conn;
+
+    public WebSocketOutputStream(WebSocketConnection conn)
+    {
+        if (conn instanceof WebSocketSession)
+        {
+            this.conn = (WebSocketSession)conn;
+        }
+        else
+        {
+            throw new IllegalArgumentException("WebSocketConnection must implement internal WebSocketSession interface");
+        }
+    }
 
     @Override
     public void write(int b) throws IOException
diff --git a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java
index 22becf37a0..9f04b16b54 100644
--- a/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java
+++ b/jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/api/io/WebSocketWriter.java
@@ -17,9 +17,28 @@ package org.eclipse.jetty.websocket.api.io;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.nio.charset.Charset;
+
+import org.eclipse.jetty.util.StringUtil;
+import org.eclipse.jetty.websocket.api.WebSocketConnection;
+import org.eclipse.jetty.websocket.io.WebSocketSession;
 
 public class WebSocketWriter extends Writer
 {
+    private final Charset charset = StringUtil.__UTF8_CHARSET;
+    private final WebSocketSession conn;
+
+    public WebSocketWriter(WebSocketConnection conn)
+    {
+        if (conn instanceof WebSocketSession)
+        {
+            this.conn = (WebSocketSession)conn;
+        }
+        else
+        {
+            throw new IllegalArgumentException("WebSocketConnection must implement internal WebSocketSession interface");
+        }
+    }
 
     @Override
     public void close() throws IOException
@@ -41,5 +60,4 @@ public class WebSocketWriter extends Writer
         // TODO Auto-generated method stub
 
     }
-
 }