More improvement

Reduced complexity
Removed found issues
Fixed wrong checks in tests

Author: marci4

src/main/java/org/java_websocket/AbstractWrappedByteChannel.java

@@ -30,23 +30,23 @@
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SocketChannel;
 
-/*
+/**
  * @deprecated
  */
 @Deprecated
 public class AbstractWrappedByteChannel implements WrappedByteChannel {
 
 	private final ByteChannel channel;
 
-	/*
+	/**
 	 * @deprecated
 	 */
 	@Deprecated
 	public AbstractWrappedByteChannel( ByteChannel towrap ) {
 		this.channel = towrap;
 	}
 
-	/*
+	/**
 	 * @deprecated
 	 */
 	@Deprecated

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

@@ -98,14 +98,15 @@ public class WebSocketImpl implements WebSocket {
 	private final WebSocketListener wsl;
 
 	private SelectionKey key;
+
 	/**
 	 * the possibly wrapped channel object whose selection is controlled by {@link #key}
 	 */
-	public ByteChannel channel;
+	private ByteChannel channel;
 	/**
 	 * Helper variable meant to store the thread which ( exclusively ) triggers this objects decode method.
 	 **/
-	public volatile WebSocketWorker workerThread; // TODO reset worker?
+	private volatile WebSocketWorker workerThread;
 	/**
 	 * When true no further frames may be submitted to be sent
 	 */
@@ -282,7 +283,7 @@ private boolean decodeHandshake( ByteBuffer socketBufferNew ) {
 										closeConnectionDueToInternalServerError( e );
 										return false;
 									}
-									write( d.createHandshake( d.postProcessHandshakeResponseAsServer( handshake, response ), role ) );
+									write( d.createHandshake( d.postProcessHandshakeResponseAsServer( handshake, response ) ) );
 									draft = d;
 									open( handshake );
 									return true;
@@ -686,7 +687,7 @@ public void startHandshake( ClientHandshakeBuilder handshakedata ) throws Invali
 		}
 
 		// Send
-		write( draft.createHandshake( this.handshakerequest, role ) );
+		write( draft.createHandshake( this.handshakerequest ) );
 	}
 
 	private void write( ByteBuffer buf ) {
@@ -824,4 +825,21 @@ public <T> void setAttachment(T attachment) {
 		this.attachment = attachment;
 	}
 
+	public ByteChannel getChannel() {
+		return channel;
+	}
+
+	public void setChannel(ByteChannel channel) {
+		this.channel = channel;
+	}
+
+	public WebSocketWorker getWorkerThread() {
+		return workerThread;
+	}
+
+	public void setWorkerThread(WebSocketWorker workerThread) {
+		this.workerThread = workerThread;
+	}
+
+
 }

src/main/java/org/java_websocket/client/WebSocketClient.java

