Move Http2ClientPush to impl package

Author: vietj

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

@@ -37,7 +37,6 @@
 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.http2.Http2ClientPush;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
 import io.vertx.core.internal.buffer.BufferInternal;
@@ -524,7 +523,7 @@ public HttpClientStream priorityChangeHandler(Handler<StreamPriority> handler) {
     }
 
     @Override
-    public HttpClientStream pushHandler(Handler<Http2ClientPush> handler) {
+    public HttpClientStream pushHandler(Handler<HttpClientPush> handler) {
       // No op
       return this;
     }

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

@@ -22,7 +22,6 @@
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.*;
 import io.vertx.core.http.HttpVersion;
-import io.vertx.core.http.impl.http2.Http2ClientPush;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
 import io.vertx.core.internal.logging.Logger;
@@ -173,7 +172,7 @@ public HttpClientStream earlyHintsHandler(Handler<MultiMap> handler) {
     }
 
     @Override
-    public HttpClientStream pushHandler(Handler<Http2ClientPush> handler) {
+    public HttpClientStream pushHandler(Handler<HttpClientPush> handler) {
       delegate.pushHandler(handler);
       return this;
     }
@@ -351,7 +350,7 @@ void handleUpgrade(HttpClientConnection conn, HttpClientStream stream) {
     private Handler<Void> drainHandler;
     private Handler<Void> continueHandler;
     private Handler<MultiMap> earlyHintsHandler;
-    private Handler<Http2ClientPush> pushHandler;
+    private Handler<HttpClientPush> pushHandler;
     private Handler<HttpFrame> unknownFrameHandler;
     private Handler<Void> closeHandler;
 
@@ -476,7 +475,7 @@ public HttpClientStream earlyHintsHandler(Handler<MultiMap> handler) {
     }
 
     @Override
-    public HttpClientStream pushHandler(Handler<Http2ClientPush> handler) {
+    public HttpClientStream pushHandler(Handler<HttpClientPush> handler) {
       if (upgradedStream != null) {
         upgradedStream.pushHandler(handler);
       } else {

vertx-core/src/main/java/io/vertx/core/http/impl/http2/Http2ClientPush.java renamed to vertx-core/src/main/java/io/vertx/core/http/impl/HttpClientPush.java

@@ -8,40 +8,39 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
-package io.vertx.core.http.impl.http2;
+package io.vertx.core.http.impl;
 
 import io.vertx.core.MultiMap;
 import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.impl.HttpClientStream;
 import io.vertx.core.net.HostAndPort;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.core.spi.observability.HttpRequest;
 
 /**
  * @author <a href="mailto:[email protected]">Julien Viet</a>
  */
-public class Http2ClientPush implements HttpRequest {
+public class HttpClientPush implements HttpRequest {
 
   private final String uri;
   private final HttpMethod method;
   private final HostAndPort authority;
   private final HttpClientStream stream;
   private final MultiMap headers;
 
-  Http2ClientPush(Http2HeadersMultiMap headers, HttpClientStream stream) {
+  public HttpClientPush(HttpRequestHead head, HttpClientStream stream) {
 
-    String rawMethod = headers.method().toString();
-    String authority = headers.authority() != null ? headers.authority().toString() : null;
+    String rawMethod = head.method().toString();
+    String authority = head.authority != null ? head.authority.toString() : null;
     int pos = authority == null ? -1 : authority.indexOf(':');
     if (pos == -1) {
       this.authority = HostAndPort.create(authority, 80);
     } else {
       this.authority = HostAndPort.create(authority.substring(0, pos), Integer.parseInt(authority.substring(pos + 1)));
     }
     this.method = HttpMethod.valueOf(rawMethod);
-    this.uri = headers.path().toString();
+    this.uri = head.uri;
     this.stream = stream;
-    this.headers = headers;
+    this.headers = head.headers;
   }
 
   public HttpClientStream stream() {
@@ -77,4 +76,5 @@ public String uri() {
   public HttpMethod method() {
     return method;
   }
+
 }

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

@@ -16,7 +16,6 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
 import io.vertx.core.http.*;
-import io.vertx.core.http.impl.http2.Http2ClientPush;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.impl.NoStackTraceTimeoutException;
 import io.vertx.core.internal.PromiseInternal;
@@ -160,7 +159,7 @@ void fail(Throwable t) {
     }
   }
 
-  void handlePush(Http2ClientPush push) {
+  void handlePush(HttpClientPush push) {
     HttpClientRequestPushPromise pushReq = new HttpClientRequestPushPromise(connection, push.stream(), push.method(), push.uri(), push.headers());
     if (pushHandler != null) {
       pushHandler.handle(pushReq);

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

@@ -15,7 +15,6 @@
 import io.vertx.core.Handler;
 import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
-import io.vertx.core.http.impl.http2.Http2ClientPush;
 import io.vertx.core.http.*;
 
 /**
@@ -34,7 +33,7 @@ public interface HttpClientStream extends HttpStream {
   HttpClientStream exceptionHandler(Handler<Throwable> handler);
   HttpClientStream continueHandler(Handler<Void> handler);
   HttpClientStream earlyHintsHandler(Handler<MultiMap> handler);
-  HttpClientStream pushHandler(Handler<Http2ClientPush> handler);
+  HttpClientStream pushHandler(Handler<HttpClientPush> handler);
   HttpClientStream customFrameHandler(Handler<HttpFrame> handler);
   HttpClientStream dataHandler(Handler<Buffer> handler);
   HttpClientStream trailersHandler(Handler<MultiMap> handler);

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

@@ -19,7 +19,6 @@
 import io.vertx.core.http.HttpFrame;
 import io.vertx.core.http.HttpVersion;
 import io.vertx.core.http.StreamPriority;
-import io.vertx.core.http.impl.http2.Http2ClientPush;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.net.endpoint.ServerInteraction;
 
@@ -103,7 +102,7 @@ public HttpClientStream earlyHintsHandler(Handler<MultiMap> handler) {
   }
 
   @Override
-  public HttpClientStream pushHandler(Handler<Http2ClientPush> handler) {
+  public HttpClientStream pushHandler(Handler<HttpClientPush> handler) {
     delegate.pushHandler(handler);
     return this;
   }

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

@@ -22,7 +22,6 @@
 import io.vertx.core.http.HttpConnection;
 import io.vertx.core.http.HttpHeaders;
 import io.vertx.core.http.HttpMethod;
-import io.vertx.core.http.HttpVersion;
 import io.vertx.core.http.StreamPriority;
 import io.vertx.core.http.impl.*;
 import io.vertx.core.http.impl.headers.HeadersMultiMap;
@@ -61,7 +60,7 @@ public class Http2ClientStream extends Http2StreamBase<Http2ClientStream> implem
   // Handlers
   private Handler<HttpResponseHead> headersHandler;
   private Handler<Void> continueHandler;
-  private Handler<Http2ClientPush> pushHandler;
+  private Handler<HttpClientPush> pushHandler;
   private Handler<MultiMap> earlyHintsHandler;
 
   public Http2ClientStream(Http2ClientConnection connection, ContextInternal context, TracingPolicy tracingPolicy,
@@ -184,7 +183,7 @@ public Http2ClientConnection connection() {
   }
 
   public void onPush(Http2ClientStream pushStream, int promisedStreamId, Http2HeadersMultiMap headers, boolean writable) {
-    Http2ClientPush push = new Http2ClientPush(headers, pushStream);
+    HttpClientPush push = new HttpClientPush(new HttpRequestHead(headers.method(), headers.path(), headers, headers.authority(), null, null), pushStream);
     pushStream.init(promisedStreamId, writable);
     if (clientMetrics != null) {
       Object metric = clientMetrics.requestBegin(headers.path().toString(), push);
@@ -260,13 +259,13 @@ void handleContinue() {
     }
   }
 
-  public Http2ClientStream pushHandler(Handler<Http2ClientPush> handler) {
+  public Http2ClientStream pushHandler(Handler<HttpClientPush> handler) {
     pushHandler = handler;
     return this;
   }
 
-  void handlePush(Http2ClientPush push) {
-    Handler<Http2ClientPush> handler = pushHandler;
+  void handlePush(HttpClientPush push) {
+    Handler<HttpClientPush> handler = pushHandler;
     if (handler != null) {
       context.dispatch(push, handler);
     }