Summary of changes:

 - Slight modification of grizzly response refactoring.
 - return netty tests to running status.

That said, build still fails due to clirr.

Author: rlubke

src/main/java/com/ning/http/client/providers/ResponseBase.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
+import java.nio.charset.Charset;
 import java.util.List;
 
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
@@ -102,4 +103,17 @@ public InputStream getResponseBodyAsStream() throws IOException {
         return AsyncHttpProviderUtils.contentAsStream(bodyParts);
     }
 
+    protected String calculateCharset() {
+        String charset = null;
+        String contentType = getContentType();
+        if (contentType != null) {
+            charset = AsyncHttpProviderUtils.parseCharset(contentType);
+        }
+
+        if (charset == null) {
+            charset = DEFAULT_CHARSET;
+        }
+        return charset;
+    }
+
 }

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyResponse.java

@@ -92,7 +92,9 @@ public InputStream getResponseBodyAsStream() throws IOException {
      * {@inheritDoc}
      */
     public String getResponseBodyExcerpt(int maxLength, String charset) throws IOException {
-
+        if (charset == null) {
+            charset = calculateCharset();
+        }
         final int len = Math.min(responseBody.remaining(), maxLength);
         final int pos = responseBody.position();
         return responseBody.toStringContent(getCharset(charset), pos, len + pos);
@@ -110,12 +112,24 @@ public String getResponseBody(String charset) throws IOException {
     }
 
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public byte[] getResponseBodyAsBytes() throws IOException {
+        final byte[] responseBodyBytes = new byte[responseBody.remaining()];
+        final int origPos = responseBody.position();
+        responseBody.get(responseBodyBytes);
+        responseBody.position(origPos);
+        return responseBodyBytes;
+    }
+
+
     /**
      * {@inheritDoc}
      */
     public String getResponseBodyExcerpt(int maxLength) throws IOException {
 
-        // TODO FIX NULL
         return getResponseBodyExcerpt(maxLength, null);
 
     }

src/main/java/com/ning/http/client/providers/grizzly/GrizzlyResponseBodyPart.java

@@ -19,6 +19,7 @@
 import org.glassfish.grizzly.Buffer;
 import org.glassfish.grizzly.Connection;
 import org.glassfish.grizzly.http.HttpContent;
+import org.glassfish.grizzly.utils.BufferInputStream;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -75,7 +76,6 @@ public byte[] getBodyPartBytes() {
         final int origPos = b.position();
         bytes = new byte[b.remaining()];
         b.get(bytes);
-        b.flip();
         b.position(origPos);
         contentBytes.compareAndSet(null, bytes);
         return bytes;
@@ -84,13 +84,12 @@ public byte[] getBodyPartBytes() {
 
     @Override
     public InputStream readBodyPartBytes() {
-        return new ByteArrayInputStream(getBodyPartBytes());
+        return new BufferInputStream(content.getContent());
     }
 
     @Override
     public int length() {
-        // this is ugly but...
-        return getBodyPartBytes().length;
+        return content.getContent().remaining();
     }
 
     /**
@@ -100,7 +99,7 @@ public int length() {
     public int writeTo(OutputStream outputStream) throws IOException {
 
         final byte[] bytes = getBodyPartBytes();
-        outputStream.write(getBodyPartBytes());
+        outputStream.write(bytes);
         return bytes.length;
 
     }
@@ -112,7 +111,7 @@ public int writeTo(OutputStream outputStream) throws IOException {
     @Override
     public ByteBuffer getBodyByteBuffer() {
 
-        return ByteBuffer.wrap(getBodyPartBytes());
+        return content.getContent().toByteBuffer();
 
     }
 

src/main/java/com/ning/http/client/providers/netty/NettyResponse.java

@@ -47,6 +47,9 @@ public String getResponseBodyExcerpt(int maxLength) throws IOException {
 
     public String getResponseBodyExcerpt(int maxLength, String charset) throws IOException {
         // should be fine; except that it may split multi-byte chars (last char may become '?')
+        if (charset == null) {
+            charset = calculateCharset();
+        }
         byte[] b = AsyncHttpProviderUtils.contentToBytes(bodyParts, maxLength);
         return new String(b, charset);
     }