@@ -655,19 +655,7 @@ private class WebsocketWriteThread implements Runnable {
 		public void run() {
 			Thread.currentThread().setName( "WebSocketWriteThread-" + Thread.currentThread().getId() );
 			try {
-				try {
-					while( !Thread.interrupted() ) {
-						ByteBuffer buffer = engine.outQueue.take();
-						ostream.write( buffer.array(), 0, buffer.limit() );
-						ostream.flush();
-					}
-				} catch ( InterruptedException e ) {
-					for (ByteBuffer buffer : engine.outQueue) {
-						ostream.write( buffer.array(), 0, buffer.limit() );
-						ostream.flush();
-					}
-					Thread.currentThread().interrupt();
-				}
+				runWriteData();
 			} catch ( IOException e ) {
 				handleIOException( e );
 			} finally {
@@ -676,6 +664,26 @@ public void run() {
 			}
 		}
 
+		/**
+		 * Write the data into the outstream
+		 * @throws IOException if write or flush did not work
+		 */
+		private void runWriteData() throws IOException {
+			try {
+				while( !Thread.interrupted() ) {
+					ByteBuffer buffer = engine.outQueue.take();
+					ostream.write( buffer.array(), 0, buffer.limit() );
+					ostream.flush();
+				}
+			} catch ( InterruptedException e ) {
+				for (ByteBuffer buffer : engine.outQueue) {
+					ostream.write( buffer.array(), 0, buffer.limit() );
+					ostream.flush();
+				}
+				Thread.currentThread().interrupt();
+			}
+		}
+
 		/**
 		 * Closing the socket
 		 */

src/main/java/org/java_websocket/drafts/Draft.java

@@ -97,9 +97,9 @@ public static HandshakeBuilder translateHandshakeHttp( ByteBuffer buf, Role role
 			throw new InvalidHandshakeException();
 		}
 		if( role == Role.CLIENT ) {
-			handshake = prvTranslateHandshakeHttpClient(firstLineTokens, line);
+			handshake = translateHandshakeHttpClient(firstLineTokens, line);
 		} else {
-			handshake = prvTranslateHandshakeHttpServer(firstLineTokens, line);
+			handshake = translateHandshakeHttpServer(firstLineTokens, line);
 		}
 		line = readStringLine( buf );
 		while ( line != null && line.length() > 0 ) {
@@ -125,7 +125,7 @@ public static HandshakeBuilder translateHandshakeHttp( ByteBuffer buf, Role role
 	 * @param firstLineTokens the token of the first line split as as an string array
 	 * @param line the whole line
 	 */
-	private static HandshakeBuilder prvTranslateHandshakeHttpServer(String[] firstLineTokens, String line) throws InvalidHandshakeException {
+	private static HandshakeBuilder translateHandshakeHttpServer(String[] firstLineTokens, String line) throws InvalidHandshakeException {
 		// translating/parsing the request from the CLIENT
 		if (!"GET".equalsIgnoreCase(firstLineTokens[0])) {
 			throw new InvalidHandshakeException( String.format("Invalid request method received: %s Status line: %s", firstLineTokens[0],line));
@@ -144,7 +144,7 @@ private static HandshakeBuilder prvTranslateHandshakeHttpServer(String[] firstLi
 	 * @param firstLineTokens the token of the first line split as as an string array
 	 * @param line the whole line
 	 */
-	private static HandshakeBuilder prvTranslateHandshakeHttpClient(String[] firstLineTokens, String line) throws InvalidHandshakeException {
+	private static HandshakeBuilder translateHandshakeHttpClient(String[] firstLineTokens, String line) throws InvalidHandshakeException {
 		// translating/parsing the response from the SERVER
 		if (!"101".equals(firstLineTokens[1])) {
 			throw new InvalidHandshakeException( String.format("Invalid status code received: %s Status line: %s", firstLineTokens[1], line));
@@ -214,11 +214,27 @@ public List<Framedata> continuousFrame(Opcode op, ByteBuffer buffer, boolean fin
 
 	public abstract void reset();
 
+	/**
+	 * @deprecated use createHandshake without the role
+	 */
+	@Deprecated
 	public List<ByteBuffer> createHandshake( Handshakedata handshakedata, Role ownrole ) {
-		return createHandshake( handshakedata, ownrole, true );
+		return createHandshake(handshakedata);
+	}
+
+	public List<ByteBuffer> createHandshake( Handshakedata handshakedata) {
+		return createHandshake( handshakedata, true );
 	}
 
+	/**
+	 * @deprecated use createHandshake without the role since it does not have any effect
+	 */
+	@Deprecated
 	public List<ByteBuffer> createHandshake( Handshakedata handshakedata, Role ownrole, boolean withcontent ) {
+		return createHandshake(handshakedata, withcontent);
+	}
+
+	public List<ByteBuffer> createHandshake( Handshakedata handshakedata, boolean withcontent ) {
 		StringBuilder bui = new StringBuilder( 100 );
 		if( handshakedata instanceof ClientHandshake ) {
 			bui.append( "GET " );