Refactor OpenAPIReader

Author: mcruzdev

Diff for: impl/openapi/src/main/java/io/serverlessworkflow/impl/executors/OpenAPIExecutor.java

@@ -49,7 +49,7 @@ private interface TargetSupplier {
     @Override
     public void init(CallOpenAPI task, WorkflowDefinition definition) {
         OpenAPIArguments args = task.getWith();
-        this.targetSupplier = getTargetSupplier(args.getDocument().getEndpoint(), definition.expressionFactory(), args.getOperationId());
+        this.targetSupplier = getTargetSupplier(args, definition.expressionFactory());
     }
 
     @Override
@@ -84,8 +84,6 @@ private static TargetSupplier getURISupplier(UriTemplate template, String operat
                 throw new IllegalArgumentException("Invalid OpenAPI specification. There is no operation ID " + operationId);
             }
 
-
-
             return (w, t, n) -> client.target(host);
         } else if (template.getLiteralUriTemplate() != null) {
             return (w, t, n) ->
@@ -112,7 +110,11 @@ public WebTarget apply(WorkflowContext workflow, TaskContext<?> task, JsonNode n
     }
 
     private static TargetSupplier getTargetSupplier(
-            Endpoint endpoint, ExpressionFactory expressionFactory, String operationId) {
+            OpenAPIArguments args, ExpressionFactory expressionFactory) {
+
+        Endpoint endpoint = args.getDocument().getEndpoint();
+        String operationId = args.getOperationId();
+
         if (endpoint.getEndpointConfiguration() != null) {
             EndpointUri uri = endpoint.getEndpointConfiguration().getUri();
             if (uri.getLiteralEndpointURI() != null) {

Diff for: impl/openapi/src/main/java/io/serverlessworkflow/impl/executors/OpenAPIReader.java

@@ -4,9 +4,16 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
 import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 public class OpenAPIReader {
 
+    private static final String HTTPS = "https";
+    private static final String HTTP = "http";
+    private static final String DEFAULT_SCHEME = HTTPS;
+    private static final Set<String> ALLOWED_SCHEMES = Set.of(HTTPS, HTTP);
+
     public static String getHost(JsonNode jsonNode) {
         JsonNode host = jsonNode.get("host");
         if (host == null) {
@@ -19,23 +26,21 @@ public static String getHost(JsonNode jsonNode) {
     private static String getScheme(JsonNode jsonNode) {
         ArrayNode array = jsonNode.withArrayProperty("schemes");
         if (array != null && !array.isEmpty()) {
-            // TODO: should get the first scheme?
-            return array.get(0).asText();
+            String firstScheme = array.get(0).asText();
+            return ALLOWED_SCHEMES.contains(firstScheme) ? firstScheme : DEFAULT_SCHEME;
         }
-        // TODO: should the http be the default scheme?
-        return "http";
+        return DEFAULT_SCHEME;
     }
 
-    public static JsonNode readOperation(JsonNode jsonNode, String operationId) {
+    public static Optional<JsonNode> readOperation(JsonNode jsonNode, String operationId) {
         JsonNode paths = jsonNode.get("paths");
         for (Map.Entry<String, JsonNode> entry : paths.properties()) {
             for (Map.Entry<String, JsonNode> httpMethod : entry.getValue().properties()) {
                 if (httpMethod.getValue().get("operationId").asText().equals(operationId)) {
-                    return httpMethod.getValue();
+                    return Optional.ofNullable(httpMethod.getValue());
                 }
             }
         }
-
-        return null;
+        return Optional.empty();
     }
 }