simplified obtaining the http-get-resource-descriptor by adding method

getResourceDescriptor do the WebSocket interface. TooTallNate#182

Author: Davidiusdadi

src/main/java/org/java_websocket/WebSocket.java

@@ -99,4 +99,10 @@ public enum READYSTATE {
 	 * @return Returns '0 = CONNECTING', '1 = OPEN', '2 = CLOSING' or '3 = CLOSED'
 	 */
 	public abstract READYSTATE getReadyState();
+	
+	/**
+	 * Returns the HTTP Request-URI as defined by http://tools.ietf.org/html/rfc2616#section-5.1.2<br>
+	 * If the opening handshake has not yet happened it will return null.
+	 **/
+	public abstract String getResourceDescriptor();
 }

src/main/java/org/java_websocket/WebSocketImpl.java

@@ -101,6 +101,8 @@ public class WebSocketImpl implements WebSocket {
 	private String closemessage = null;
 	private Integer closecode = null;
 	private Boolean closedremotely = null;
+	
+	private String resourceDescriptor = null;
 
 	/**
 	 * crates a websocket with server role
@@ -211,6 +213,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 								ClientHandshake handshake = (ClientHandshake) tmphandshake;
 								handshakestate = d.acceptHandshakeAsServer( handshake );
 								if( handshakestate == HandshakeState.MATCHED ) {
+									resourceDescriptor = handshake.getResourceDescriptor();
 									ServerHandshakeBuilder response;
 									try {
 										response = wsl.onWebsocketHandshakeReceivedAsServer( this, d, handshake );
@@ -605,6 +608,9 @@ public void startHandshake( ClientHandshakeBuilder handshakedata ) throws Invali
 		// Store the Handshake Request we are about to send
 		this.handshakerequest = draft.postProcessHandshakeRequestAsClient( handshakedata );
 
+		resourceDescriptor = handshakedata.getResourceDescriptor();
+		assert( resourceDescriptor != null );
+		
 		// Notify Listener
 		try {
 			wsl.onWebsocketHandshakeSentAsClient( this, this.handshakerequest );
@@ -714,4 +720,9 @@ public void close() {
 		close( CloseFrame.NORMAL );
 	}
 
+	@Override
+	public String getResourceDescriptor() {
+		return resourceDescriptor;
+	}
+
 }

src/main/java/org/java_websocket/handshake/ClientHandshake.java

@@ -1,5 +1,6 @@
 package org.java_websocket.handshake;
 
 public interface ClientHandshake extends Handshakedata {
+	/**returns the HTTP Request-URI as defined by http://tools.ietf.org/html/rfc2616#section-5.1.2*/
 	public String getResourceDescriptor();
 }

src/main/java/org/java_websocket/handshake/ClientHandshakeBuilder.java

@@ -1,5 +1,5 @@
 package org.java_websocket.handshake;
 
 public interface ClientHandshakeBuilder extends HandshakeBuilder, ClientHandshake {
-	public void setResourceDescriptor( String resourcedescriptor );
+	public void setResourceDescriptor( String resourceDescriptor );
 }

src/main/java/org/java_websocket/handshake/HandshakeImpl1Client.java

@@ -1,16 +1,18 @@
 package org.java_websocket.handshake;
 
 public class HandshakeImpl1Client extends HandshakedataImpl1 implements ClientHandshakeBuilder {
-	private String resourcedescriptor;
+	private String resourceDescriptor = "*";
 
 	public HandshakeImpl1Client() {
 	}
 
-	public void setResourceDescriptor( String resourcedescriptor ) throws IllegalArgumentException {
-		this.resourcedescriptor = resourcedescriptor;
+	public void setResourceDescriptor( String resourceDescriptor ) throws IllegalArgumentException {
+		if(resourceDescriptor==null)
+			throw new IllegalArgumentException( "http resource descriptor must not be null" );
+		this.resourceDescriptor = resourceDescriptor;
 	}
 
 	public String getResourceDescriptor() {
-		return resourcedescriptor;
+		return resourceDescriptor;
 	}
 }