Merge pull request TooTallNate#486 from marci4/master

ByteBuffer and JUnitTests

Author: marci4

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

@@ -35,14 +35,12 @@
  * text frames, and receiving frames through an event-based model.
  */
 publicclassWebSocketImplimplementsWebSocket{
-
-publicstaticfinalList<Draft> defaultdraftlist = newArrayList<Draft>( 1 );
 publicstaticintRCVBUF = 16384;
-publicstatic/*final*/booleanDEBUG = false; // must be final in the future in order to take advantage of VM optimization
 
-static{
-defaultdraftlist.add( newDraft_6455() );
- }
+/**
+ * Activate debug mode for additional infos
+ */
+publicstaticbooleanDEBUG = false; // must be final in the future in order to take advantage of VM optimization
 
 /**
  * Queue of buffers that need to be sent to the client.
@@ -70,12 +68,25 @@ public class WebSocketImpl implements WebSocket{
  */
 privatevolatilebooleanflushandclosestate = false;
 privateREADYSTATEreadystate = READYSTATE.NOT_YET_CONNECTED;
+
+/**
+ * A list of drafts available for this websocket
+ */
 privateList<Draft> knownDrafts;
 
+/**
+ * The draft which is used by this websocket
+ */
 privateDraftdraft = null;
 
+/**
+ * The role which this websocket takes in the connection
+ */
 privateRolerole;
 
+/**
+ * The frame which had the opcode Continous set
+ */
 privateFramedatacurrent_continuous_frame = null;
 
 /**
@@ -110,7 +121,8 @@ public WebSocketImpl( WebSocketListener listener, List<Draft> drafts ){
 this.role = Role.SERVER;
 // draft.copyInstance will be called when the draft is first needed
 if( drafts == null || drafts.isEmpty() ){
-knownDrafts = defaultdraftlist;
+knownDrafts = newArrayList<Draft>();
+knownDrafts.add(newDraft_6455());
  } else{
 knownDrafts = drafts;
  }

src/main/java/org/java_websocket/framing/CloseFrameBuilder.java

@@ -2,15 +2,12 @@
 
 importorg.java_websocket.exceptions.InvalidDataException;
 importorg.java_websocket.exceptions.InvalidFrameException;
+importorg.java_websocket.util.ByteBufferUtils;
 importorg.java_websocket.util.Charsetfunctions;
 
 importjava.nio.ByteBuffer;
 
 publicclassCloseFrameBuilderextendsFramedataImpl1implementsCloseFrame{
-/**
- * Attribute for just an empty ByteBuffer
- */
-staticfinalByteBufferemptybytebuffer = ByteBuffer.allocate( 0 );
 
 /**
  * The close code used in this close frame
@@ -150,7 +147,7 @@ public void setPayload( ByteBuffer payload ) throws InvalidDataException{
 @Override
 publicByteBuffergetPayloadData(){
 if( code == NOCODE )
-returnemptybytebuffer;
+returnByteBufferUtils.getEmptyByteBuffer();
 returnsuper.getPayloadData();
  }
 

src/main/java/org/java_websocket/framing/FramedataImpl1.java

@@ -4,14 +4,10 @@
 importjava.util.Arrays;
 
 importorg.java_websocket.exceptions.InvalidDataException;
-importorg.java_websocket.exceptions.InvalidFrameException;
+importorg.java_websocket.util.ByteBufferUtils;
 importorg.java_websocket.util.Charsetfunctions;
 
 publicclassFramedataImpl1implementsFrameBuilder{
-/**
- * Attribute for just an empty array
- */
-privatestaticbyte[] emptyarray ={};
 
 /**
  * Indicates that this is the final fragment in a message.
@@ -44,7 +40,7 @@ public FramedataImpl1(){
  */
 publicFramedataImpl1( Opcodeop ){
 this.optcode = op;
-unmaskedpayload = ByteBuffer.wrap( emptyarray);
+unmaskedpayload = ByteBufferUtils.getEmptyByteBuffer();
  }
 
 /**

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

@@ -0,0 +1,45 @@
+packageorg.java_websocket.util;
+
+importjava.nio.ByteBuffer;
+
+/**
+ * Utility class for ByteBuffers
+ */
+publicclassByteBufferUtils{
+
+/**
+ * Private constructor for static class
+ */
+privateByteBufferUtils(){
+ }
+
+/**
+ * Transfer from one ByteBuffer to another ByteBuffer
+ *
+ * @param source the ByteBuffer to copy from
+ * @param dest the ByteBuffer to copy to
+ */
+publicstaticvoidtransferByteBuffer( ByteBuffersource, ByteBufferdest ){
+if( source == null || dest == null ){
+thrownewIllegalArgumentException();
+ }
+intfremain = source.remaining();
+inttoremain = dest.remaining();
+if( fremain > toremain ){
+source.limit( Math.min( fremain, toremain ) );
+dest.put( source );
+ } else{
+dest.put( source );
+ }
+
+ }
+
+/**
+ * Get a ByteBuffer with zero capacity
+ *
+ * @return empty ByteBuffer
+ */
+publicstaticByteBuffergetEmptyByteBuffer(){
+returnByteBuffer.allocate( 0 );
+ }
+}

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

@@ -12,6 +12,13 @@
 
 publicclassCharsetfunctions{
 
+/**
+ * Private constructor for real static class
+ */
+privateCharsetfunctions(){
+
+ }
+
 publicstaticCodingErrorActioncodingErrorAction = CodingErrorAction.REPORT;
 
 /*
@@ -52,20 +59,6 @@ public static String stringUtf8( byte[] bytes ) throws InvalidDataException{
 returnstringUtf8( ByteBuffer.wrap( bytes ) );
  }
 
-/*public static String stringUtf8( byte[] bytes, int off, int length ) throws InvalidDataException{
- CharsetDecoder decode = Charset.forName( "UTF8" ).newDecoder();
- decode.onMalformedInput( codingErrorAction );
- decode.onUnmappableCharacter( codingErrorAction );
- //decode.replaceWith( "X" );
- String s;
- try{
- s = decode.decode( ByteBuffer.wrap( bytes, off, length ) ).toString();
- } catch ( CharacterCodingException e ){
- throw new InvalidDataException( CloseFrame.NO_UTF8, e );
- }
- return s;
- }*/
-
 publicstaticStringstringUtf8( ByteBufferbytes ) throwsInvalidDataException{
 CharsetDecoderdecode = Charset.forName( "UTF8" ).newDecoder();
 decode.onMalformedInput( codingErrorAction );
@@ -82,11 +75,6 @@ public static String stringUtf8( ByteBuffer bytes ) throws InvalidDataException
 returns;
  }
 
-publicstaticvoidmain( String[] args ) throwsInvalidDataException{
-stringUtf8( utf8Bytes( "\0" ) );
-stringAscii( asciiBytes( "\0" ) );
- }
-
 /**
  * Implementation of the "Flexible and Economical UTF-8 Decoder" algorithm
  * by Björn Höhrmann (http://bjoern.hoehrmann.de/utf-8/decoder/dfa/)

src/test/java/org/java_websocket/AllTests.java

@@ -0,0 +1,15 @@
+packageorg.java_websocket;
+
+importorg.junit.runner.RunWith;
+importorg.junit.runners.Suite;
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+org.java_websocket.util.ByteBufferUtilsTest.class
+})
+/**
+ * Start all tests
+ */
+publicclassAllTests{
+}