Merge pull request #5757 from eclipse-vertx/http-headers-rework

Revert framed HTTP stream SPI

Author: vietj

vertx-core/src/main/java/io/vertx/core/MultiMap.java

@@ -12,7 +12,7 @@
 package io.vertx.core;
 
 import io.vertx.codegen.annotations.*;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
+import io.vertx.core.http.impl.headers.Http1xHeaders;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,7 +40,7 @@ public interface MultiMap extends Iterable<Map.Entry<String, String>> {
    * @return the multi-map
    */
   static MultiMap caseInsensitiveMultiMap() {
-    return HeadersMultiMap.caseInsensitive();
+    return Http1xHeaders.caseInsensitive();
   }
 
   @GenIgnore(GenIgnore.PERMITTED_TYPE)

vertx-core/src/main/java/io/vertx/core/http/HttpHeaders.java

@@ -19,8 +19,7 @@
 import io.vertx.codegen.annotations.GenIgnore;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.MultiMap;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
-import io.vertx.core.http.impl.spi.Http2HeadersMultiMap;
+import io.vertx.core.http.impl.headers.Http1xHeaders;
 
 /**
  * Contains a bunch of useful HTTP headers stuff:
@@ -494,7 +493,7 @@ static CharSequence createOptimized(String value) {
    * @return a {@link MultiMap} backing an HTTP headers structure optimized for {@code HTTP/1.x}
    */
   static MultiMap headers() {
-    return HeadersMultiMap.httpHeaders();
+    return Http1xHeaders.httpHeaders();
   }
 
   /**
@@ -505,20 +504,20 @@ static MultiMap headers(HttpVersion version) {
     switch (version) {
       case HTTP_1_0:
       case HTTP_1_1:
-        return HeadersMultiMap.httpHeaders();
+        return Http1xHeaders.httpHeaders();
       case HTTP_2:
-        return new Http2HeadersMultiMap(new DefaultHttp2Headers());
+        return new io.vertx.core.http.impl.headers.HttpHeaders(new DefaultHttp2Headers());
       default:
         throw new AssertionError();
     }
   }
 
   static MultiMap set(String name, String value) {
-    return HeadersMultiMap.httpHeaders().set(name, value);
+    return Http1xHeaders.httpHeaders().set(name, value);
   }
 
   @GenIgnore(GenIgnore.PERMITTED_TYPE)
   static MultiMap set(CharSequence name, CharSequence value) {
-    return HeadersMultiMap.httpHeaders().set(name, value);
+    return Http1xHeaders.httpHeaders().set(name, value);
   }
 }

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

@@ -37,6 +37,7 @@
 import io.vertx.core.http.HttpVersion;
 import io.vertx.core.http.WebSocketVersion;
 import io.vertx.core.http.impl.headers.HeadersAdaptor;
+import io.vertx.core.http.impl.headers.Http1xHeaders;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
 import io.vertx.core.internal.buffer.BufferInternal;
@@ -115,6 +116,11 @@ public class Http1xClientConnection extends Http1xConnection implements HttpClie
     this.expirationTimestamp = expirationTimestampOf(keepAliveTimeout);
   }
 
+  @Override
+  public MultiMap newHttpRequestHeaders() {
+    return Http1xHeaders.httpHeaders();
+  }
+
   @Override
   public HostAndPort authority() {
     return authority;

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

@@ -18,6 +18,7 @@
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.EventLoop;
 import io.netty.handler.codec.DecoderResult;
+import io.netty.handler.codec.Headers;
 import io.netty.handler.codec.http.*;
 import io.netty.handler.codec.http.websocketx.WebSocketDecoderConfig;
 import io.netty.handler.codec.http.websocketx.WebSocketHandshakeException;
@@ -28,7 +29,6 @@
 import io.vertx.core.*;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.ServerWebSocketHandshake;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
 import io.vertx.core.internal.buffer.BufferInternal;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.http.HttpServerRequest;
@@ -116,8 +116,8 @@ protected void handleShutdown(ChannelPromise promise) {
   }
 
   @Override
-  public MultiMap newHeaders() {
-    return io.vertx.core.http.HttpHeaders.headers();
+  public Headers<CharSequence, CharSequence, ?> newHeaders() {
+    throw new UnsupportedOperationException();
   }
 
   @Override

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

@@ -29,7 +29,7 @@
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
 import io.vertx.core.internal.buffer.BufferInternal;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
+import io.vertx.core.http.impl.headers.Http1xHeaders;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.internal.PromiseInternal;
@@ -43,8 +43,6 @@
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 import static io.vertx.core.http.HttpHeaders.*;
 
@@ -75,7 +73,7 @@ public class Http1xServerResponse implements HttpServerResponse, HttpResponse {
   private Handler<Void> headersEndHandler;
   private Handler<Void> bodyEndHandler;
   private boolean closed;
-  private final HeadersMultiMap headers;
+  private final Http1xHeaders headers;
   private CookieJar cookies;
   private MultiMap trailers;
   private io.netty.handler.codec.http.HttpHeaders trailingHeaders = EmptyHttpHeaders.INSTANCE;
@@ -93,7 +91,7 @@ public class Http1xServerResponse implements HttpServerResponse, HttpResponse {
     this.conn = conn;
     this.context = context;
     this.version = request.protocolVersion();
-    this.headers = HeadersMultiMap.httpHeaders();
+    this.headers = Http1xHeaders.httpHeaders();
     this.request = request;
     this.status = HttpResponseStatus.OK;
     this.requestMetric = requestMetric;
@@ -115,7 +113,7 @@ public MultiMap headers() {
   @Override
   public MultiMap trailers() {
     if (trailers == null) {
-      HeadersMultiMap v = HeadersMultiMap.httpHeaders();
+      Http1xHeaders v = Http1xHeaders.httpHeaders();
       trailers = v;
       trailingHeaders = v;
     }
@@ -361,11 +359,11 @@ public Future<Void> writeContinue() {
   public Future<Void> writeEarlyHints(MultiMap headers) {
     checkThread();
     PromiseInternal<Void> promise = context.promise();
-    HeadersMultiMap headersMultiMap;
-    if (headers instanceof HeadersMultiMap) {
-      headersMultiMap = (HeadersMultiMap) headers;
+    Http1xHeaders headersMultiMap;
+    if (headers instanceof Http1xHeaders) {
+      headersMultiMap = (Http1xHeaders) headers;
     } else {
-      headersMultiMap = HeadersMultiMap.httpHeaders();
+      headersMultiMap = Http1xHeaders.httpHeaders();
       headersMultiMap.addAll(headers);
     }
     synchronized (conn) {

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

@@ -22,6 +22,7 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.*;
 import io.vertx.core.http.HttpVersion;
+import io.vertx.core.http.impl.headers.Http1xHeaders;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
 import io.vertx.core.internal.logging.Logger;
@@ -69,6 +70,11 @@ public HttpClientConnection unwrap() {
     return current;
   }
 
+  @Override
+  public MultiMap newHttpRequestHeaders() {
+    return Http1xHeaders.httpHeaders();
+  }
+
   @Override
   public HostAndPort authority() {
     return current.authority();

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

@@ -12,8 +12,10 @@
 package io.vertx.core.http.impl;
 
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.Headers;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
+import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpConnection;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.logging.Logger;
@@ -33,6 +35,8 @@ public interface HttpClientConnection extends HttpConnection {
 
   Handler<Long> DEFAULT_CONCURRENCY_CHANGE_HANDLER = concurrency -> {};
 
+  MultiMap newHttpRequestHeaders();
+
   /**
    * @return the number of active request/response (streams)
    */

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

@@ -19,7 +19,7 @@
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.buffer.BufferInternal;
 import io.vertx.core.http.*;
-import io.vertx.core.http.impl.headers.HeadersMultiMap;
+import io.vertx.core.http.impl.headers.Http1xHeaders;
 import io.vertx.core.impl.Arguments;
 import io.vertx.core.internal.logging.Logger;
 import io.vertx.core.internal.logging.LoggerFactory;
@@ -54,7 +54,7 @@ public class HttpClientRequestImpl extends HttpClientRequestBase implements Http
   private boolean followRedirects;
   private int maxRedirects;
   private int numberOfRedirections;
-  private HeadersMultiMap headers;
+  private MultiMap headers;
   private StreamPriority priority;
   private boolean headWritten;
   private boolean isConnect;
@@ -184,7 +184,7 @@ public synchronized boolean isChunked() {
   @Override
   public synchronized MultiMap headers() {
     if (headers == null) {
-      headers = HeadersMultiMap.httpHeaders();
+      headers = Http1xHeaders.httpHeaders();
     }
     return headers;
   }

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

@@ -11,8 +11,8 @@
 package io.vertx.core.http.impl;
 
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.Headers;
 import io.vertx.core.Handler;
-import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpConnection;
 import io.vertx.core.internal.ContextInternal;
 
@@ -23,7 +23,7 @@ public interface HttpServerConnection extends HttpConnection {
 
   HttpServerConnection streamHandler(Handler<HttpServerStream> handler);
 
-  MultiMap newHeaders();
+  Headers<CharSequence, CharSequence, ?> newHeaders();
 
   boolean supportsSendFile();
 

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

@@ -23,7 +23,7 @@
 import io.vertx.core.http.HttpServerRequest;
 import io.vertx.core.http.ServerWebSocket;
 import io.vertx.core.http.ServerWebSocketHandshake;
-import io.vertx.core.http.impl.spi.HttpServerConnectionProvider;
+import io.vertx.core.http.impl.http2.Http2ServerConnection;
 import io.vertx.core.internal.ContextInternal;
 
 import java.util.ArrayList;
@@ -96,12 +96,12 @@ public void handle(HttpServerConnection conn) {
       http1Conn.handler(requestHandler);
       http1Conn.invalidRequestHandler(invalidRequestHandler);
     } else {
-      HttpServerConnectionProvider http2Conn = (HttpServerConnectionProvider) conn;
+      Http2ServerConnection http2Conn = (Http2ServerConnection) conn;
       http2Conn.streamHandler(stream -> {
         HttpServerOptions options = server.options;
-        HttpServerRequestImpl request = new HttpServerRequestImpl(stream, stream.context(), options.isHandle100ContinueAutomatically(),
-          options.getMaxFormAttributeSize(), options.getMaxFormFields(), options.getMaxFormBufferedBytes(), serverOrigin);
-        request.handler = requestHandler;
+        HttpServerRequestImpl request = new HttpServerRequestImpl(requestHandler, stream, stream.context(),
+          options.isHandle100ContinueAutomatically(), options.getMaxFormAttributeSize(), options.getMaxFormFields(),
+          options.getMaxFormBufferedBytes(), serverOrigin);
         request.init();
       });
     }