asserts

Author: koush

AndroidAsync/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.koushikdutta.async"
-    android:versionCode="308"
-    android:versionName="3.0.9">
+    android:versionCode="310"
+    android:versionName="3.1.0">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 

AndroidAsync/src/com/koushikdutta/async/AsyncNetworkSocket.java

@@ -49,7 +49,6 @@ ChannelWrapper getChannel() {
     }
 
     public void onDataWritable() {
-//        assert mWriteableHandler != null;
         if (!mChannel.isChunked()) {
             // turn write off
             mKey.interestOps(~SelectionKey.OP_WRITE & mKey.interestOps());
@@ -79,7 +78,6 @@ public void run() {
             return;
         }
         if (!mChannel.isConnected()) {
-            assert !mChannel.isChunked();
             return;
         }
 
@@ -103,7 +101,6 @@ private void handleRemaining(int remaining) throws IOException {
             throw new IOException(new CancelledKeyException());
         if (remaining > 0) {
             // chunked channels should not fail
-            assert !mChannel.isChunked();
             // register for a write notification if a write fails
             // turn write on
             mKey.interestOps(SelectionKey.OP_WRITE | mKey.interestOps());

AndroidAsync/src/com/koushikdutta/async/AsyncSSLSocketWrapper.java

@@ -471,7 +471,6 @@ public void write(ByteBufferList bb) {
                 bb.addAll(arr);
                 writeBuf.flip();
                 writeList.add(writeBuf);
-                assert !writeList.hasRemaining();
                 if (writeList.remaining() > 0)
                     mSink.write(writeList);
                 int previousCapacity = writeBuf.capacity();

AndroidAsync/src/com/koushikdutta/async/AsyncServer.java

@@ -396,7 +396,6 @@ public Cancellable connectResolvedInetSocketAddress(final InetSocketAddress addr
 
     public ConnectFuture connectResolvedInetSocketAddress(final InetSocketAddress address, final ConnectCallback callback, final SocketCreateCallback createCallback) {
         final ConnectFuture cancel = new ConnectFuture();
-        assert !address.isUnresolved();
 
         post(new Runnable() {
             @Override

AndroidAsync/src/com/koushikdutta/async/BufferedDataSink.java

@@ -104,7 +104,6 @@ public int getMaxBuffer() {
     }
 
     public void setMaxBuffer(int maxBuffer) {
-        assert maxBuffer >= 0;
         mMaxBuffer = maxBuffer;
     }
 

AndroidAsync/src/com/koushikdutta/async/ByteBufferList.java

@@ -166,7 +166,6 @@ public void get(byte[] bytes, int offset, int length) {
             offset += read;
             if (b.remaining() == 0) {
                 ByteBuffer removed = mBuffers.remove();
-                assert b == removed;
                 reclaim(b);
             }
         }
@@ -196,8 +195,6 @@ public void get(ByteBufferList into, int length) {
                 b.get(subset.array(), 0, need);
                 into.add(subset);
                 mBuffers.addFirst(b);
-                assert subset.capacity() >= need;
-                assert subset.position() == 0;
                 break;
             }
             else {
@@ -338,7 +335,6 @@ public void recycle() {
         while (mBuffers.size() > 0) {
             reclaim(mBuffers.remove());
         }
-        assert mBuffers.size() == 0;
         remaining = 0;
     }
 
@@ -465,14 +461,11 @@ public static void reclaim(ByteBuffer b) {
                 return;
             }
 
-            assert !reclaimedContains(b);
-
             b.position(0);
             b.limit(b.capacity());
             currentSize += b.capacity();
 
             r.add(b);
-            assert r.size() != 0 ^ currentSize == 0;
 
             maxItem = Math.max(maxItem, b.capacity());
         }
@@ -490,7 +483,6 @@ public static ByteBuffer obtain(int size) {
                         if (r.size() == 0)
                             maxItem = 0;
                         currentSize -= ret.capacity();
-                        assert r.size() != 0 ^ currentSize == 0;
                         if (ret.capacity() >= size) {
 //                            System.out.println("using " + ret.capacity());
                             return ret;
@@ -516,7 +508,6 @@ public static void obtainArray(ByteBuffer[] arr, int size) {
                 while (r.size() > 0 && total < size && index < arr.length - 1) {
                     ByteBuffer b = r.remove();
                     currentSize -= b.capacity();
-                    assert r.size() != 0 ^ currentSize == 0;
                     int needed = Math.min(size - total, b.capacity());
                     total += needed;
                     arr[index++] = b;

AndroidAsync/src/com/koushikdutta/async/DataEmitterReader.java

@@ -8,10 +8,8 @@ public class DataEmitterReader implements com.koushikdutta.async.callback.DataCa
     ByteBufferList mPendingData = new ByteBufferList();
 
     public void read(int count, DataCallback callback) {
-        assert mPendingRead == null;
         mPendingReadLength = count;
         mPendingRead = callback;
-        assert !mPendingData.hasRemaining();
         mPendingData.recycle();
     }
 
@@ -22,7 +20,6 @@ private boolean handlePendingData(DataEmitter emitter) {
         DataCallback pendingRead = mPendingRead;
         mPendingRead = null;
         pendingRead.onDataAvailable(emitter, mPendingData);
-        assert !mPendingData.hasRemaining();
 
         return true;
     }
@@ -32,7 +29,6 @@ public DataEmitterReader() {
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         // if we're registered for data, we must be waiting for a read
-        assert mPendingRead != null;
         do {
             int need = Math.min(bb.remaining(), mPendingReadLength - mPendingData.remaining());
             bb.get(mPendingData, need);

AndroidAsync/src/com/koushikdutta/async/LineEmitter.java

@@ -37,7 +37,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
         while (bb.remaining() > 0) {
             byte b = bb.get();
             if (b == '\n') {
-                assert mLineCallback != null;
                 buffer.flip();
                 data.add(buffer);
                 mLineCallback.onStringAvailable(data.readString(charset));

AndroidAsync/src/com/koushikdutta/async/ServerSocketChannelWrapper.java

@@ -37,20 +37,17 @@ public int getLocalPort() {
     @Override
     public int read(ByteBuffer buffer) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public boolean isConnected() {
-        assert false;
         return false;
     }
 
     @Override
     public int write(ByteBuffer src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
@@ -62,21 +59,18 @@ public SelectionKey register(Selector sel) throws ClosedChannelException {
     @Override
     public int write(ByteBuffer[] src) throws IOException {
         final String msg = "Can't write ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public long read(ByteBuffer[] byteBuffers) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 
     @Override
     public long read(ByteBuffer[] byteBuffers, int i, int i2) throws IOException {
         final String msg = "Can't read ServerSocketChannel";
-        assert false;
         throw new IOException(msg);
     }
 

AndroidAsync/src/com/koushikdutta/async/Util.java

@@ -36,7 +36,6 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
                 list.recycle();
                 if (SUPRESS_DEBUG_EXCEPTIONS)
                     return;
-                assert false;
                 throw new RuntimeException("mDataHandler failed to consume data, yet remains the mDataHandler.");
             }
         }
@@ -50,7 +49,6 @@ public static void emitAllData(DataEmitter emitter, ByteBufferList list) {
             list.recycle();
             if (SUPRESS_DEBUG_EXCEPTIONS)
                 return;
-//            assert false;
 //            throw new AssertionError("Not all data was consumed by Util.emitAllData");
         }
     }

AndroidAsync/src/com/koushikdutta/async/future/Continuation.java

@@ -56,7 +56,6 @@ public void onCompleted(Exception ex) {
                 if (mThisCompleted)
                     return;
                 mThisCompleted = true;
-                assert waiting;
                 waiting = false;
                 if (ex == null) {
                     next();

AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpClient.java

@@ -153,7 +153,6 @@ public boolean cancel() {
     }
 
     private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception ex, AsyncHttpResponseImpl response, AsyncHttpRequest request, final HttpConnectCallback callback) {
-        assert callback != null;
         cancel.scheduled.cancel();
         boolean complete;
         if (ex != null) {
@@ -166,7 +165,6 @@ private void reportConnectedCompleted(FutureAsyncHttpResponse cancel, Exception
         }
         if (complete) {
             callback.onConnectCompleted(ex, response);
-            assert ex != null || response.socket() == null || response.getDataCallback() != null || response.isPaused();
             return;
         }
 
@@ -204,7 +202,6 @@ private static void copyHeader(AsyncHttpRequest from, AsyncHttpRequest to, Strin
     }
 
     private void executeAffinity(final AsyncHttpRequest request, final int redirectCount, final FutureAsyncHttpResponse cancel, final HttpConnectCallback callback) {
-        assert mServer.isAffinityThread();
         if (redirectCount > 15) {
             reportConnectedCompleted(cancel, new RedirectLimitExceededException("too many redirects"), null, request, callback);
             return;
@@ -704,13 +701,11 @@ public Future<WebSocket> websocket(final AsyncHttpRequest req, String[] protocol
     }
 
     public Future<WebSocket> websocket(String uri, String protocol, final WebSocketConnectCallback callback) {
-//        assert callback != null;
         final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
         return websocket(get, protocol, callback);
     }
 
     public Future<WebSocket> websocket(String uri, String[] protocols, final WebSocketConnectCallback callback) {
-//        assert callback != null;
         final AsyncHttpGet get = new AsyncHttpGet(uri.replace("ws://", "http://").replace("wss://", "https://"));
         return websocket(get, protocols, callback);
     }

AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpRequest.java

@@ -97,7 +97,6 @@ public static void setDefaultHeaders(Headers ret, Uri uri) {
     public static final String HEADER_ACCEPT_ALL = "*/*";
 
     public AsyncHttpRequest(Uri uri, String method, Headers headers) {
-        assert uri != null;
         mMethod = method;
         this.uri = uri;
         if (headers == null)

AndroidAsync/src/com/koushikdutta/async/http/AsyncHttpResponseImpl.java

@@ -175,8 +175,6 @@ private void assertContent() {
         if (!mFirstWrite)
             return;
         mFirstWrite = false;
-        assert null != mRequest.getHeaders().get("Content-Type");
-        assert mRequest.getHeaders().get("Transfer-Encoding") != null || HttpUtil.contentLength(mRequest.getHeaders()) != -1;
     }
 
     DataSink mSink;

AndroidAsync/src/com/koushikdutta/async/http/HybiParser.java

@@ -192,7 +192,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
     DataCallback mStage4 = new DataCallback() {
         @Override
         public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-            assert bb.remaining() == mLength;
             mPayload = new byte[mLength];
             bb.get(mPayload);
             try {

AndroidAsync/src/com/koushikdutta/async/http/body/MultipartFormDataBody.java

@@ -178,8 +178,6 @@ public void onContinue(Continuation continuation, CompletedCallback next) throws
                 byte[] bytes = (getBoundaryEnd()).getBytes();
                 com.koushikdutta.async.Util.writeAll(sink, bytes, next);
                 written += bytes.length;
-                
-                assert written == totalToWrite;
             }
         });
         c.start();

AndroidAsync/src/com/koushikdutta/async/http/body/Part.java

@@ -66,6 +66,5 @@ public long length() {
     }
 
     public void write(DataSink sink, CompletedCallback callback) {
-        assert false;
     }
 }

AndroidAsync/src/com/koushikdutta/async/http/cache/ResponseCacheMiddleware.java

@@ -439,7 +439,6 @@ void sendCachedDataOnNetworkThread() {
             // fill pending
             try {
                 ByteBuffer buffer = allocator.allocate();
-                assert buffer.position() == 0;
                 FileInputStream din = cacheResponse.getBody();
                 int read = din.read(buffer.array(), buffer.arrayOffset(), buffer.capacity());
                 if (read == -1) {

AndroidAsync/src/com/koushikdutta/async/http/filter/ChunkedInputFilter.java

@@ -112,7 +112,6 @@ else if (c >= 'A' && c <= 'F')
                     mChunkLength = 0;
                     break;
                 case COMPLETE:
-                    assert false;
 //                    Exception fail = new Exception("Continued receiving data after chunk complete");
 //                    report(fail);
                     return;

AndroidAsync/src/com/koushikdutta/async/http/filter/ContentLengthFilter.java

@@ -21,8 +21,6 @@ protected void report(Exception e) {
     ByteBufferList transformed = new ByteBufferList();
     @Override
     public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-        assert totalRead < contentLength;
-
         int remaining = bb.remaining();
         long toRead = Math.min(contentLength - totalRead, remaining);
 

AndroidAsync/src/com/koushikdutta/async/http/filter/InflaterInputFilter.java

@@ -38,7 +38,6 @@ public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
                         if (!output.hasRemaining()) {
                             output.flip();
                             transformed.add(output);
-                            assert totalRead != 0;
                             int newSize = output.capacity() * 2;
                             output = ByteBufferList.obtain(newSize);
                         }

AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java

@@ -66,7 +66,6 @@ public AsyncHttpServerRequest getRequest() {
     @Override
     public void write(ByteBufferList bb) {
         // order is important here...
-        assert !mEnded;
         // do the header write... this will call onWritable, which may be reentrant
         if (!headWritten)
             initFirstWrite();

AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerRouter.java

@@ -281,7 +281,6 @@ public void directory(String regex, final File directory) {
     }
 
     public void directory(String regex, final File directory, final boolean list) {
-        assert directory.isDirectory();
         addAction(AsyncHttpGet.METHOD, regex, new HttpServerRequestCallback() {
             @Override
             public void onRequest(AsyncHttpServerRequest request, final AsyncHttpServerResponse response) {

AndroidAsync/src/com/koushikdutta/async/http/server/BoundaryEmitter.java

@@ -19,12 +19,10 @@ public String getBoundary() {
     }
 
     public String getBoundaryStart() {
-        assert boundary != null;
         return new String(boundary, 2, boundary.length - 2);
     }
 
     public String getBoundaryEnd() {
-        assert boundary != null;
         return getBoundaryStart() + "--\r\n";
     }
 
@@ -160,7 +158,6 @@ else if (state == -4) {
                 }
             }
             else {
-                assert false;
                 report(new MimeEncodingException("Invalid multipart/form-data. Unknown state?"));
             }
         }

AndroidAsync/src/com/koushikdutta/async/util/ArrayDeque.java

@@ -121,7 +121,6 @@ private void allocateElements(int numElements) {
      * when head and tail have wrapped around to become equal.
      */
     private void doubleCapacity() {
-        assert head == tail;
         int p = head;
         int n = elements.length;
         int r = n - p; // number of elements to the right of p
@@ -490,11 +489,6 @@ public E pop() {
     }
 
     private void checkInvariants() {
-        assert elements[tail] == null;
-        assert head == tail ? elements[head] == null :
-            (elements[head] != null &&
-             elements[(tail - 1) & (elements.length - 1)] != null);
-        assert elements[(head - 1) & (elements.length - 1)] == null;
     }
 
     /**