Move Http2Server(Request|Response) to impl package and rename them to HttpServer(Request|Response)Impl

Author: vietj

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

@@ -16,6 +16,7 @@
 import io.vertx.core.Handler;
 import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
+import io.vertx.core.http.impl.HttpServerResponseImpl;
 import io.vertx.core.net.HostAndPort;
 import io.vertx.core.streams.ReadStream;
 import io.vertx.core.streams.WriteStream;
@@ -41,7 +42,7 @@
  * serving files from the server since buffers do not have to be read one by one
  * from the file and written to the outgoing socket. If the developer wants to use directly a
  * {@link java.nio.channels.FileChannel} and manage its lifecycle use {@link #sendFile(FileChannel)}.
- * This is not yet supported in HTTP/2 for {@link io.vertx.core.http.impl.Http2ServerResponse}.
+ * This is not yet supported in HTTP/2 for {@link HttpServerResponseImpl}.
  * <p>
  * It implements {@link io.vertx.core.streams.WriteStream} so it can be used with
  * {@link io.vertx.core.streams.Pipe} to pipe data with flow control.

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

@@ -24,7 +24,6 @@
 import io.vertx.core.http.ServerWebSocket;
 import io.vertx.core.http.ServerWebSocketHandshake;
 import io.vertx.core.http.impl.http2.Http2ServerConnection;
-import io.vertx.core.http.impl.http2.Http2ServerRequest;
 import io.vertx.core.internal.ContextInternal;
 
 import java.util.ArrayList;
@@ -100,7 +99,7 @@ public void handle(HttpServerConnection conn) {
       Http2ServerConnection http2Conn = (Http2ServerConnection) conn;
       http2Conn.streamHandler(stream -> {
         HttpServerOptions options = server.options;
-        Http2ServerRequest request = new Http2ServerRequest(stream, stream.context(), options.isHandle100ContinueAutomatically(),
+        HttpServerRequestImpl request = new HttpServerRequestImpl(stream, stream.context(), options.isHandle100ContinueAutomatically(),
           options.getMaxFormAttributeSize(), options.getMaxFormFields(), options.getMaxFormBufferedBytes(), serverOrigin);
         request.handler = requestHandler;
         request.init();

vertx-core/src/main/java/io/vertx/core/http/impl/http2/Http2ServerRequest.java renamed to vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerRequestImpl.java

@@ -9,7 +9,7 @@
  * 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.netty.handler.codec.DecoderResult;
 import io.netty.handler.codec.http.*;
@@ -22,8 +22,6 @@
 import io.vertx.core.MultiMap;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.HttpHeaders;
-import io.vertx.core.http.impl.*;
-import io.vertx.core.http.impl.HttpRequestHead;
 import io.vertx.core.internal.buffer.BufferInternal;
 import io.vertx.core.http.Cookie;
 import io.vertx.core.http.HttpMethod;
@@ -43,12 +41,12 @@
 /**
  * @author <a href="mailto:[email protected]">Julien Viet</a>
  */
-public class Http2ServerRequest extends HttpServerRequestInternal {
+public class HttpServerRequestImpl extends HttpServerRequestInternal {
 
   protected final ContextInternal context;
   protected final HttpServerStream stream;
   protected final HttpServerConnection connection;
-  protected final Http2ServerResponse response;
+  protected final HttpServerResponseImpl response;
   private final boolean handle100ContinueAutomatically;
   private final String serverOrigin;
   private final int maxFormAttributeSize;
@@ -75,17 +73,17 @@ public class Http2ServerRequest extends HttpServerRequestInternal {
   private boolean expectMultipart;
   private HttpPostRequestDecoder postRequestDecoder;
 
-  public Http2ServerRequest(HttpServerStream stream,
-                     ContextInternal context,
-                     boolean handle100ContinueAutomatically,
-                     int maxFormAttributeSize,
-                     int maxFormFields,
-                     int maxFormBufferedBytes,
-                     String serverOrigin) {
+  public HttpServerRequestImpl(HttpServerStream stream,
+                               ContextInternal context,
+                               boolean handle100ContinueAutomatically,
+                               int maxFormAttributeSize,
+                               int maxFormFields,
+                               int maxFormBufferedBytes,
+                               String serverOrigin) {
     this.context = context;
     this.stream = stream;
     this.connection = stream.connection();
-    this.response = new Http2ServerResponse(stream, context,false);
+    this.response = new HttpServerResponseImpl(stream, context,false);
     this.serverOrigin = serverOrigin;
     this.handle100ContinueAutomatically = handle100ContinueAutomatically;
     this.maxFormAttributeSize = maxFormAttributeSize;
@@ -367,7 +365,7 @@ public long bytesRead() {
   }
 
   @Override
-  public Http2ServerResponse response() {
+  public HttpServerResponseImpl response() {
     return response;
   }
 

vertx-core/src/main/java/io/vertx/core/http/impl/http2/Http2ServerResponse.java renamed to vertx-core/src/main/java/io/vertx/core/http/impl/HttpServerResponseImpl.java

@@ -9,7 +9,7 @@
  * 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.netty.buffer.ByteBuf;
 import io.netty.handler.codec.http.HttpHeaderNames;
@@ -24,9 +24,6 @@
 import io.vertx.core.Promise;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.http.*;
-import io.vertx.core.http.impl.*;
-import io.vertx.core.http.impl.HttpRequestHead;
-import io.vertx.core.http.impl.HttpResponseHead;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.net.HostAndPort;
 import io.vertx.core.net.NetSocket;
@@ -47,7 +44,7 @@
 /**
  * @author <a href="mailto:[email protected]">Julien Viet</a>
  */
-public class Http2ServerResponse implements HttpServerResponse, HttpResponse {
+public class HttpServerResponseImpl implements HttpServerResponse, HttpResponse {
 
   private final HttpServerStream stream;
   private final HttpServerConnection conn;
@@ -73,9 +70,9 @@ public class Http2ServerResponse implements HttpServerResponse, HttpResponse {
   private HostAndPort requestAuthority;
   private CharSequence requestCookie;
 
-  public Http2ServerResponse(HttpServerStream stream,
-                             ContextInternal context,
-                             boolean push) {
+  public HttpServerResponseImpl(HttpServerStream stream,
+                                ContextInternal context,
+                                boolean push) {
     this.stream = stream;
     this.context = context;
     this.conn = stream.connection();
@@ -741,7 +738,7 @@ public Future<HttpServerResponse> push(HttpMethod method, HostAndPort authority,
     HostAndPort h = authority;
     Future<HttpServerStream> fut = stream.sendPush(authority, method, headers, path, stream.priority());
     return fut.map(pushStream -> {
-      Http2ServerResponse response = new Http2ServerResponse(pushStream, context, true);
+      HttpServerResponseImpl response = new HttpServerResponseImpl(pushStream, context, true);
       response.requestMethod = method;
       response.requestAuthority = h;
       PushStreamHandler push = new PushStreamHandler(pushStream, response, context);
@@ -754,9 +751,9 @@ private static class PushStreamHandler {
 
     protected final ContextInternal context;
     protected final HttpServerStream stream;
-    protected final Http2ServerResponse response;
+    protected final HttpServerResponseImpl response;
 
-    public PushStreamHandler(HttpServerStream stream, Http2ServerResponse response, ContextInternal context) {
+    public PushStreamHandler(HttpServerStream stream, HttpServerResponseImpl response, ContextInternal context) {
       this.context = context;
       this.stream = stream;
       this.response = response;