Add trailing slash to uri to ensure that URI.resolve behave as expected

1 files changed, 9 insertions, 2 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
index 529afb6747d..e523df053d3 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
@@ -48,14 +48,14 @@ public class DefaultZtsClient implements ZtsClient {
     private volatile CloseableHttpClient client;
 
     public DefaultZtsClient(URI ztsUrl, SSLContext sslContext) {
-        this.ztsUrl = ztsUrl;
+        this.ztsUrl = addTrailingSlash(ztsUrl);
         this.client = createHttpClient(sslContext);
         this.identityProvider = null;
         this.identityListener = null;
     }
 
     public DefaultZtsClient(URI ztsUrl, ServiceIdentityProvider identityProvider) {
-        this.ztsUrl = ztsUrl;
+        this.ztsUrl = addTrailingSlash(ztsUrl);
         this.client = createHttpClient(identityProvider.getIdentitySslContext());
         this.identityProvider = identityProvider;
         this.identityListener = new ServiceIdentityProviderListener();
@@ -125,6 +125,13 @@ public class DefaultZtsClient implements ZtsClient {
         }
     }
 
+    private static URI addTrailingSlash(URI ztsUrl) {
+        if (ztsUrl.getPath().endsWith("/"))
+            return ztsUrl;
+        else
+            return URI.create(ztsUrl.toString() + '/');
+    }
+
     private static StringEntity toJsonStringEntity(Object entity) {
         try {
             return new StringEntity(objectMapper.writeValueAsString(entity), ContentType.APPLICATION_JSON);