refactor(openapi): adjust code

Signed-off-by: Matheus Cruz <[email protected]>

Author: mcruzdev

impl/openapi/src/main/java/io/serverlessworkflow/impl/executors/OpenAPIExecutor.java

@@ -78,7 +78,7 @@ public void init(
                       .path(ctx.buildPath(withParams.getAdditionalProperties())));
 
           MultivaluedMap<String, Object> queryParams =
-              ctx.buildQuery(withParams.getAdditionalProperties());
+              ctx.buildQueryParams(withParams.getAdditionalProperties());
           queryParams.forEach(
               (key, value) -> {
                 for (Object o : value) {

impl/openapi/src/main/java/io/serverlessworkflow/impl/executors/OpenAPIOperationContext.java

@@ -36,14 +36,14 @@ public String buildPath(Map<String, Object> replacements) {
         String name = parameter.getName();
         Object value = replacements.get(name);
         if (value != null) {
-          finalPath = path.replace("{" + name + "}", value.toString());
+          finalPath = path.replaceAll("\\{\\s*" + name + "\\s*}", value.toString());
         }
       }
     }
     return finalPath;
   }
 
-  public MultivaluedMap<String, Object> buildQuery(Map<String, Object> replacements) {
+  public MultivaluedMap<String, Object> buildQueryParams(Map<String, Object> replacements) {
     MultivaluedMap<String, Object> queryParams = new MultivaluedHashMap<>();
     for (Parameter parameter : operation.getParameters()) {
       if ("query".equals(parameter.getIn())) {

impl/test/src/test/java/io/serverlessworkflow/impl/test/OpenAPIWorkflowDefinitionTest.java

@@ -20,6 +20,7 @@
 import io.serverlessworkflow.impl.WorkflowModel;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -45,5 +46,11 @@ void testOpenAPIWorkflowExecution() throws IOException {
             .join();
 
     Assertions.assertThat(model.asCollection()).isNotEmpty();
+    Assertions.assertThat(model.asCollection())
+        .allMatch(
+            m -> {
+              Map<String, Object> pet = m.asMap().orElseThrow(RuntimeException::new);
+              return pet.get("status").equals("available");
+            });
   }
 }