Simplify a bit the usage of Http2HeadersMultiMap

Author: vietj

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

@@ -14,6 +14,7 @@
 import io.netty.buffer.*;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.Headers;
 import io.netty.handler.codec.http2.DefaultHttp2Headers;
 import io.netty.handler.codec.http2.Http2Connection;
 import io.netty.handler.codec.http2.Http2Exception;
@@ -517,9 +518,9 @@ public void writePriorityFrame(int streamId, StreamPriority priority, Promise<Vo
   }
 
   @Override
-  public void writeHeaders(int streamId, Http2HeadersMultiMap headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise) {
+  public void writeHeaders(int streamId, Headers<CharSequence, CharSequence, ?> headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise) {
     Http2Stream s = handler.connection().stream(streamId);
-    handler.writeHeaders(s, (Http2Headers) headers.prepare().unwrap(), end, priority.getDependency(), priority.getWeight(), priority.isExclusive(), checkFlush, (FutureListener<Void>) promise);
+    handler.writeHeaders(s, (Http2Headers) headers, end, priority.getDependency(), priority.getWeight(), priority.isExclusive(), checkFlush, (FutureListener<Void>) promise);
   }
 
   @Override

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

@@ -11,6 +11,7 @@
 package io.vertx.core.http.impl.http2.multiplex;
 
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.Headers;
 import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
 import io.netty.handler.codec.http2.DefaultHttp2ResetFrame;
 import io.netty.handler.codec.http2.Http2Error;
@@ -190,8 +191,8 @@ public void createStream(HttpClientStreamState stream) throws Exception {
   }
 
   @Override
-  public void writeHeaders(int streamId, Http2HeadersMultiMap headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise) {
-    writeStreamFrame(streamId, new DefaultHttp2HeadersFrame((Http2Headers) headers.prepare().unwrap(), end), promise);
+  public void writeHeaders(int streamId, Headers<CharSequence, CharSequence, ?> headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise) {
+    writeStreamFrame(streamId, new DefaultHttp2HeadersFrame((Http2Headers) headers, end), promise);
   }
 
   @Override

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

@@ -11,6 +11,7 @@
 package io.vertx.core.http.impl.http2.multiplex;
 
 import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.Headers;
 import io.netty.handler.codec.http2.DefaultHttp2HeadersFrame;
 import io.netty.handler.codec.http2.DefaultHttp2ResetFrame;
 import io.netty.handler.codec.http2.Http2Error;
@@ -103,13 +104,13 @@ void onInitialSettingsReceived(io.vertx.core.http.Http2Settings settings) {
   }
 
   @Override
-  public void writeHeaders(int streamId, Http2HeadersMultiMap headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise) {
-    Http2HeadersMultiMap prepare = headers.prepare();
-    if (headers.status() != null && compressionManager != null) {
+  public void writeHeaders(int streamId, Headers<CharSequence, CharSequence, ?> headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise) {
+    Http2Headers prepare = (Http2Headers)headers;
+    if (prepare.status() != null && compressionManager != null) {
       HttpServerStreamState stream = stream(streamId);
-      compressionManager.setContentEncoding(stream.headers().unwrap(), headers.unwrap());
+      compressionManager.setContentEncoding(stream.headers().unwrap(), prepare);
     }
-    writeStreamFrame(streamId, new DefaultHttp2HeadersFrame((Http2Headers) prepare.unwrap(), end), promise);
+    writeStreamFrame(streamId, new DefaultHttp2HeadersFrame((Http2Headers) prepare, end), promise);
   }
 
 

vertx-core/src/main/java/io/vertx/core/http/impl/spi/DefaultHttpStreamState.java

@@ -333,7 +333,8 @@ void writeHeaders0(Http2HeadersMultiMap headers, boolean end, boolean checkFlush
       trailersSent = true;
       observeOutboundTrailers();
     }
-    connection.writeHeaders(id, headers, priority, end, checkFlush, promise);
+    headers.prepare();
+    connection.writeHeaders(id, headers.unwrap(), priority, end, checkFlush, promise);
   }
 
   public final void sendFile(ChunkedInput<ByteBuf> file, Promise<Void> promise) {

vertx-core/src/main/java/io/vertx/core/http/impl/spi/Http2HeadersMultiMap.java

@@ -147,7 +147,7 @@ public Http2HeadersMultiMap sanitize() {
     return this;
   }
 
-  public Http2HeadersMultiMap prepare() {
+  void prepare() {
     boolean ssl = "ssl".equals(scheme);
     if (method != null) {
       headers.set(HttpHeaders.PSEUDO_METHOD, method.toString());
@@ -167,7 +167,6 @@ public Http2HeadersMultiMap prepare() {
     if (status != null) {
       headers.set(HttpHeaders.PSEUDO_STATUS, status.toString());
     }
-    return this;
   }
 
   public Http2HeadersMultiMap status(CharSequence status) {

vertx-core/src/main/java/io/vertx/core/http/impl/spi/HttpConnectionProvider.java

@@ -11,6 +11,7 @@
 package io.vertx.core.http.impl.spi;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.handler.codec.Headers;
 import io.netty.handler.stream.ChunkedInput;
 import io.vertx.core.Promise;
 import io.vertx.core.http.StreamPriority;
@@ -34,7 +35,7 @@ public interface HttpConnectionProvider {
 
   void writeFrame(int streamId, int type, int flags, ByteBuf payload, Promise<Void> promise);
 
-  void writeHeaders(int streamId, Http2HeadersMultiMap headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise);
+  void writeHeaders(int streamId, Headers<CharSequence, CharSequence, ?> headers, StreamPriority priority, boolean end, boolean checkFlush, Promise<Void> promise);
 
   void writeData(int streamId, ByteBuf buf, boolean end, Promise<Void> promise);