Minor clean up

Author: Stephane Landelle

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

@@ -12,8 +12,6 @@
  */
 package org.asynchttpclient;
 
-import org.asynchttpclient.Response.ResponseBuilder;
-
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;

api/src/main/java/org/asynchttpclient/providers/jdk/JDKAsyncHttpProvider.java

@@ -322,7 +322,7 @@ public T call() throws Exception {
  InputStream stream = is;
  if (bufferResponseInMemory || byteToRead <= 0) {
  int[] lengthWrapper = new int[1];
- byte[] bytes = AsyncHttpProviderUtils.readFully(is, lengthWrapper);
+ byte[] bytes = readFully(is, lengthWrapper);
  stream = new ByteArrayInputStream(bytes, 0, lengthWrapper[0]);
  byteToRead = lengthWrapper[0];
  }
@@ -410,6 +410,34 @@ public T call() throws Exception {
  }
  return null;
  }
+ 
+ // FIXME Streams should be streamed, not turned into byte arrays
+ private final byte[] readFully(InputStream in, int[] lengthWrapper) throws IOException {
+ // just in case available() returns bogus (or -1), allocate non-trivial chunk
+ byte[] b = new byte[Math.max(512, in.available())];
+ int offset = 0;
+ while (true) {
+ int left = b.length - offset;
+ int count = in.read(b, offset, left);
+ if (count < 0) { // EOF
+ break;
+ }
+ offset += count;
+ if (count == left) { // full buffer, need to expand
+ b = doubleUp(b);
+ }
+ }
+ // wish Java had Tuple return type...
+ lengthWrapper[0] = offset;
+ return b;
+ }
+ 
+ private final byte[] doubleUp(byte[] b) {
+ int len = b.length;
+ byte[] b2 = new byte[len + len];
+ System.arraycopy(b, 0, b2, 0, len);
+ return b2;
+ }
 
  private FilterContext handleIoException(FilterContext fc) throws FilterException {
  for (IOExceptionFilter asyncFilter : config.getIOExceptionFilters()) {
@@ -571,7 +599,7 @@ private void configure(URI uri, HttpURLConnection urlConnection, Request request
  urlConnection.getOutputStream().write(b);
  } else if (request.getStreamData() != null) {
  int[] lengthWrapper = new int[1];
- cachedBytes = AsyncHttpProviderUtils.readFully(request.getStreamData(), lengthWrapper);
+ cachedBytes = readFully(request.getStreamData(), lengthWrapper);
  cachedBytesLenght = lengthWrapper[0];
  urlConnection.setRequestProperty("Content-Length", String.valueOf(cachedBytesLenght));
  urlConnection.setFixedLengthStreamingMode(cachedBytesLenght);

api/src/main/java/org/asynchttpclient/resumable/PropertiesBasedResumableProcessor.java

@@ -96,10 +96,11 @@ private static String append(Map.Entry<String, Long> e) {
  /**
  * {@inheritDoc}
  */
- /* @Override */
+ @Override
  public Map<String, Long> load() {
+ Scanner scan = null;
  try {
- Scanner scan = new Scanner(new File(TMP, storeName), "UTF-8");
+ scan = new Scanner(new File(TMP, storeName), "UTF-8");
  scan.useDelimiter("[=\n]");
 
  String key;
@@ -115,6 +116,9 @@ public Map<String, Long> load() {
  } catch (Throwable ex) {
  // Survive any exceptions
  log.warn(ex.getMessage(), ex);
+ } finally {
+ if (scan != null)
+ scan.close();
  }
  return properties;
  }

api/src/main/java/org/asynchttpclient/resumable/ResumableIOExceptionFilter.java

@@ -18,18 +18,16 @@
 import org.asynchttpclient.filter.IOExceptionFilter;
 
 /**
- * Simple {@link org.asynchttpclient.filter.IOExceptionFilter} that replay the current {@link org.asynchttpclient.Request} using
- * a {@link ResumableAsyncHandler}
+ * Simple {@link org.asynchttpclient.filter.IOExceptionFilter} that replay the current {@link org.asynchttpclient.Request} using a {@link ResumableAsyncHandler}
  */
 public class ResumableIOExceptionFilter implements IOExceptionFilter {
- public FilterContext filter(FilterContext ctx) throws FilterException {
+ public <T> FilterContext<T> filter(FilterContext<T> ctx) throws FilterException {
  if (ctx.getIOException() != null && ctx.getAsyncHandler() instanceof ResumableAsyncHandler) {
 
  Request request = ResumableAsyncHandler.class.cast(ctx.getAsyncHandler()).adjustRequestRange(ctx.getRequest());
 
- return new FilterContext.FilterContextBuilder(ctx).request(request).replayRequest(true).build();
+ return new FilterContext.FilterContextBuilder<T>(ctx).request(request).replayRequest(true).build();
  }
  return ctx;
  }
 }
- 

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

@@ -14,7 +14,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.SequenceInputStream;
 import java.io.UnsupportedEncodingException;
@@ -379,35 +378,6 @@ public final static MultipartRequestEntity createMultipartRequestEntity(List<Par
  return new MultipartRequestEntity(parts, requestHeaders);
  }
 
- // FIXME remove this: tests should use IOUtils and main shouldn't read Stream but... stream them!
- @Deprecated
- public final static byte[] readFully(InputStream in, int[] lengthWrapper) throws IOException {
- // just in case available() returns bogus (or -1), allocate non-trivial chunk
- byte[] b = new byte[Math.max(512, in.available())];
- int offset = 0;
- while (true) {
- int left = b.length - offset;
- int count = in.read(b, offset, left);
- if (count < 0) { // EOF
- break;
- }
- offset += count;
- if (count == left) { // full buffer, need to expand
- b = doubleUp(b);
- }
- }
- // wish Java had Tuple return type...
- lengthWrapper[0] = offset;
- return b;
- }
-
- private static byte[] doubleUp(byte[] b) {
- int len = b.length;
- byte[] b2 = new byte[len + len];
- System.arraycopy(b, 0, b2, 0, len);
- return b2;
- }
-
  public static String encodeCookies(Collection<Cookie> cookies) {
  StringBuilder sb = new StringBuilder();
 

api/src/test/java/org/asynchttpclient/async/RemoteSiteTest.java

@@ -23,6 +23,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.io.IOUtils;
 import org.asynchttpclient.AsyncHandler;
 import org.asynchttpclient.AsyncHttpClient;
 import org.asynchttpclient.AsyncHttpClientConfig;
@@ -33,7 +34,6 @@
 import org.asynchttpclient.Request;
 import org.asynchttpclient.RequestBuilder;
 import org.asynchttpclient.Response;
-import org.asynchttpclient.util.AsyncHttpProviderUtils;
 import org.testng.annotations.Test;
 
 /**
@@ -173,13 +173,9 @@ public void asyncFullBodyProperlyRead() throws Exception {
  Response r = client.prepareGet("http://www.cyberpresse.ca/").execute().get();
 
  InputStream stream = r.getResponseBodyAsStream();
- // FIXME available is an ESTIMATE!!!
- int available = stream.available();
- int[] lengthWrapper = new int[1];
- AsyncHttpProviderUtils.readFully(stream, lengthWrapper);
- int byteToRead = lengthWrapper[0];
+ int contentLength = Integer.valueOf(r.getHeader("Content-Length"));
 
- assertEquals(available, byteToRead);
+ assertEquals(contentLength, IOUtils.toByteArray(stream).length);
  } finally {
  client.close();
  }

providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/WebSocketProtocol.java

@@ -184,7 +184,7 @@ public void onError(ChannelHandlerContext ctx, Throwable e) {
  return;
  }
 
- NettyResponseFuture<?> nettyResponse = (NettyResponseFuture) attribute;
+ NettyResponseFuture<?> nettyResponse = (NettyResponseFuture<?>) attribute;
  WebSocketUpgradeHandler h = WebSocketUpgradeHandler.class.cast(nettyResponse.getAsyncHandler());
 
  NettyWebSocket webSocket = NettyWebSocket.class.cast(h.onCompleted());