Create valid builder when URI has implicit port

2 files changed, 22 insertions, 7 deletions

diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
index 0a31151921d..084aa01ec40 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApiImpl.java
@@ -349,7 +349,10 @@ class RestApiImpl implements RestApi {
         @Override public ObjectMapper jacksonJsonMapper() { return jacksonJsonMapper; }
         @Override public UriBuilder uriBuilder() {
             URI uri = request.getUri();
-            return new UriBuilder(uri.getScheme() + "://" + uri.getHost() + ':' + uri.getPort());
+            int uriPort = uri.getPort();
+            return uriPort != -1
+                    ? new UriBuilder(uri.getScheme() + "://" + uri.getHost() + ':' + uriPort)
+                    : new UriBuilder(uri.getScheme() + "://" + uri.getHost());
         }
 
         private class PathParametersImpl implements RestApi.RequestContext.PathParameters {
diff --git a/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java b/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java
index 1de8184ce22..06fc6d80741 100644
--- a/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java
+++ b/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java
@@ -102,13 +102,25 @@ class RestApiImplTest {
         verifyJsonResponse(restApi, Method.POST, "/api", rawJson, 200, rawJson);
     }
 
+    @Test
+    public void uri_builder_creates_valid_uri_prefix() {
+        RestApi restApi = RestApi.builder()
+                .addRoute(route("/test").get(ctx -> new MessageResponse(ctx.uriBuilder().toString())))
+                .build();
+        verifyJsonResponse(restApi, Method.GET, "/test", null, 200, "{\"message\":\"http://localhost\"}");
+    }
+
     private static void verifyJsonResponse(RestApi restApi, Method method, String path, String requestContent, int expectedStatusCode, String expectedJson) {
-        HttpRequest testRequest = requestContent != null ?
-                HttpRequest.createTestRequest(
-                        path, method,
-                        new ByteArrayInputStream(requestContent.getBytes(StandardCharsets.UTF_8)),
-                        Map.of("Content-Type", "application/json")) :
-                HttpRequest.createTestRequest(path, method);
+        HttpRequest testRequest;
+        String uri = "http://localhost" + path;
+        if (requestContent != null) {
+            testRequest = HttpRequest.createTestRequest(
+                    uri, method,
+                    new ByteArrayInputStream(requestContent.getBytes(StandardCharsets.UTF_8)),
+                    Map.of("Content-Type", "application/json"));
+        } else {
+            testRequest = HttpRequest.createTestRequest(uri, method);
+        }
         HttpResponse response = restApi.handleRequest(testRequest);
         assertEquals(expectedStatusCode, response.getStatus());
         if (expectedJson != null) {