Code cleanups

Author: marci4

src/main/java/org/java_websocket/exceptions/NotSendableException.java

@@ -35,13 +35,6 @@ public class NotSendableException extends RuntimeException {
      */
     private static final long serialVersionUID = -6468967874576651628L;
 
-    /**
-     * constructor for a NotSendableException
-     */
-    public NotSendableException() {
-        super();
-    }
-
     /**
      * constructor for a NotSendableException
      *

src/main/java/org/java_websocket/exceptions/WebsocketNotConnectedException.java

@@ -34,11 +34,4 @@ public class WebsocketNotConnectedException extends RuntimeException {
      * Serializable
      */
     private static final long serialVersionUID = -785314021592982715L;
-
-    /**
-     * constructor for a WebsocketNotConnectedException
-     */
-    public WebsocketNotConnectedException() {
-        super();
-    }
 }

src/main/java/org/java_websocket/extensions/CompressionExtension.java

@@ -38,15 +38,11 @@ public abstract class CompressionExtension extends DefaultExtension {
 
 	@Override
 	public void isFrameValid( Framedata inputFrame ) throws InvalidDataException {
-		if( inputFrame instanceof DataFrame ) {
-			if( inputFrame.isRSV2() || inputFrame.isRSV3() ) {
-				throw new InvalidFrameException( "bad rsv RSV1: " + inputFrame.isRSV1() + " RSV2: " + inputFrame.isRSV2() + " RSV3: " + inputFrame.isRSV3() );
-			}
+		if(( inputFrame instanceof DataFrame ) && ( inputFrame.isRSV2() || inputFrame.isRSV3() )) {
+			throw new InvalidFrameException( "bad rsv RSV1: " + inputFrame.isRSV1() + " RSV2: " + inputFrame.isRSV2() + " RSV3: " + inputFrame.isRSV3() );
 		}
-		if( inputFrame instanceof ControlFrame ) {
-			if( inputFrame.isRSV1() || inputFrame.isRSV2() || inputFrame.isRSV3() ) {
-				throw new InvalidFrameException( "bad rsv RSV1: " + inputFrame.isRSV1() + " RSV2: " + inputFrame.isRSV2() + " RSV3: " + inputFrame.isRSV3() );
-			}
+		if(( inputFrame instanceof ControlFrame ) && ( inputFrame.isRSV1() || inputFrame.isRSV2() || inputFrame.isRSV3() )) {
+			throw new InvalidFrameException( "bad rsv RSV1: " + inputFrame.isRSV1() + " RSV2: " + inputFrame.isRSV2() + " RSV3: " + inputFrame.isRSV3() );
 		}
 	}
 }

src/main/java/org/java_websocket/server/WebSocketServer.java

@@ -793,19 +793,24 @@ public void broadcast(byte[] data) {
 	 * @param clients a collection of endpoints to whom the text has to be send
 	 */
 	public void broadcast(byte[] data, Collection<WebSocket> clients) {
+		if (data == null || clients == null) {
+			throw new IllegalArgumentException();
+		}
 		Map<Draft, List<Framedata>> draftFrames = new HashMap<Draft, List<Framedata>>();
 		ByteBuffer byteBufferData = ByteBuffer.wrap( data );
 		synchronized( clients ) {
 			for( WebSocket client : clients ) {
-				Draft draft = client.getDraft();
-				if( !draftFrames.containsKey( draft ) ) {
-					List<Framedata> frames = draft.createFrames( byteBufferData, false );
-					draftFrames.put( draft, frames );
-				}
-				try {
-					client.sendFrame( draftFrames.get( draft ) );
-				} catch ( WebsocketNotConnectedException e) {
-					//Ignore this exception in this case
+				if( client != null ) {
+					Draft draft = client.getDraft();
+					if( !draftFrames.containsKey( draft ) ) {
+						List<Framedata> frames = draft.createFrames( byteBufferData, false );
+						draftFrames.put( draft, frames );
+					}
+					try {
+						client.sendFrame( draftFrames.get( draft ) );
+					} catch ( WebsocketNotConnectedException e ) {
+						//Ignore this exception in this case
+					}
 				}
 			}
 		}
@@ -817,18 +822,23 @@ public void broadcast(byte[] data, Collection<WebSocket> clients) {
 	 * @param clients a collection of endpoints to whom the text has to be send
 	 */
 	public void broadcast(String text, Collection<WebSocket> clients) {
+		if (text == null || clients == null) {
+			throw new IllegalArgumentException();
+		}
 		Map<Draft, List<Framedata>> draftFrames = new HashMap<Draft, List<Framedata>>();
 		synchronized( clients ) {
 			for( WebSocket client : clients ) {
-				Draft draft = client.getDraft();
-				if( !draftFrames.containsKey( draft ) ) {
-					List<Framedata> frames = draft.createFrames( text, false );
-					draftFrames.put( draft, frames );
-				}
-				try {
-					client.sendFrame( draftFrames.get( draft ) );
-				} catch ( WebsocketNotConnectedException e) {
-					//Ignore this exception in this case
+				if( client != null ) {
+					Draft draft = client.getDraft();
+					if( !draftFrames.containsKey( draft ) ) {
+						List<Framedata> frames = draft.createFrames( text, false );
+						draftFrames.put( draft, frames );
+					}
+					try {
+						client.sendFrame( draftFrames.get( draft ) );
+					} catch ( WebsocketNotConnectedException e ) {
+						//Ignore this exception in this case
+					}
 				}
 			}
 		}

src/main/java/org/java_websocket/util/Base64.java

@@ -108,7 +108,7 @@
  *      it should have been done this way to begin with.</li>
  *    <li><em>Removed all references to System.out, System.err, and the like.</em>
  *      Shame on me. All I can say is sorry they were ever there.</li>
- *    <li><em>Throws NullPointerExceptions and IllegalArgumentExceptions</em> as needed
+ *    <li><em>Throws IllegalArgumentExceptions</em> as needed
  *      such as when passed arrays are null or offsets are invalid.</li>
  *    <li>Cleaned up as much javadoc as I could to avoid any javadoc warnings.
  *      This was especially annoying before for people who were thorough in their
@@ -635,7 +635,7 @@ public static void encode( java.nio.ByteBuffer raw, java.nio.CharBuffer encoded
      * @param serializableObject The object to encode
      * @return The Base64-encoded object
      * @throws java.io.IOException if there is an error
-     * @throws NullPointerException if serializedObject is null
+     * @throws IllegalArgumentException if serializedObject is null
      * @since 1.4
      */
     public static String encodeObject( java.io.Serializable serializableObject )
@@ -678,7 +678,7 @@ public static String encodeObject( java.io.Serializable serializableObject, int
     throws java.io.IOException {
 
         if( serializableObject == null ){
-            throw new NullPointerException( "Cannot serialize a null object." );
+            throw new IllegalArgumentException( "Cannot serialize a null object." );
         }   // end if: null
 
         // Streams
@@ -733,7 +733,7 @@ public static String encodeObject( java.io.Serializable serializableObject, int
      *  
      * @param source The data to convert
      * @return The data in Base64-encoded form
-     * @throws NullPointerException if source array is null
+     * @throws IllegalArgumentException if source array is null
      * @since 1.4
      */
     public static String encodeBytes( byte[] source ) {
@@ -778,7 +778,7 @@ public static String encodeBytes( byte[] source ) {
      * @see Base64#GZIP
      * @see Base64#DO_BREAK_LINES
      * @throws java.io.IOException if there is an error
-     * @throws NullPointerException if source array is null
+     * @throws IllegalArgumentException if source array is null
      * @since 2.0
      */
     public static String encodeBytes( byte[] source, int options ) throws java.io.IOException {
@@ -800,8 +800,7 @@ public static String encodeBytes( byte[] source, int options ) throws java.io.IO
      * @param off Offset in array where conversion should begin
      * @param len Length of data to convert
      * @return The Base64-encoded data as a String
-     * @throws NullPointerException if source array is null
-     * @throws IllegalArgumentException if source array, offset, or length are invalid
+     * @throws IllegalArgumentException if source array is null if source array, offset, or length are invalid
      * @since 1.4
      */
     public static String encodeBytes( byte[] source, int off, int len ) {
@@ -848,8 +847,7 @@ public static String encodeBytes( byte[] source, int off, int len ) {
      * @see Base64#GZIP
      * @see Base64#DO_BREAK_LINES
      * @throws java.io.IOException if there is an error
-     * @throws NullPointerException if source array is null
-     * @throws IllegalArgumentException if source array, offset, or length are invalid
+     * @throws IllegalArgumentException if source array is null, if source array, offset, or length are invalid
      * @since 2.0
      */
     public static String encodeBytes( byte[] source, int off, int len, int options ) throws java.io.IOException {
@@ -876,7 +874,7 @@ public static String encodeBytes( byte[] source, int off, int len, int options )
      *
      * @param source The data to convert
      * @return The Base64-encoded data as a byte[] (of ASCII characters)
-     * @throws NullPointerException if source array is null
+     * @throws IllegalArgumentException if source array is null
      * @since 2.3.1
      */
     public static byte[] encodeBytesToBytes( byte[] source ) {
@@ -904,14 +902,13 @@ public static byte[] encodeBytesToBytes( byte[] source ) {
      * @see Base64#GZIP
      * @see Base64#DO_BREAK_LINES
      * @throws java.io.IOException if there is an error
-     * @throws NullPointerException if source array is null
-     * @throws IllegalArgumentException if source array, offset, or length are invalid
+     * @throws IllegalArgumentException if source array is null, if source array, offset, or length are invalid
      * @since 2.3.1
      */
     public static byte[] encodeBytesToBytes( byte[] source, int off, int len, int options ) throws java.io.IOException {
 
         if( source == null ){
-            throw new NullPointerException( "Cannot serialize a null array." );
+            throw new IllegalArgumentException( "Cannot serialize a null array." );
         }   // end if: null
 
         if( off < 0 ){
@@ -1047,8 +1044,7 @@ public static byte[] encodeBytesToBytes( byte[] source, int off, int len, int op
      * @param destOffset the index where output will be put
 	 * @param options alphabet type is pulled from this (standard, url-safe, ordered)
      * @return the number of decoded bytes converted
-     * @throws NullPointerException if source or destination arrays are null
-     * @throws IllegalArgumentException if srcOffset or destOffset are invalid
+     * @throws IllegalArgumentException if source or destination arrays are null, if srcOffset or destOffset are invalid
      *         or there is not enough room in the array.
      * @since 1.3
      */
@@ -1058,10 +1054,10 @@ private static int decode4to3(
 
         // Lots of error checking and exception throwing
         if( source == null ){
-            throw new NullPointerException( "Source array was null." );
+            throw new IllegalArgumentException( "Source array was null." );
         }   // end if
         if( destination == null ){
-            throw new NullPointerException( "Destination array was null." );
+            throw new IllegalArgumentException( "Destination array was null." );
         }   // end if
         if( srcOffset < 0 || srcOffset + 3 >= source.length ){
             throw new IllegalArgumentException( String.format(
@@ -1167,7 +1163,7 @@ public static byte[] decode( byte[] source, int off, int len, int options )
 
         // Lots of error checking and exception throwing
         if( source == null ){
-            throw new NullPointerException( "Cannot decode null source array." );
+            throw new IllegalArgumentException( "Cannot decode null source array." );
         }   // end if
         if( off < 0 || off + len > source.length ){
             throw new IllegalArgumentException( String.format(
@@ -1251,13 +1247,13 @@ public static byte[] decode( String s ) throws java.io.IOException {
      * @param options encode options such as URL_SAFE
      * @return the decoded data
      * @throws java.io.IOException if there is an error
-     * @throws NullPointerException if <tt>s</tt> is null
+     * @throws IllegalArgumentException if <tt>s</tt> is null
      * @since 1.4
      */
     public static byte[] decode( String s, int options ) throws java.io.IOException {
 
         if( s == null ){
-            throw new NullPointerException( "Input string was null." );
+            throw new IllegalArgumentException( "Input string was null." );
         }   // end if
 
         byte[] bytes;
@@ -1322,7 +1318,7 @@ public static byte[] decode( String s, int options ) throws java.io.IOException
      *
      * @param encodedObject The Base64 data to decode
      * @return The decoded and deserialized object
-     * @throws NullPointerException if encodedObject is null
+     * @throws IllegalArgumentException if encodedObject is null
      * @throws java.io.IOException if there is a general error
      * @throws ClassNotFoundException if the decoded object is of a
      *         class that cannot be found by the JVM
@@ -1344,7 +1340,7 @@ public static Object decodeToObject( String encodedObject )
      * @param options Various parameters related to decoding
      * @param loader Optional class loader to use in deserializing classes.
      * @return The decoded and deserialized object
-     * @throws NullPointerException if encodedObject is null
+     * @throws IllegalArgumentException if encodedObject is null
      * @throws java.io.IOException if there is a general error
      * @throws ClassNotFoundException if the decoded object is of a 
      *         class that cannot be found by the JVM
@@ -1415,14 +1411,14 @@ public Class<?> resolveClass(java.io.ObjectStreamClass streamClass)
      * @param dataToEncode byte array of data to encode in base64 form
      * @param filename Filename for saving encoded data
      * @throws java.io.IOException if there is an error
-     * @throws NullPointerException if dataToEncode is null
+     * @throws IllegalArgumentException if dataToEncode is null
      * @since 2.1
      */
     public static void encodeToFile( byte[] dataToEncode, String filename )
     throws java.io.IOException {
 
         if( dataToEncode == null ){
-            throw new NullPointerException( "Data to encode was null." );
+            throw new IllegalArgumentException( "Data to encode was null." );
         }   // end iff
 
         Base64.OutputStream bos = null;

src/test/java/org/java_websocket/framing/BinaryFrameTest.java

@@ -26,11 +26,8 @@
 package org.java_websocket.framing;
 
 import org.java_websocket.exceptions.InvalidDataException;
-import org.java_websocket.util.ByteBufferUtils;
 import org.junit.Test;
 
-import java.nio.ByteBuffer;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -64,6 +61,11 @@ public void testExtends() {
 
     @Test
     public void testIsValid() {
-        //Nothing specific to test
+        BinaryFrame frame = new BinaryFrame();
+        try {
+            frame.isValid();
+        } catch (InvalidDataException e) {
+            fail("InvalidDataException should not be thrown");
+        }
     }
 }

src/test/java/org/java_websocket/framing/ContinuousFrameTest.java

@@ -61,6 +61,11 @@ public void testExtends() {
 
     @Test
     public void testIsValid() {
-        //Nothing specific to test
+        ContinuousFrame frame = new ContinuousFrame();
+        try {
+            frame.isValid();
+        } catch (InvalidDataException e) {
+            fail("InvalidDataException should not be thrown");
+        }
     }
 }

src/test/java/org/java_websocket/framing/TextFrameTest.java

@@ -61,6 +61,11 @@ public void testExtends() {
 
     @Test
     public void testIsValid() {
-        //Nothing specific to test
+        TextFrame frame = new TextFrame();
+        try {
+            frame.isValid();
+        } catch (InvalidDataException e) {
+            fail("InvalidDataException should not be thrown");
+        }
     }
 }