Add test for base path resolution

Author: MatKuhr

core/src/main/java/com/sap/ai/sdk/core/DestinationResolver.java

@@ -12,6 +12,7 @@
 import com.sap.cloud.sdk.cloudplatform.connectivity.HttpDestination;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ServiceBindingDestinationLoader;
 import com.sap.cloud.sdk.cloudplatform.connectivity.ServiceBindingDestinationOptions;
+import java.net.URI;
 import java.util.List;
 import javax.annotation.Nonnull;
 import lombok.AllArgsConstructor;
@@ -66,7 +67,14 @@ static HttpDestination fromCustomBaseDestination(@Nonnull final HttpDestination
     if (path == null || path.isEmpty() || path.equals("/")) {
       return setBasePath(enhancedBaseDestination);
     }
-    return enhancedBaseDestination;
+    if (path.endsWith("/")) {
+      return enhancedBaseDestination;
+    }
+    val urlWithTrailingSlash = URI.create(enhancedBaseDestination.getUri() + "/");
+
+    return DefaultHttpDestination.fromDestination(enhancedBaseDestination)
+        .uri(urlWithTrailingSlash)
+        .build();
   }
 
   @Nonnull

core/src/test/java/com/sap/ai/sdk/core/DestinationResolverTest.java

@@ -56,18 +56,25 @@ void testNoServiceBindingLoadingThrows() {
     assertThatThrownBy(resolver::getDestination).isSameAs(exception);
   }
 
+  private record DestinationTestCase(String givenBasePath, String expectedBasePath) {}
+
   @Test
   void testFromCustomBaseDestination() {
-    var destination = DefaultHttpDestination.builder("https://api.ai.sap").build();
-    assertThat(DestinationResolver.fromCustomBaseDestination(destination).getUri())
-        .hasToString("https://api.ai.sap/v2/");
-
-    destination = DefaultHttpDestination.builder("https://api.ai.sap/").build();
-    assertThat(DestinationResolver.fromCustomBaseDestination(destination).getUri())
-        .hasToString("https://api.ai.sap/v2/");
-
-    destination = DefaultHttpDestination.builder("https://api.ai.sap/foo").build();
-    assertThat(DestinationResolver.fromCustomBaseDestination(destination).getUri())
-        .hasToString("https://api.ai.sap/foo");
+    var testCases =
+        new DestinationTestCase[] {
+          new DestinationTestCase("", "/v2/"),
+          new DestinationTestCase("/", "/v2/"),
+          new DestinationTestCase("/foo", "/foo/"),
+          new DestinationTestCase("/foo/", "/foo/")
+        };
+    for (var testCase : testCases) {
+      var url = "https://api.ai.sap" + testCase.givenBasePath;
+      var destination = DefaultHttpDestination.builder(url).build();
+      assertThat(DestinationResolver.fromCustomBaseDestination(destination).getUri().getPath())
+          .describedAs(
+              "Expecting given base path %s to resolve to %s",
+              testCase.givenBasePath, testCase.expectedBasePath)
+          .hasToString(testCase.expectedBasePath);
+    }
   }
 }