Merge pull request #22 from threadly/HttpClientRequestFinishFix

Http client request finish fix

Author: jentfoo

client/src/main/java/org/threadly/litesockets/client/http/HTTPClient.java

@@ -36,7 +36,7 @@
 import org.threadly.litesockets.protocols.http.response.HTTPResponseProcessor.HTTPResponseCallback;
 import org.threadly.litesockets.protocols.http.shared.HTTPAddress;
 import org.threadly.litesockets.protocols.http.shared.HTTPParsingException;
-import org.threadly.litesockets.protocols.http.shared.HTTPRequestType;
+import org.threadly.litesockets.protocols.http.shared.HTTPRequestMethod;
 import org.threadly.litesockets.protocols.http.shared.HTTPResponseCode;
 import org.threadly.litesockets.protocols.ws.WebSocketFrameParser.WebSocketFrame;
 import org.threadly.litesockets.utils.IOUtils;
@@ -173,7 +173,8 @@ public void closeAllClients() {
    * @param timeout time in milliseconds to wait for HTTPRequests to finish.
    */
   public void setTimeout(long timeout, TimeUnit unit) {
-    this.defaultTimeoutMS = Math.min(Math.max(unit.toMillis(timeout),HTTPRequest.MIN_TIMEOUT_MS), HTTPRequest.MAX_TIMEOUT_MS);
+    this.defaultTimeoutMS = Math.min(Math.max(unit.toMillis(timeout),HTTPRequest.MIN_TIMEOUT_MS), 
+                                     HTTPRequest.MAX_TIMEOUT_MS);
   }
 
   public long getMaxIdleTimeout() {
@@ -210,22 +211,22 @@ public void run() {
    * @throws HTTPParsingException is thrown if the server sends back protocol or a response that is larger then allowed.
    */
   public HTTPResponseData request(final URL url) throws HTTPParsingException {
-    return request(url, HTTPRequestType.GET, IOUtils.EMPTY_BYTEBUFFER);
+    return request(url, HTTPRequestMethod.GET, IOUtils.EMPTY_BYTEBUFFER);
   }
 
   /**
    * Sends a blocking HTTP request.
    * 
    * @param url the url to send the request too.
-   * @param rt the {@link HTTPRequestType} to use on the request.
+   * @param rm the {@link HTTPRequestMethod} to use on the request.
    * @param bb the data to put in the body for this request.
    * @return an {@link HTTPResponseData} object containing the headers and content of the response.
    * @throws HTTPParsingException is thrown if the server sends back protocol or a response that is larger then allowed.
    */
-  public HTTPResponseData request(final URL url, final HTTPRequestType rt, final ByteBuffer bb) throws HTTPParsingException {
+  public HTTPResponseData request(final URL url, final HTTPRequestMethod rm, final ByteBuffer bb) throws HTTPParsingException {
     HTTPResponseData hr = null;
     try {
-      hr = requestAsync(url, rt, bb).get();
+      hr = requestAsync(url, rm, bb).get();
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
     } catch (Exception e) {
@@ -275,21 +276,22 @@ public HTTPResponseData request(final ClientHTTPRequest request) throws HTTPPars
    * successfully or with errors.
    */
   public ListenableFuture<HTTPResponseData> requestAsync(final URL url) {
-    return requestAsync(url, HTTPRequestType.GET, IOUtils.EMPTY_BYTEBUFFER);
+    return requestAsync(url, HTTPRequestMethod.GET, IOUtils.EMPTY_BYTEBUFFER);
   }
 
   /**
    * Sends an asynchronous HTTP request.
    * 
    * @param url the {@link URL} to send the request too.
-   * @param rt the {@link HTTPRequestType} to use on the request.
+   * @param rm the {@link HTTPRequestMethod} to use on the request.
    * @param bb the data to put in the body for this request.
    * @return an {@link ListenableFuture} containing a {@link HTTPResponseData} object that will be completed when the request is finished, 
    * successfully or with errors.
    */
-  public ListenableFuture<HTTPResponseData> requestAsync(final URL url, final HTTPRequestType rt, final ByteBuffer bb) {
+  public ListenableFuture<HTTPResponseData> requestAsync(final URL url, final HTTPRequestMethod rm, 
+                                                         final ByteBuffer bb) {
     HTTPRequestBuilder hrb = new HTTPRequestBuilder(url);
-    hrb.setRequestType(rt);
+    hrb.setRequestMethod(rm);
     hrb.setTimeout(this.defaultTimeoutMS, TimeUnit.MILLISECONDS);
     if (bb != null && bb.hasRemaining()) {
       hrb.setBody(bb);
@@ -498,14 +500,17 @@ public void onRead(Client client) {
    */
   private class HTTPRequestWrapper implements HTTPResponseCallback {
     private final SettableListenableFuture<HTTPResponseData> slf = new SettableListenableFuture<>(false);
-    private final HTTPResponseProcessor hrp = new HTTPResponseProcessor();
+    private final HTTPResponseProcessor hrp;
     private final ClientHTTPRequest chr;
     private HTTPResponse response;
     private ReuseableMergedByteBuffers responseMBB = new ReuseableMergedByteBuffers();
     private TCPClient client;
     private long lastRead = Clock.lastKnownForwardProgressingMillis();
 
     public HTTPRequestWrapper(ClientHTTPRequest chr) {
+      hrp = new HTTPResponseProcessor(chr.getHTTPRequest()
+                                         .getHTTPRequestHeader()
+                                         .getRequestMethod().equals("HEAD"));
       hrp.addHTTPResponseCallback(this);
       this.chr = chr;
     }
@@ -534,7 +539,8 @@ public void bodyData(ByteBuffer bb) {
 
     @Override
     public void finished() {
-      slf.setResult(new HTTPResponseData(HTTPClient.this, chr.getHTTPRequest(), response, responseMBB.duplicateAndClean()));
+      slf.setResult(new HTTPResponseData(HTTPClient.this, chr.getHTTPRequest(), response, 
+                                         responseMBB.duplicateAndClean()));
       hrp.removeHTTPResponseCallback(this);
       inProcess.remove(client);
       addBackTCPClient(chr.getHTTPAddress(), client);
@@ -563,7 +569,8 @@ public static class HTTPResponseData {
     private final MergedByteBuffers body;
     private final HTTPClient client;
 
-    public HTTPResponseData(HTTPClient client, HTTPRequest origRequest, HTTPResponse hr, MergedByteBuffers bb) {
+    public HTTPResponseData(HTTPClient client, HTTPRequest origRequest, HTTPResponse hr, 
+                            MergedByteBuffers bb) {
       this.client = client;
       this.hr = hr;
       this.body = bb;
@@ -587,7 +594,16 @@ public HTTPResponseCode getResponseCode() {
     }
 
     public long getContentLength() {
-      return body.remaining();
+      long result = body.remaining();
+      if (result > 0) {
+        return result;
+      }
+      result = hr.getHeaders().getContentLength();
+      if (result > 0) {
+        return result;
+      } else {
+        return 0;
+      }
     }
 
     public MergedByteBuffers getBody() {

client/src/main/java/org/threadly/litesockets/client/http/HTTPStreamClient.java

@@ -73,7 +73,7 @@ public HTTPStreamClient(TCPClient client, String host) {
     this.host = host;
     port = client.getRemoteSocketAddress().getPort();
     client.addCloseListener(classCloser);
-    httpProcessor = new HTTPResponseProcessor();
+    httpProcessor = new HTTPResponseProcessor(false);
     httpProcessor.addHTTPResponseCallback(requestCB);
     slfResponse = new SettableListenableFuture<HTTPResponse>();
     isConnected = true;
@@ -95,7 +95,7 @@ public HTTPStreamClient(SocketExecuter se, String host, int port) throws IOExcep
     client = se.createTCPClient(host, port);
     client.setConnectionTimeout(DEFAULT_TIMEOUT);
     client.addCloseListener(classCloser);
-    httpProcessor = new HTTPResponseProcessor();
+    httpProcessor = new HTTPResponseProcessor(false);
     httpProcessor.addHTTPResponseCallback(requestCB);
   }
 

client/src/main/java/org/threadly/litesockets/client/ws/WebSocketClient.java

@@ -23,7 +23,7 @@
 import org.threadly.litesockets.protocols.http.response.HTTPResponse;
 import org.threadly.litesockets.protocols.http.response.HTTPResponseBuilder;
 import org.threadly.litesockets.protocols.http.shared.HTTPConstants;
-import org.threadly.litesockets.protocols.http.shared.HTTPRequestType;
+import org.threadly.litesockets.protocols.http.shared.HTTPRequestMethod;
 import org.threadly.litesockets.protocols.http.shared.HTTPResponseCode;
 import org.threadly.litesockets.protocols.ws.WebSocketFrameParser;
 import org.threadly.litesockets.protocols.ws.WebSocketFrameParser.WebSocketFrame;
@@ -45,7 +45,7 @@ public class WebSocketClient implements StreamingClient {
       .setHeader(HTTPConstants.HTTP_KEY_WEBSOCKET_ACCEPT, "123456")
       .build();
   public static final HTTPRequest DEFAULT_WS_REQUEST = new HTTPRequestBuilder()
-      .setRequestType(HTTPRequestType.GET)
+      .setRequestMethod(HTTPRequestMethod.GET)
       .setHeader(HTTPConstants.HTTP_KEY_UPGRADE, "websocket")
       .setHeader(HTTPConstants.HTTP_KEY_CONNECTION, "Upgrade")
       .setHeader(HTTPConstants.HTTP_KEY_WEBSOCKET_VERSION, "13")

client/src/test/java/org/threadly/litesockets/client/http/HTTPClientTests.java

@@ -291,6 +291,21 @@ public void noContentLengthWithBody() throws IOException, HTTPParsingException {
     assertEquals("TEST123", hrs.getBodyAsString());
   }
 
+  @Test
+  public void contentLengthOnHeadRequest() throws IOException, HTTPParsingException {
+    int port = PortUtils.findTCPPort(); // TODO
+    fakeServer = new TestHTTPServer(port, RESPONSE_CL, "", false, true);
+    final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
+    hrb.setRequestMethod("HEAD");
+    
+    final HTTPClient httpClient = new HTTPClient();
+    httpClient.start();
+    HTTPResponseData hrs = httpClient.request(hrb.buildClientHTTPRequest());
+    System.out.println(hrs.getResponse());
+    assertEquals(CONTENT.length(), hrs.getContentLength());
+    assertEquals("", hrs.getBodyAsString());
+  }
+
   @Test
   public void closeBeforeLength() throws IOException, HTTPParsingException {
     int port = PortUtils.findTCPPort();

gradle.properties

@@ -1,5 +1,5 @@
 group = org.threadly
-version = 0.14
+version = 0.15
 threadlyVersion = 5.16
 litesocketsVersion = 4.3
 org.gradle.parallel=true

protocol/src/main/java/org/threadly/litesockets/protocols/http/request/HTTPRequestBuilder.java

@@ -12,7 +12,7 @@
 import org.threadly.litesockets.protocols.http.shared.HTTPAddress;
 import org.threadly.litesockets.protocols.http.shared.HTTPConstants;
 import org.threadly.litesockets.protocols.http.shared.HTTPHeaders;
-import org.threadly.litesockets.protocols.http.shared.HTTPRequestType;
+import org.threadly.litesockets.protocols.http.shared.HTTPRequestMethod;
 import org.threadly.litesockets.protocols.http.shared.HTTPUtils;
 import org.threadly.util.ArgumentVerifier;
 
@@ -67,9 +67,9 @@ public HTTPRequestBuilder setURL(final URL url) {
     }
     String q = url.getQuery();
     if(q != null) {
-      request = new HTTPRequestHeader(request.getRequestType(), tmpPath, HTTPUtils.queryToMap(q), request.getHttpVersion());
+      request = new HTTPRequestHeader(request.getRequestMethod(), tmpPath, HTTPUtils.queryToMap(q), request.getHttpVersion());
     } else {
-      request = new HTTPRequestHeader(request.getRequestType(), tmpPath, null, request.getHttpVersion());
+      request = new HTTPRequestHeader(request.getRequestMethod(), tmpPath, null, request.getHttpVersion());
     }
     if(url.getProtocol().equalsIgnoreCase("https")) {
       doSSL = true;
@@ -91,13 +91,14 @@ public HTTPRequestBuilder setHTTPRequestHeader(final HTTPRequestHeader hrh) {
   }
 
   /**
-   * Sets the {@link HTTPRequestType} for this request.  This will accept non-stander strings in the for the request.
+   * Sets the {@link HTTPRequestMethod} for this request.  This will accept non-stander strings in the for the request.
    * 
-   * @param rt the RequestType to set this request too.
+   * @param rm the http request method to set this request too.
    * @return the current {@link HTTPRequestBuilder} object.
    */
-  public HTTPRequestBuilder setRequestType(final String rt) {
-    this.request = new HTTPRequestHeader(rt, request.getRequestPath(), request.getRequestQuery(), request.getHttpVersion());
+  public HTTPRequestBuilder setRequestMethod(final String rm) {
+    this.request = new HTTPRequestHeader(rm, request.getRequestPath(), request.getRequestQuery(), 
+                                         request.getHttpVersion());
     return this;
   }
 
@@ -108,7 +109,8 @@ public HTTPRequestBuilder setRequestType(final String rt) {
    * @return the current {@link HTTPRequestBuilder} object.
    */
   public HTTPRequestBuilder setHTTPVersion(final String version) {
-    this.request = new HTTPRequestHeader(request.getRequestType(), request.getRequestPath(), request.getRequestQuery(), version);
+    this.request = new HTTPRequestHeader(request.getRequestMethod(), request.getRequestPath(), 
+                                         request.getRequestQuery(), version);
     return this;
   }
 
@@ -122,9 +124,11 @@ public HTTPRequestBuilder setHTTPVersion(final String version) {
    */
   public HTTPRequestBuilder setPath(final String path) {
     if(path.contains("?")) {
-      this.request = new HTTPRequestHeader(request.getRequestType(), path, HTTPUtils.queryToMap(path), request.getHttpVersion());
+      this.request = new HTTPRequestHeader(request.getRequestMethod(), path, 
+                                           HTTPUtils.queryToMap(path), request.getHttpVersion());
     } else {
-      this.request = new HTTPRequestHeader(request.getRequestType(), path, request.getRequestQuery(), request.getHttpVersion());
+      this.request = new HTTPRequestHeader(request.getRequestMethod(), path, 
+                                           request.getRequestQuery(), request.getHttpVersion());
     }
     return this;
   }
@@ -136,7 +140,7 @@ public HTTPRequestBuilder setPath(final String path) {
    * @return the current {@link HTTPRequestBuilder} object.
    */
   public HTTPRequestBuilder setQueryString(final String query) {
-    this.request = new HTTPRequestHeader(request.getRequestType(), request.getRequestPath(), HTTPUtils.queryToMap(query), request.getHttpVersion());
+    this.request = new HTTPRequestHeader(request.getRequestMethod(), request.getRequestPath(), HTTPUtils.queryToMap(query), request.getHttpVersion());
     return this;
   }
 
@@ -150,7 +154,7 @@ public HTTPRequestBuilder setQueryString(final String query) {
   public HTTPRequestBuilder appendQuery(final String key, final String value) {
     HashMap<String, String> map = new HashMap<String, String>(request.getRequestQuery());
     map.put(key, value);
-    this.request = new HTTPRequestHeader(request.getRequestType(), request.getRequestPath(), map, request.getHttpVersion());
+    this.request = new HTTPRequestHeader(request.getRequestMethod(), request.getRequestPath(), map, request.getHttpVersion());
     return this;
   }
 
@@ -163,7 +167,7 @@ public HTTPRequestBuilder appendQuery(final String key, final String value) {
   public HTTPRequestBuilder removeQuery(final String key) {
     HashMap<String, String> map = new HashMap<String, String>(request.getRequestQuery());
     map.remove(key);
-    this.request = new HTTPRequestHeader(request.getRequestType(), request.getRequestPath(), map, request.getHttpVersion());
+    this.request = new HTTPRequestHeader(request.getRequestMethod(), request.getRequestPath(), map, request.getHttpVersion());
     return this;
   }
 
@@ -301,13 +305,14 @@ public HTTPRequestBuilder replaceHTTPHeaders(final HTTPHeaders hh) {
 
 
   /**
-   * Sets the {@link HTTPRequestType} for this request.  This uses the standard http request types enum.
+   * Sets the {@link HTTPRequestMethod} for this request.  This uses the standard http request methods enum.
    * 
-   * @param rt the RequestType to set this request too.
+   * @param rm the http request method to set this request too.
    * @return the current {@link HTTPRequestBuilder} object.
    */
-  public HTTPRequestBuilder setRequestType(final HTTPRequestType rt) {
-    this.request = new HTTPRequestHeader(rt, request.getRequestPath(), request.getRequestQuery(), request.getHttpVersion());
+  public HTTPRequestBuilder setRequestMethod(final HTTPRequestMethod rm) {
+    this.request = new HTTPRequestHeader(rm, request.getRequestPath(), request.getRequestQuery(), 
+                                         request.getHttpVersion());
     return this;
   }