Merge pull request TooTallNate#569 from marci4/master

marci4 · web-flow · commit f33422e99513 · 2017-10-09T18:44:50.000+02:00
Code cleanups and removal of Draft_6455_WebRTC
diff --git a/src/main/java/org/java_websocket/AbstractWrappedByteChannel.java b/src/main/java/org/java_websocket/AbstractWrappedByteChannel.java
@@ -30,9 +30,6 @@
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SocketChannel;
 
-import javax.net.ssl.SSLException;
-
-
 public class AbstractWrappedByteChannel implements WrappedByteChannel {
 
 	private final ByteChannel channel;
diff --git a/src/main/java/org/java_websocket/WrappedByteChannel.java b/src/main/java/org/java_websocket/WrappedByteChannel.java
@@ -29,8 +29,6 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
 
-import javax.net.ssl.SSLException;
-
 public interface WrappedByteChannel extends ByteChannel {
 	/**
 	 * returns whether writeMore should be called write additional data.
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/main/java/org/java_websocket/client/WebSocketClient.java
@@ -249,7 +249,7 @@ public void run() {
 			}
 
 			// if the socket is set by others we don't apply any TLS wrapper
-			if (isNewSocket && uri.getScheme().equals("wss")) {
+			if (isNewSocket && "wss".equals( uri.getScheme())) {
 
 				SSLContext sslContext = SSLContext.getInstance("TLS");
 				sslContext.init(null, null, null);
@@ -292,7 +292,7 @@ private int getPort() {
 		int port = uri.getPort();
 		if( port == -1 ) {
 			String scheme = uri.getScheme();
-			if( scheme.equals( "wss" ) ) {
+			if( "wss".equals( scheme ) ) {
 				return WebSocket.DEFAULT_WSS_PORT;
 			} else if( scheme.equals( "ws" ) ) {
 				return WebSocket.DEFAULT_PORT;
diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/main/java/org/java_websocket/drafts/Draft.java
@@ -82,7 +82,7 @@ public enum CloseHandshakeType {
 
 	public static ByteBuffer readLine( ByteBuffer buf ) {
 		ByteBuffer sbuf = ByteBuffer.allocate( buf.remaining() );
-		byte prev = '0';
+		byte prev;
 		byte cur = '0';
 		while ( buf.hasRemaining() ) {
 			prev = cur;
@@ -191,7 +191,7 @@ public List<Framedata> continuousFrame( Opcode op, ByteBuffer buffer, boolean fi
 		try {
 			bui.isValid();
 		} catch ( InvalidDataException e ) {
-			throw new RuntimeException( e ); // can only happen when one builds close frames(Opcode.Close)
+			throw new IllegalArgumentException( e ); // can only happen when one builds close frames(Opcode.Close)
 		}
 		if( fin ) {
 			continuousFrameType = null;
@@ -216,7 +216,7 @@ public List<ByteBuffer> createHandshake( Handshakedata handshakedata, Role ownro
 		} else if( handshakedata instanceof ServerHandshake ) {
 			bui.append("HTTP/1.1 101 ").append(((ServerHandshake) handshakedata).getHttpStatusMessage());
 		} else {
-			throw new RuntimeException( "unknown role" );
+			throw new IllegalArgumentException( "unknown role" );
 		}
 		bui.append( "\r\n" );
 		Iterator<String> it = handshakedata.iterateHttpFields();
diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java b/src/main/java/org/java_websocket/drafts/Draft_6455.java
@@ -55,7 +55,7 @@ public class Draft_6455 extends Draft {
 	/**
 	 * Attribute for all available extension in this draft
 	 */
-	List<IExtension> knownExtensions;
+	private List<IExtension> knownExtensions;
 
 	/**
 	 * Attribute for the current continuous frame
@@ -158,6 +158,14 @@ public IExtension getExtension() {
 		return extension;
 	}
 
+	/**
+	 * Getter for all available extensions for this draft
+	 * @return the extensions which are enabled for this draft
+	 */
+	public List<IExtension> getKnownExtensions() {
+		return knownExtensions;
+	}
+
 	@Override
 	public ClientHandshakeBuilder postProcessHandshakeRequestAsClient( ClientHandshakeBuilder request ) {
 		request.put( "Upgrade", "websocket" );
@@ -198,7 +206,7 @@ public HandshakeBuilder postProcessHandshakeResponseAsServer( ClientHandshake re
 	@Override
 	public Draft copyInstance() {
 		ArrayList<IExtension> newExtensions = new ArrayList<IExtension>();
-		for( IExtension extension : knownExtensions ) {
+		for( IExtension extension : getKnownExtensions() ) {
 			newExtensions.add( extension.copyInstance() );
 		}
 		return new Draft_6455( newExtensions );
@@ -259,7 +267,9 @@ public Framedata translateSingleFrame( ByteBuffer buffer ) throws IncompleteExce
 			throw new IncompleteException( realpacketsize );
 		byte b1 = buffer.get( /*0*/ );
 		boolean FIN = b1 >> 8 != 0;
-		boolean rsv1 = false, rsv2 = false, rsv3 = false;
+		boolean rsv1 = false;
+		boolean rsv2 = false;
+		boolean rsv3 = false;
 		if( ( b1 & 0x40 ) != 0 ) {
 			rsv1 = true;
 		}
@@ -364,7 +374,6 @@ public List<Framedata> translateFrame( ByteBuffer buffer ) throws InvalidDataExc
 					incompleteframe = null;
 				} catch ( IncompleteException e ) {
 					// extending as much as suggested
-					int oldsize = incompleteframe.limit();
 					ByteBuffer extendedframe = ByteBuffer.allocate( checkAlloc( e.getPreferredSize() ) );
 					assert ( extendedframe.limit() > incompleteframe.limit() );
 					incompleteframe.rewind();
@@ -452,7 +461,7 @@ private String generateFinalKey( String in ) {
 		try {
 			sh1 = MessageDigest.getInstance( "SHA1" );
 		} catch ( NoSuchAlgorithmException e ) {
-			throw new RuntimeException( e );
+			throw new IllegalStateException( e );
 		}
 		return Base64.encodeBytes( sh1.digest( acc.getBytes() ) );
 	}
@@ -480,7 +489,7 @@ else if( opcode == Framedata.Opcode.PING )
 			return 9;
 		else if( opcode == Framedata.Opcode.PONG )
 			return 10;
-		throw new RuntimeException( "Don't know how to handle " + opcode.toString() );
+		throw new IllegalArgumentException( "Don't know how to handle " + opcode.toString() );
 	}
 
 
diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455_WebRTC.java b/src/main/java/org/java_websocket/drafts/Draft_6455_WebRTC.java
diff --git a/src/main/java/org/java_websocket/framing/Framedata.java b/src/main/java/org/java_websocket/framing/Framedata.java
@@ -27,8 +27,6 @@
 
 import java.nio.ByteBuffer;
 
-import org.java_websocket.exceptions.InvalidFrameException;
-
 public interface Framedata {
 	/**
 	 * Enum which contains the different valid opcodes
diff --git a/src/main/java/org/java_websocket/framing/FramedataImpl1.java b/src/main/java/org/java_websocket/framing/FramedataImpl1.java
@@ -27,10 +27,8 @@
 
 import org.java_websocket.exceptions.InvalidDataException;
 import org.java_websocket.util.ByteBufferUtils;
-import org.java_websocket.util.Charsetfunctions;
 
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 
 public abstract class FramedataImpl1 implements Framedata {
 
diff --git a/src/main/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java b/src/main/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java
@@ -25,7 +25,6 @@
 
 package org.java_websocket.server;
 import java.io.IOException;
-import java.net.Socket;
 import java.nio.channels.ByteChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/main/java/org/java_websocket/server/WebSocketServer.java
@@ -30,7 +30,6 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.ByteBuffer;
-import java.nio.channels.ByteChannel;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.SelectableChannel;
