Move WebSocketListener.Draft into it's own source file, and rename to WebSocketDraft. Also added a couple new convenience constructors to both the Client and Server classes.

TooTallNate · TooTallNate · commit c33f20cb2dbe · 2010-10-16T11:48:06.000-07:00
diff --git a/src/net/tootallnate/websocket/WebSocketClient.java b/src/net/tootallnate/websocket/WebSocketClient.java
@@ -15,8 +15,6 @@
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import net.tootallnate.websocket.WebSocketListener.Draft;
-
 /**
  * The <tt>WebSocketClient</tt> is an abstract class that expects a valid
  * "ws://" URI to connect to. When connected, an instance recieves important
@@ -51,9 +49,9 @@ public abstract class WebSocketClient implements Runnable, WebSocketListener {
    */
   private boolean running;
   /**
-   * The Websocket mode this client is in.
+   * The Draft of the WebSocket protocol the Client is adhering to.
    */
-  private Draft draft;
+  private WebSocketDraft draft;
   /**
    * Number 1 used in handshake 
    */
@@ -67,14 +65,18 @@ public abstract class WebSocketClient implements Runnable, WebSocketListener {
    */
   private byte[] key3 = null;
 
-  // CONSTRUCTOR /////////////////////////////////////////////////////////////
+  // CONSTRUCTORS ////////////////////////////////////////////////////////////
+  public WebSocketClient(URI serverURI) {
+    this(serverURI, WebSocketDraft.AUTO);
+  }
+
   /**
    * Constructs a WebSocketClient instance and sets it to the connect to the
    * specified URI. The client does not attampt to connect automatically. You
    * must call <var>connect</var> first to initiate the socket connection.
    * @param serverUri The <tt>URI</tt> of the WebSocket server to connect to.
    */
-  public WebSocketClient(URI serverUri,Draft draft) {
+  public WebSocketClient(URI serverUri, WebSocketDraft draft) {
     this.uri = serverUri;
     this.draft = draft;
   }
@@ -89,7 +91,7 @@ public URI getURI() {
   }
   
   @Override
-  public Draft getDraft() {
+  public WebSocketDraft getDraft() {
     return this.draft;
   }
 
@@ -179,7 +181,7 @@ public void run() {
                               "Connection: Upgrade\r\n" +
                               "Host: " + host + "\r\n" +
                               "Origin: " + origin + "\r\n";
-            if (this.draft == Draft.DRAFT76) {
+            if (this.draft == WebSocketDraft.DRAFT76) {
               request += "Sec-WebSocket-Key1: " + this.generateKey() + "\r\n";
               request += "Sec-WebSocket-Key2: " + this.generateKey() + "\r\n";
               this.key3 = new byte[8];
@@ -257,31 +259,31 @@ private String generateKey() {
   public boolean onHandshakeRecieved(WebSocket conn, String handshake, byte[] reply) throws IOException, NoSuchAlgorithmException {
     // TODO: Do some parsing of the returned handshake, and close connection
     // (return false) if we recieved anything unexpected.
-    if(this.draft == Draft.DRAFT76) {
+    if(this.draft == WebSocketDraft.DRAFT76) {
       if (reply == null) {
         return false;
       }
       byte[] challenge = new byte[] {
-          (byte)( this.number1 >> 24 ),
-                (byte)( (this.number1 << 8) >> 24 ),
-                (byte)( (this.number1 << 16) >> 24 ),
-                (byte)( (this.number1 << 24) >> 24 ),
-                (byte)(  this.number2 >> 24 ),
-                (byte)( (this.number2 << 8) >> 24 ),
-                (byte)( (this.number2 << 16) >> 24 ),
-                (byte)( (this.number2 << 24) >> 24 ),
-                this.key3[0],
-                this.key3[1],
-                this.key3[2],
-                this.key3[3],
-                this.key3[4],
-                this.key3[5],
-                this.key3[6],
-                this.key3[7]
+        (byte)( this.number1 >> 24 ),
+        (byte)( (this.number1 << 8) >> 24 ),
+        (byte)( (this.number1 << 16) >> 24 ),
+        (byte)( (this.number1 << 24) >> 24 ),
+        (byte)(  this.number2 >> 24 ),
+        (byte)( (this.number2 << 8) >> 24 ),
+        (byte)( (this.number2 << 16) >> 24 ),
+        (byte)( (this.number2 << 24) >> 24 ),
+        this.key3[0],
+        this.key3[1],
+        this.key3[2],
+        this.key3[3],
+        this.key3[4],
+        this.key3[5],
+        this.key3[6],
+        this.key3[7]
       };
       MessageDigest md5 = MessageDigest.getInstance("MD5");
       byte[] expected = md5.digest(challenge);
-      for(int i = 0; i < reply.length; i++){
+      for (int i = 0; i < reply.length; i++) {
         if (expected[i] != reply[i]) {
           return false;
         }
diff --git a/src/net/tootallnate/websocket/WebSocketDraft.java b/src/net/tootallnate/websocket/WebSocketDraft.java
@@ -0,0 +1,10 @@
+package net.tootallnate.websocket;
+
+/**
+ * Enum for WebSocket Draft
+ */
+public enum WebSocketDraft {
+  AUTO,
+  DRAFT75,
+  DRAFT76
+}
diff --git a/src/net/tootallnate/websocket/WebSocketListener.java b/src/net/tootallnate/websocket/WebSocketListener.java
@@ -9,14 +9,6 @@
  * @author Nathan Rajlich
  */
 interface WebSocketListener {
-  /**
-   * Enum for WebSocket Draft
-   */
-  public static enum Draft {
-    AUTO,
-    DRAFT75,
-    DRAFT76
-  }
   
   /**
    * Called when the socket connection is first established, and the WebSocket
@@ -58,5 +50,5 @@ public static enum Draft {
   /**
    * Called to retrieve the Draft of this listener.
    */
-  public Draft getDraft();  
+  public WebSocketDraft getDraft();  
 }
diff --git a/src/net/tootallnate/websocket/WebSocketServer.java b/src/net/tootallnate/websocket/WebSocketServer.java
@@ -52,24 +52,37 @@ public abstract class WebSocketServer implements Runnable, WebSocketListener {
    */
   private Selector selector;
   /**
-   * The Draft of the WebSocket protocol the Server is running adhering to.
+   * The Draft of the WebSocket protocol the Server is adhering to.
    */
-  private Draft draft;
-  // CONSTRUCTOR /////////////////////////////////////////////////////////////
+  private WebSocketDraft draft;
+
+
+  // CONSTRUCTORS ////////////////////////////////////////////////////////////
   /**
    * Nullary constructor. Creates a WebSocketServer that will attempt to
    * listen on port WebSocket.DEFAULT_PORT.
    */
   public WebSocketServer() {
-    this(WebSocket.DEFAULT_PORT, Draft.AUTO);
+    this(WebSocket.DEFAULT_PORT, WebSocketDraft.AUTO);
   }
-
+  
   /**
    * Creates a WebSocketServer that will attempt to listen on port
    * <var>port</var>.
    * @param port The port number this server should listen on.
    */
-  public WebSocketServer(int port, Draft draft) {
+  public WebSocketServer(int port) {
+    this(port, WebSocketDraft.AUTO);
+  }
+
+  /**
+   * Creates a WebSocketServer that will attempt to listen on port <var>port</var>,
+   * and comply with <tt>WebSocketDraft</tt> version <var>draft</var>.
+   * @param port The port number this server should listen on.
+   * @param draft The version of the WebSocket protocol that this server
+   *              instance should comply to.
+   */
+  public WebSocketServer(int port, WebSocketDraft draft) {
     this.connections = new CopyOnWriteArraySet<WebSocket>();
     this.draft = draft;
     setPort(port);
@@ -169,7 +182,7 @@ public int getPort() {
     return this.port;
   }
 
-  public Draft getDraft() {
+  public WebSocketDraft getDraft() {
     return this.draft;
   }
 
