Update to HTTP API authority changes.

Author: vietj

src/main/java/io/vertx/httpproxy/impl/ProxiedRequest.java

@@ -23,6 +23,8 @@
 import io.vertx.core.http.HttpVersion;
 import io.vertx.core.http.impl.HttpServerRequestInternal;
 import io.vertx.core.impl.ContextInternal;
+import io.vertx.core.net.HostAndPort;
+import io.vertx.core.net.impl.HostAndPortImpl;
 import io.vertx.core.streams.Pipe;
 import io.vertx.httpproxy.Body;
 import io.vertx.httpproxy.ProxyRequest;
@@ -51,7 +53,7 @@ public class ProxiedRequest implements ProxyRequest {
   private String uri;
   private final String absoluteURI;
   private Body body;
-  private String authority;
+  private HostAndPort authority;
   private final MultiMap headers;
   HttpClientRequest request;
   private final HttpServerRequest proxiedRequest;
@@ -77,7 +79,7 @@ public ProxiedRequest(HttpServerRequest proxiedRequest) {
     this.absoluteURI = proxiedRequest.absoluteURI();
     this.proxiedRequest = proxiedRequest;
     this.context = (ContextInternal) ((HttpServerRequestInternal) proxiedRequest).context();
-    this.authority = proxiedRequest.host();
+    this.authority = proxiedRequest.authority();
   }
 
   @Override
@@ -110,13 +112,13 @@ public ProxyRequest setBody(Body body) {
   @Override
   public ProxyRequest setAuthority(String authority) {
     Objects.requireNonNull(authority);
-    this.authority= authority;
+    this.authority= HostAndPortImpl.parseHostAndPort(authority, -1);
     return this;
   }
 
   @Override
   public String getAuthority() {
-    return authority;
+    return authority.toString();
   }
 
   @Override
@@ -174,32 +176,10 @@ void sendRequest(Handler<AsyncResult<ProxyResponse>> responseHandler) {
     }
 
     //
-    String proxiedAuthority = proxiedRequest.host();
-    int idx = proxiedAuthority.indexOf(':');
-    String proxiedHost;
-    int proxiedPort;
-    if (idx == -1) {
-      proxiedHost = proxiedAuthority;
-      proxiedPort = -1;
-    } else {
-      proxiedHost = proxiedAuthority.substring(0, idx);
-      proxiedPort = Integer.parseInt(proxiedAuthority.substring(idx + 1));
-    }
-
-    String host;
-    int port;
-    idx = authority.indexOf(':');
-    if (idx == -1) {
-      host = authority;
-      port = -1;
-    } else {
-      host = authority.substring(0, idx);
-      port = Integer.parseInt(authority.substring(idx + 1));
-    }
-    request.setHost(host);
-    request.setPort(port == -1 ? (request.absoluteURI().startsWith("https://") ? 443 : 80) : port);
-    if (!proxiedHost.equals(host) || proxiedPort != port) {
-      request.putHeader(X_FORWARDED_HOST, proxiedAuthority);
+    HostAndPort proxiedAuthority = proxiedRequest.authority();
+    request.authority(authority);
+    if (!proxiedAuthority.host().equals(authority.host()) || proxiedAuthority.port() != authority.port()) {
+      request.putHeader(X_FORWARDED_HOST, proxiedAuthority.toString());
     }
 
     long len = body.length();

src/test/java/io/vertx/httpproxy/ProxyClientKeepAliveTest.java

@@ -72,7 +72,7 @@ public void testNotfound(TestContext ctx) {
   public void testGet(TestContext ctx) {
     SocketAddress backend = startHttpBackend(ctx, 8081, req -> {
       ctx.assertEquals("/somepath", req.uri());
-      ctx.assertEquals("localhost:8080", req.host());
+      ctx.assertEquals("localhost:8080", req.authority().toString());
       req.response().end("Hello World");
     });
     startProxy(backend);
@@ -754,7 +754,7 @@ public void testAuthorityOverride3(TestContext ctx) {
   private void testAuthorityOverride(TestContext ctx, String authority, String expectedAuthority, String expectedForwardedHost) {
     SocketAddress backend = startHttpBackend(ctx, 8081, req -> {
       ctx.assertEquals("/somepath", req.uri());
-      ctx.assertEquals(expectedAuthority, req.host());
+      ctx.assertEquals(expectedAuthority, req.authority().toString());
       ctx.assertEquals(expectedForwardedHost, req.getHeader("x-forwarded-host"));
       req.response().end("Hello World");
     });