improve ExpressionURISupplier

Signed-off-by: Dmitrii Tikhomirov <[email protected]>

Author: treblereel

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

@@ -15,8 +15,7 @@
  */
 package io.serverlessworkflow.impl.executors.http;
 
-import static io.serverlessworkflow.impl.executors.http.HttpExecutor.client;
-
+import io.serverlessworkflow.api.types.UriTemplate;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
@@ -32,6 +31,8 @@ public ExpressionURISupplier(WorkflowValueResolver<String> expr) {
 
   @Override
   public WebTarget apply(WorkflowContext workflow, TaskContext task, WorkflowModel node) {
-    return client.target(expr.apply(workflow, task, node));
+    return HttpExecutor.getURISupplier(
+            new UriTemplate().withLiteralUriTemplate(expr.apply(workflow, task, node)))
+        .apply(workflow, task, node);
   }
 }

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

@@ -47,7 +47,7 @@
 
 public class HttpExecutor implements CallableTask<CallHTTP> {
 
-  public static final Client client = ClientBuilder.newClient();
+  private static final Client client = ClientBuilder.newClient();
 
   private TargetSupplier targetSupplier;
   private Optional<WorkflowValueResolver<Map<String, Object>>> headersMap;