Avoid building request unless needed

1 files changed, 6 insertions, 1 deletions

diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/EndpointAuthenticator.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/EndpointAuthenticator.java
index 8985375fce2..efc80ab0d33 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/EndpointAuthenticator.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/EndpointAuthenticator.java
@@ -29,8 +29,12 @@ public interface EndpointAuthenticator {
 
     /** Adds necessary authentication data to the given HTTP request builder, to pass the data plane of a Vespa endpoint. */
     default HttpRequest.Builder authenticated(HttpRequest.Builder request) {
+        Map<String, String> authorizationHeaders = authorizationHeaders();
+        if (authorizationHeaders.isEmpty())
+            return request;
+
         Map<String, List<String>> headers = request.build().headers().map();
-        authorizationHeaders().forEach((name, value) -> {
+        authorizationHeaders.forEach((name, value) -> {
             if ( ! headers.containsKey(name))
                 request.setHeader(name, value);
         });
@@ -40,4 +44,5 @@ public interface EndpointAuthenticator {
     default Map<String, String> authorizationHeaders() {
         return Map.of();
     }
+
 }