Public API to get absolute URI of the request. (helidon-io#2441)

* Public API to get absolute URI of the request.
* Absolute URI uses lazy value, added test.

Signed-off-by: Tomas Langer <tomas.langer@oracle.com>

Author: tomas-langer

webserver/jersey/src/main/java/io/helidon/webserver/jersey/JerseySupport.java

@@ -18,10 +18,8 @@
 
 import java.io.InputStream;
 import java.lang.reflect.Type;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.security.Principal;
 import java.util.Collection;
 import java.util.Map;
@@ -154,30 +152,6 @@ private static synchronized ExecutorService getDefaultThreadPool(Config config)
         return DEFAULT_THREAD_POOL.get();
     }
 
-    private static URI requestUri(ServerRequest req) {
-        try {
-            // Use raw string representation and URL to avoid re-encoding chars like '%'
-            URI partialUri = new URL(req.isSecure() ? "https" : "http", req.localAddress(),
-                                     req.localPort(), req.path().absolute().toRawString()).toURI();
-            StringBuilder sb = new StringBuilder(partialUri.toString());
-            if (req.uri().toString().endsWith("/") && sb.charAt(sb.length() - 1) != '/') {
-                sb.append('/');
-            }
-
-            // unfortunately, the URI constructor encodes the 'query' and 'fragment' which is totally silly
-            if (req.query() != null && !req.query().isEmpty()) {
-                sb.append("?")
-                        .append(req.query());
-            }
-            if (req.fragment() != null && !req.fragment().isEmpty()) {
-                sb.append("#")
-                        .append(req.fragment());
-            }
-            return new URI(sb.toString());
-        } catch (URISyntaxException | MalformedURLException e) {
-            throw new HttpException("Unable to parse request URL", Http.Status.BAD_REQUEST_400, e);
-        }
-    }
 
     private static URI baseUri(ServerRequest req) {
         try {
@@ -255,7 +229,7 @@ private void doAccept(ServerRequest req, ServerResponse res) {
             CompletableFuture<Void> whenHandleFinishes = new CompletableFuture<>();
             ResponseWriter responseWriter = new ResponseWriter(res, req, whenHandleFinishes);
             ContainerRequest requestContext = new ContainerRequest(baseUri(req),
-                                                                   requestUri(req),
+                                                                   req.absoluteUri(),
                                                                    req.method().name(),
                                                                    new WebServerSecurityContext(),
                                                                    new WebServerPropertiesDelegate(req),

webserver/webserver/src/main/java/io/helidon/webserver/RequestRouting.java

@@ -16,6 +16,7 @@
 
 package io.helidon.webserver;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -30,6 +31,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import io.helidon.common.LazyValue;
 import io.helidon.common.context.Contexts;
 import io.helidon.common.http.AlreadyCompletedException;
 import io.helidon.common.http.Http;
@@ -233,6 +235,7 @@ private static class RoutedRequest extends Request {
         private final RoutedResponse response;
 
         private final AtomicBoolean nexted = new AtomicBoolean(false);
+        private final LazyValue<URI> lazyAbsoluteUri = LazyValue.create(super::absoluteUri);
 
         /**
          * Creates new instance.
@@ -427,6 +430,11 @@ public Tracer tracer() {
             return WebTracingConfig.tracer(webServer());
         }
 
+        @Override
+        public URI absoluteUri() {
+            return lazyAbsoluteUri.get();
+        }
+
         private class ErrorRoutedRequest extends RoutedRequest {
             private final Throwable t;
 

webserver/webserver/src/main/java/io/helidon/webserver/ServerRequest.java

@@ -16,9 +16,14 @@
 
 package io.helidon.webserver;
 
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Optional;
 
 import io.helidon.common.context.Context;
+import io.helidon.common.http.Http;
 import io.helidon.common.http.HttpRequest;
 import io.helidon.media.common.MessageBodyReadableContent;
 
@@ -136,4 +141,35 @@ public interface ServerRequest extends HttpRequest {
      * @return the tracer associated, or {@link io.opentracing.util.GlobalTracer#get()}
      */
     Tracer tracer();
+
+    /**
+     * Absolute URI of the incoming request, including query parameters and fragment.
+     * The host and port are obtained from the interface this server listens on ({@code host} header is not used).
+     *
+     * @return the URI of incoming request
+     */
+    default URI absoluteUri() {
+        try {
+            // Use raw string representation and URL to avoid re-encoding chars like '%'
+            URI partialUri = new URL(isSecure() ? "https" : "http", localAddress(),
+                                     localPort(), path().absolute().toRawString()).toURI();
+            StringBuilder sb = new StringBuilder(partialUri.toString());
+            if (uri().toString().endsWith("/") && sb.charAt(sb.length() - 1) != '/') {
+                sb.append('/');
+            }
+
+            // unfortunately, the URI constructor encodes the 'query' and 'fragment' which is totally silly
+            if (query() != null && !query().isEmpty()) {
+                sb.append("?")
+                        .append(query());
+            }
+            if (fragment() != null && !fragment().isEmpty()) {
+                sb.append("#")
+                        .append(fragment());
+            }
+            return new URI(sb.toString());
+        } catch (URISyntaxException | MalformedURLException e) {
+            throw new HttpException("Unable to parse request URL", Http.Status.BAD_REQUEST_400, e);
+        }
+    }
 }

webserver/webserver/src/test/java/io/helidon/webserver/NettyWebServerTest.java

@@ -17,7 +17,6 @@
 package io.helidon.webserver;
 
 import java.net.InetAddress;
-import java.security.SecureRandom;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -70,9 +69,6 @@ static void main(String[] args) throws InterruptedException {
                 .port(8080)
                 .bindAddress(InetAddress.getLoopbackAddress())
                 .routing(routing((breq, bres) -> {
-                    long id = new SecureRandom().nextLong();
-                    System.out.println("Received request .. ID: " + id);
-
                     SubmissionPublisher<DataChunk> responsePublisher = new SubmissionPublisher<>(ForkJoinPool.commonPool(), 1024);
                     responsePublisher.subscribe(bres);
 
@@ -95,11 +91,7 @@ static void main(String[] args) throws InterruptedException {
                         LOGGER.log(Level.WARNING,
                                    "An error occurred during the flow consumption!",
                                    ex);
-                    }, () -> {
-                        System.out.println("Final execution");
-                        responsePublisher.close();
-                    }, (Subscription s) -> {
-                        System.out.println("Subscribe");
+                    }, responsePublisher::close, (Subscription s) -> {
                         subscription.set(s);
                         s.request(1);
                         bres.writeStatusAndHeaders(Http.Status.CREATED_201,
@@ -155,7 +147,7 @@ public void testSinglePortsSuccessStart() throws Exception {
     }
 
     @Test
-    public void testMultiplePortsSuccessStart() throws Exception {
+    public void testMultiplePortsSuccessStart() {
         WebServer webServer = WebServer.builder()
                 .addSocket(SocketConfiguration.create("1"))
                 .addSocket(SocketConfiguration.create("2"))
@@ -164,8 +156,7 @@ public void testMultiplePortsSuccessStart() throws Exception {
                 .build();
 
         webServer.start()
-                .toCompletableFuture()
-                .join();
+                .await();
 
         try {
             assertThat(webServer.port(), greaterThan(0));
@@ -216,13 +207,11 @@ public void testManyPortsButTwoTheSame() throws Exception {
         assertStartFailure(webServer);
     }
 
-    private void assertStartFailure(WebServer webServer)
-            throws InterruptedException {
+    private void assertStartFailure(WebServer webServer) {
 
         try {
             webServer.start()
-                    .toCompletableFuture()
-                    .join();
+                    .await();
 
             fail("Should have failed!");
         } catch (CompletionException e) {

webserver/webserver/src/test/java/io/helidon/webserver/PlainTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@
 import io.helidon.common.http.DataChunk;
 import io.helidon.common.http.Http;
 import io.helidon.common.reactive.Multi;
+import io.helidon.webclient.WebClient;
 import io.helidon.webserver.utils.SocketHttpClient;
 
 import org.hamcrest.collection.IsIterableWithSize;
@@ -41,6 +42,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -119,6 +121,9 @@ private static void startServer(int port) {
                         .get("/multi", (req, res) -> {
                             res.send(Multi.just("test1","test2").map(i -> DataChunk.create(String.valueOf(i).getBytes())));
                         })
+                        .get("/absoluteUri", (req, res) -> {
+                            res.send(req.absoluteUri().toString());
+                        })
                        .any(Handler.create(String.class, (req, res, entity) -> {
                             res.send("It works! Payload: " + entity);
                        }))
@@ -432,6 +437,19 @@ public void testBadContentType() throws Exception {
     }
 
 
+    @Test
+    void testAbsouteUri() throws Exception {
+        String result = WebClient.create()
+                .get()
+                .uri("http://localhost:" + webServer.port() + "/absoluteUri?a=b")
+                .request(String.class)
+                .await(5, TimeUnit.SECONDS);
+
+        assertThat(result, containsString("http://"));
+        assertThat(result, containsString(String.valueOf(webServer.port())));
+        assertThat(result, endsWith("/absoluteUri?a=b"));
+    }
+
     @Test
     public void testMulti() throws Exception {
         String s = SocketHttpClient.sendAndReceive("/multi",