Fix two conditions where HTTPRequestProcessor might not complete the response

This resolves #12 where HEAD requests were not being handled correctly by the HTTPClient.
This also resolves a newly found condition where 204 responses that don't contain a content length were also not completing.

Author: jentfoo

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

@@ -498,14 +498,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()
+                                         .getRequestType().equals("HEAD"));
       hrp.addHTTPResponseCallback(this);
       this.chr = chr;
     }
@@ -534,7 +537,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);

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);
   }
 

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

@@ -110,7 +110,7 @@ public HTTPRequestHeader(String requestType, String requestPath, Map<String, Str
    * 
    * @return the request type.
    */
-  public String getRequestType() {
+  public String getRequestType() {  // TODO - rename to method?
     return requestType;
   }
 

protocol/src/main/java/org/threadly/litesockets/protocols/http/response/HTTPResponseProcessor.java

@@ -24,14 +24,17 @@ public class HTTPResponseProcessor {
 
   private final ReuseableMergedByteBuffers buffers = new ReuseableMergedByteBuffers();
   private final ListenerHelper<HTTPResponseCallback> listeners = new ListenerHelper<>(HTTPResponseCallback.class);
+  private final boolean headRequest;
   private HTTPResponse response;
   private int nextChunkSize = -1;
   private int currentBodySize = 0;
 
   /**
    * Creates a new {@link HTTPResponseProcessor}. 
    */
-  public HTTPResponseProcessor() {}
+  public HTTPResponseProcessor(boolean headRequest) {
+    this.headRequest = headRequest;
+  }
 
   /**
    * Adds an {@link HTTPResponseCallback} to this processor that will be called back as
@@ -103,10 +106,11 @@ public void processData(MergedByteBuffers bb) {
         }
         response = new HTTPResponse(hrh, hh);
         listeners.call().headersFinished(response);
-        if(!response.getHeaders().isChunked() && response.getHeaders().getContentLength() == 0) {
-          if(response.getResponseCode() != HTTPResponseCode.SwitchingProtocols ) {
-            reset(null);
-          }
+        if(!response.getHeaders().isChunked() && 
+            response.getResponseCode() != HTTPResponseCode.SwitchingProtocols && 
+            (headRequest || response.getResponseCode() == HTTPResponseCode.NoContent || 
+             response.getHeaders().getContentLength() == 0)) {
+          reset(null);
         }
       } catch(Exception e) {
         reset(e);
@@ -120,10 +124,10 @@ public void processData(MergedByteBuffers bb) {
 
 
   /**
-   * Called when an http response connection is closes.  Some types of responses are only completed when the connection is closed (http1.0).
+   * Called when an http response connection is closes.  Some types of responses are only completed 
+   * when the connection is closed (http1.0).
    * 
    * This will finish all the callback and then reset the processor to be able to be reused if wanted.
-   * 
    */
   public void connectionClosed() {
     if(response != null) {
@@ -216,7 +220,8 @@ private void processBody() {
         if(currentBodySize >= response.getHeaders().getContentLength()) {
           reset(null);
         }
-      } else if (response.getHeaders().getContentLength() == -1 || response.getResponseCode() == HTTPResponseCode.SwitchingProtocols) {
+      } else if (response.getHeaders().getContentLength() == -1 || 
+                 response.getResponseCode() == HTTPResponseCode.SwitchingProtocols) {
         sendDuplicateBBtoListeners(buffers.pullBuffer(buffers.remaining()));
       }
     }

protocol/src/test/java/org/threadly/litesockets/protocols/http/ResponseTests.java

@@ -51,7 +51,7 @@ public void responseCompareTest1() {
 
   @Test
   public void responseProcessorTest1() throws InterruptedException, ExecutionException, TimeoutException {
-    HTTPResponseProcessor hrp = new HTTPResponseProcessor();
+    HTTPResponseProcessor hrp = new HTTPResponseProcessor(false);
     final SettableListenableFuture<HTTPResponse> header = new SettableListenableFuture<>();
     final SettableListenableFuture<Boolean> finished = new SettableListenableFuture<>();
     hrp.addHTTPResponseCallback(new HTTPResponseCallback() {