Remove version field in HttpResponseHead as this is more inconvenient than convenient

Author: vietj

vertx-core/src/main/java/io/vertx/core/http/impl/Http1xClientConnection.java

@@ -378,6 +378,7 @@ private abstract static class Stream {
     protected final ContextInternal context;
     protected final int id;
 
+    private HttpVersion version;
     private Object trace;
     private Object metric;
     private HttpRequestHead request;
@@ -793,8 +794,7 @@ private void handleHttpMessage(HttpObject obj) {
       } else {
         version = io.vertx.core.http.HttpVersion.HTTP_1_1;
       }
-      handleResponseBegin(stream, new HttpResponseHead(
-        version,
+      handleResponseBegin(stream, version, new HttpResponseHead(
         response.status().code(),
         response.status().reasonPhrase(),
         new HeadersAdaptor(response.headers())));
@@ -822,7 +822,7 @@ private void handleChunk(ByteBuf chunk) {
     }
   }
 
-  private void handleResponseBegin(Stream stream, HttpResponseHead response) {
+  private void handleResponseBegin(Stream stream, HttpVersion version, HttpResponseHead response) {
     // How can we handle future undefined 1xx informational response codes?
     if (response.statusCode == HttpResponseStatus.CONTINUE.code()) {
       stream.handleContinue();
@@ -832,6 +832,7 @@ private void handleResponseBegin(Stream stream, HttpResponseHead response) {
       HttpRequestHead request;
       synchronized (this) {
         request = stream.request;
+        stream.version = version;
         stream.response = response;
         if (metrics != null) {
           metrics.responseBegin(stream.metric, response);
@@ -885,9 +886,11 @@ private void handleResponseChunk(Stream stream, ByteBuf chunk) {
 
   private void handleResponseEnd(Stream stream, LastHttpContent trailer) {
     boolean check;
-    HttpResponseHead response ;
+    HttpResponseHead response;
+    HttpVersion version;
     synchronized (this) {
       response = stream.response;
+      version = stream.version;
       if (response == null) {
         // 100-continue
         return;
@@ -903,7 +906,7 @@ private void handleResponseEnd(Stream stream, LastHttpContent trailer) {
         if (HttpHeaderValues.CLOSE.contentEqualsIgnoreCase(responseConnectionHeader) || HttpHeaderValues.CLOSE.contentEqualsIgnoreCase(requestConnectionHeader)) {
           // In all cases, if we have a close connection option then we SHOULD NOT treat the connection as persistent
           close = true;
-        } else if (response.version == HttpVersion.HTTP_1_0 && !HttpHeaderValues.KEEP_ALIVE.contentEqualsIgnoreCase(responseConnectionHeader)) {
+        } else if (version == HttpVersion.HTTP_1_0 && !HttpHeaderValues.KEEP_ALIVE.contentEqualsIgnoreCase(responseConnectionHeader)) {
           // In the HTTP/1.0 case both request/response need a keep-alive connection header the connection to be persistent
           // currently Vertx forces the Connection header if keepalive is enabled for 1.0
           close = true;

vertx-core/src/main/java/io/vertx/core/http/impl/HttpResponseHead.java

@@ -19,13 +19,11 @@
  */
 public class HttpResponseHead implements HttpResponse {
 
-  public final HttpVersion version;
   public final int statusCode;
   public final String statusMessage;
   public final MultiMap headers;
 
-  public HttpResponseHead(HttpVersion version, int statusCode, String statusMessage, MultiMap headers) {
-    this.version = version;
+  public HttpResponseHead(int statusCode, String statusMessage, MultiMap headers) {
     this.statusCode = statusCode;
     this.statusMessage = statusMessage;
     this.headers = headers;

vertx-core/src/main/java/io/vertx/core/http/impl/http2/Http2ClientStream.java

@@ -227,7 +227,7 @@ public void onHeaders(Http2HeadersMultiMap headers) {
       return;
     }
     String statusMessage = HttpResponseStatus.valueOf(status).reasonPhrase();
-    this.responseHead = new HttpResponseHead(HttpVersion.HTTP_2, headers.status(), statusMessage, headers);
+    this.responseHead = new HttpResponseHead(headers.status(), statusMessage, headers);
     super.onHeaders(headers);
   }
 
@@ -251,7 +251,6 @@ void handleHeader(Http2HeadersMultiMap map) {
       int status = map.status();
       String statusMessage = HttpResponseStatus.valueOf(status).reasonPhrase();
       HttpResponseHead response = new HttpResponseHead(
-        HttpVersion.HTTP_2,
         status,
         statusMessage,
         map);

vertx-core/src/main/java/io/vertx/core/http/impl/http2/Http2ServerStream.java

@@ -96,7 +96,7 @@ private HttpRequest observableRequest() {
 
   private HttpResponse observableResponse() {
     if (observableResponse == null) {
-      observableResponse = new HttpResponseHead(HttpVersion.HTTP_2, responseHeaders.status(), null, responseHeaders);
+      observableResponse = new HttpResponseHead(responseHeaders.status(), null, responseHeaders);
     }
     return observableResponse;
   }