Moving buildTargetUrl to WorkflowUtils

Signed-off-by: Ricardo Zanini <[email protected]>

Author: ricardozanini

impl/core/pom.xml

@@ -28,5 +28,10 @@
             <groupId>com.cronutils</groupId>
             <artifactId>cron-utils</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java

@@ -221,11 +221,42 @@ public static final String checkSecret(
         .orElseThrow(() -> new IllegalStateException("Secret " + secretName + " does not exist"));
   }
 
-  public static URI concatURI(URI uri, String pathToAppend) {
-    return uri.getPath().endsWith("/")
-        ? uri.resolve(pathToAppend)
-        : URI.create(
-            uri.toString() + (pathToAppend.startsWith("/") ? pathToAppend : "/" + pathToAppend));
+  public static URI concatURI(URI base, String pathToAppend) {
+    if (pathToAppend == null || pathToAppend.isEmpty()) {
+      return base;
+    }
+
+    final URI child = URI.create(pathToAppend);
+    if (child.isAbsolute()) {
+      return child;
+    }
+
+    String basePath = base.getPath();
+    if (basePath == null || basePath.isEmpty()) {
+      basePath = "/";
+    } else if (!basePath.endsWith("/")) {
+      basePath = basePath + "/";
+    }
+
+    String relPath = child.getPath();
+    if (relPath == null) {
+      relPath = "";
+    }
+    while (relPath.startsWith("/")) {
+      relPath = relPath.substring(1);
+    }
+
+    String finalPath = basePath + relPath;
+
+    String query = child.getQuery();
+    String fragment = child.getFragment();
+
+    try {
+      return new URI(base.getScheme(), base.getAuthority(), finalPath, query, fragment);
+    } catch (Exception e) {
+      throw new IllegalArgumentException(
+          "Failed to build combined URI from base=" + base + " and path=" + pathToAppend, e);
+    }
   }
 
   public static WorkflowValueResolver<URI> getURISupplier(

impl/http/src/test/java/io/serverlessworkflow/impl/executors/http/HttpExecutorTargetSupplierTest.java renamed to impl/core/src/test/java/io/serverlessworkflow/impl/WorkflowUtilsTest.java

@@ -13,21 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.executors.http;
+package io.serverlessworkflow.impl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.net.URI;
 import org.junit.jupiter.api.Test;
 
-class HttpExecutorTargetSupplierTest {
-
+public class WorkflowUtilsTest {
   @Test
   void openApiServerWithTrailingSlashAndRootPath() {
     URI base = URI.create("https://petstore3.swagger.io/api/v3/");
     URI path = URI.create("/pet/findByStatus");
 
-    URI result = HttpExecutor.buildTargetUri(base, path);
+    URI result = WorkflowUtils.concatURI(base, path.toString());
 
     assertEquals("https://petstore3.swagger.io/api/v3/pet/findByStatus", result.toString());
   }
@@ -37,7 +36,7 @@ void openApiServerWithoutTrailingSlashAndRootPath() {
     URI base = URI.create("https://petstore3.swagger.io/api/v3");
     URI path = URI.create("/pet/findByStatus");
 
-    URI result = HttpExecutor.buildTargetUri(base, path);
+    URI result = WorkflowUtils.concatURI(base, path.toString());
 
     assertEquals("https://petstore3.swagger.io/api/v3/pet/findByStatus", result.toString());
   }
@@ -47,7 +46,7 @@ void baseWithSlashAndRelativePath() {
     URI base = URI.create("https://example.com/api/v1/");
     URI path = URI.create("pets");
 
-    URI result = HttpExecutor.buildTargetUri(base, path);
+    URI result = WorkflowUtils.concatURI(base, path.toString());
 
     assertEquals("https://example.com/api/v1/pets", result.toString());
   }
@@ -57,7 +56,7 @@ void baseWithoutPathAndRootPath() {
     URI base = URI.create("https://example.com");
     URI path = URI.create("/pets");
 
-    URI result = HttpExecutor.buildTargetUri(base, path);
+    URI result = WorkflowUtils.concatURI(base, path.toString());
 
     assertEquals("https://example.com/pets", result.toString());
   }
@@ -67,7 +66,7 @@ void absolutePathOverridesBase() {
     URI base = URI.create("https://example.com/api");
     URI path = URI.create("https://other.example.com/foo");
 
-    URI result = HttpExecutor.buildTargetUri(base, path);
+    URI result = WorkflowUtils.concatURI(base, path.toString());
 
     assertEquals("https://other.example.com/foo", result.toString());
   }
@@ -77,7 +76,7 @@ void queryAndFragmentAreTakenFromPath() {
     URI base = URI.create("https://example.com/api/v1");
     URI path = URI.create("/pets?status=available#top");
 
-    URI result = HttpExecutor.buildTargetUri(base, path);
+    URI result = WorkflowUtils.concatURI(base, path.toString());
 
     assertEquals("https://example.com/api/v1/pets?status=available#top", result.toString());
   }

impl/http/pom.xml

@@ -13,10 +13,5 @@
             <groupId>io.serverlessworkflow</groupId>
             <artifactId>serverlessworkflow-impl-template-resolver</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/HttpExecutor.java

@@ -254,41 +254,10 @@ private static WorkflowValueResolver<WebTarget> getTargetSupplier(
 
   private static WorkflowValueResolver<WebTarget> getTargetSupplier(
       WorkflowValueResolver<URI> uriSupplier, WorkflowValueResolver<URI> pathSupplier) {
-    return (w, t, n) -> {
-      URI base = uriSupplier.apply(w, t, n);
-      URI path = pathSupplier.apply(w, t, n);
-      URI combined = buildTargetUri(base, path);
-      return HttpClientResolver.client(w, t).target(combined);
-    };
-  }
-
-  static URI buildTargetUri(URI base, URI path) {
-    if (path.isAbsolute()) {
-      return path;
-    }
-
-    String basePath = base.getPath();
-    if (basePath == null || basePath.isEmpty()) {
-      basePath = "/";
-    } else if (!basePath.endsWith("/")) {
-      basePath = basePath + "/";
-    }
-
-    String relPath = path.getPath() == null ? "" : path.getPath();
-    while (relPath.startsWith("/")) {
-      relPath = relPath.substring(1);
-    }
-
-    try {
-      return new URI(
-          base.getScheme(),
-          base.getAuthority(),
-          basePath + relPath,
-          path.getQuery(),
-          path.getFragment());
-    } catch (Exception e) {
-      throw new IllegalArgumentException(
-          "Failed to build combined URI from base=" + base + " and path=" + path, e);
-    }
+    return (w, t, n) ->
+        HttpClientResolver.client(w, t)
+            .target(
+                WorkflowUtils.concatURI(
+                    uriSupplier.apply(w, t, n), pathSupplier.apply(w, t, n).toString()));
   }
 }