Get rid of Response.getResponseBodyExcerpt, close AsyncHttpClient#908

Author: slandelle

api/src/main/java/org/asynchttpclient/Response.java

@@ -69,19 +69,6 @@ public interface Response {
      */
     InputStream getResponseBodyAsStream() throws IOException;
 
-    /**
-     * Returns the first maxLength bytes of the response body as a string. Note that this does not check whether the content type is actually a textual one, but it will use the
-     * charset if present in the content type header.
-     * 
-     * @param maxLength
-     *            The maximum number of bytes to read
-     * @param charset
-     *            the charset to use when decoding the stream
-     * @return The response body
-     * @throws java.io.IOException
-     */
-    String getResponseBodyExcerpt(int maxLength, Charset charset) throws IOException;
-
     /**
      * Return the entire response body as a String.
      * 
@@ -92,17 +79,6 @@ public interface Response {
      */
     String getResponseBody(Charset charset) throws IOException;
 
-    /**
-     * Returns the first maxLength bytes of the response body as a string. Note that this does not check whether the content type is actually a textual one, but it will use the
-     * charset if present in the content type header.
-     * 
-     * @param maxLength
-     *            The maximum number of bytes to read
-     * @return The response body
-     * @throws java.io.IOException
-     */
-    String getResponseBodyExcerpt(int maxLength) throws IOException;
-
     /**
      * Return the entire response body as a String.
      * 

api/src/main/java/org/asynchttpclient/util/AsyncHttpProviderUtils.java

@@ -16,13 +16,11 @@
 import static org.asynchttpclient.util.MiscUtils.*;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.List;
 
 import org.asynchttpclient.AsyncHttpClientConfig;
-import org.asynchttpclient.HttpResponseBodyPart;
 import org.asynchttpclient.Param;
 import org.asynchttpclient.Request;
 import org.asynchttpclient.uri.Uri;
@@ -35,8 +33,6 @@ public class AsyncHttpProviderUtils {
     public static final IOException REMOTELY_CLOSED_EXCEPTION = buildStaticIOException("Remotely closed");
     public static final IOException CHANNEL_CLOSED_EXCEPTION = buildStaticIOException("Channel closed");
 
-    private final static byte[] NO_BYTES = new byte[0];
-
     public final static Charset DEFAULT_CHARSET = ISO_8859_1;
 
     public static final void validateSupportedScheme(Uri uri) {
@@ -48,45 +44,6 @@ public static final void validateSupportedScheme(Uri uri) {
         }
     }
 
-    /**
-     * @param bodyParts NON EMPTY body part
-     * @param maxLen
-     * @return
-     * @throws UnsupportedEncodingException
-     */
-    public final static byte[] contentToBytes(List<HttpResponseBodyPart> bodyParts, int maxLen) throws UnsupportedEncodingException {
-        final int partCount = bodyParts.size();
-        if (partCount == 0) {
-            return NO_BYTES;
-        }
-        if (partCount == 1) {
-            byte[] chunk = bodyParts.get(0).getBodyPartBytes();
-            if (chunk.length <= maxLen) {
-                return chunk;
-            }
-            byte[] result = new byte[maxLen];
-            System.arraycopy(chunk, 0, result, 0, maxLen);
-            return result;
-        }
-        int size = 0;
-        byte[] result = new byte[maxLen];
-        for (HttpResponseBodyPart part : bodyParts) {
-            byte[] chunk = part.getBodyPartBytes();
-            int amount = Math.min(maxLen - size, chunk.length);
-            System.arraycopy(chunk, 0, result, size, amount);
-            size += amount;
-            if (size == maxLen) {
-                return result;
-            }
-        }
-        if (size < maxLen) {
-            byte[] old = result;
-            result = new byte[old.length];
-            System.arraycopy(old, 0, result, 0, old.length);
-        }
-        return result;
-    }
-
     public final static String getBaseUrl(Uri uri) {
         return uri.getScheme() + "://" + getAuthority(uri);
     }

api/src/main/java/org/asynchttpclient/webdav/WebDavCompletionHandlerBase.java

@@ -160,21 +160,11 @@ public InputStream getResponseBodyAsStream() throws IOException {
                     return wrappedResponse.getResponseBodyAsStream();
                 }
 
-                @Override
-                public String getResponseBodyExcerpt(int maxLength, Charset charset) throws IOException {
-                    return wrappedResponse.getResponseBodyExcerpt(maxLength, charset);
-                }
-
                 @Override
                 public String getResponseBody(Charset charset) throws IOException {
                     return wrappedResponse.getResponseBody(charset);
                 }
 
-                @Override
-                public String getResponseBodyExcerpt(int maxLength) throws IOException {
-                    return wrappedResponse.getResponseBodyExcerpt(maxLength);
-                }
-
                 @Override
                 public String getResponseBody() throws IOException {
                     return wrappedResponse.getResponseBody();

api/src/main/java/org/asynchttpclient/webdav/WebDavResponse.java

@@ -59,14 +59,6 @@ public InputStream getResponseBodyAsStream() throws IOException {
         return response.getResponseBodyAsStream();
     }
 
-    public String getResponseBodyExcerpt(int maxLength) throws IOException {
-        return response.getResponseBodyExcerpt(maxLength);
-    }
-
-    public String getResponseBodyExcerpt(int maxLength, Charset charset) throws IOException {
-        return response.getResponseBodyExcerpt(maxLength, charset);
-    }
-
     public String getResponseBody() throws IOException {
         return response.getResponseBody();
     }

api/src/test/java/org/asynchttpclient/AsyncProvidersBasicTest.java

@@ -605,7 +605,7 @@ public Response onCompleted(Response response) throws Exception {
                         String xContentType = response.getHeader("X-Content-Type");
                         String boundary = xContentType.substring((xContentType.indexOf("boundary") + "boundary".length() + 1));
 
-                        String s = response.getResponseBodyExcerpt(boundary.length() + "--".length()).substring("--".length());
+                        String s = response.getResponseBody().substring(boundary.length());
                         assertEquals(boundary, s);
                     } finally {
                         l.countDown();
@@ -1008,21 +1008,6 @@ public void onThrowable(Throwable t) {
         }
     }
 
-    @Test(groups = { "standalone", "default_provider", "async" })
-    public void asyncResponseBodyTooLarge() throws Exception {
-        try (AsyncHttpClient client = getAsyncHttpClient(null)) {
-            Response response = client.preparePost(getTargetUrl()).setBody("0123456789").execute(new AsyncCompletionHandlerAdapter() {
-
-                @Override
-                public void onThrowable(Throwable t) {
-                    fail("Unexpected exception", t);
-                }
-            }).get();
-
-            assertNotNull(response.getResponseBodyExcerpt(Integer.MAX_VALUE));
-        }
-    }
-
     @Test(groups = { "standalone", "default_provider", "async" })
     public void asyncResponseEmptyBody() throws Exception {
         try (AsyncHttpClient client = getAsyncHttpClient(null)) {

providers/netty3/src/main/java/org/asynchttpclient/netty/NettyResponse.java

@@ -87,16 +87,6 @@ public ChannelBuffer getResponseBodyAsChannelBuffer() throws IOException {
         return b;
     }
 
-    @Override
-    public String getResponseBodyExcerpt(int maxLength) throws IOException {
-        return getResponseBodyExcerpt(maxLength, null);
-    }
-
-    public String getResponseBodyExcerpt(int maxLength, Charset charset) throws IOException {
-        String response = getResponseBody(charset);
-        return response.length() <= maxLength ? response : response.substring(0, maxLength);
-    }
-
     @Override
     protected List<Cookie> buildCookies() {
         List<Cookie> cookies = new ArrayList<>();

providers/netty4/src/main/java/org/asynchttpclient/netty/NettyResponse.java

@@ -13,7 +13,6 @@
  */
 package org.asynchttpclient.netty;
 
-import static org.asynchttpclient.util.AsyncHttpProviderUtils.contentToBytes;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 import io.netty.handler.codec.http.HttpHeaders;
 
@@ -44,17 +43,6 @@ public NettyResponse(HttpResponseStatus status,//
         super(status, headers, bodyParts);
     }
 
-    @Override
-    public String getResponseBodyExcerpt(int maxLength) throws IOException {
-        return getResponseBodyExcerpt(maxLength, null);
-    }
-
-    public String getResponseBodyExcerpt(int maxLength, Charset charset) throws IOException {
-        byte[] b = contentToBytes(bodyParts, maxLength);
-        // should be fine; except that it may split multi-byte chars (last char may become '?')
-        return new String(b, calculateCharset(charset));
-    }
-
     protected List<Cookie> buildCookies() {
 
         List<String> setCookieHeaders = headers.getHeaders().get(HttpHeaders.Names.SET_COOKIE2);