Bind operations with absolute and relative path

Author: gcatanese

src/main/java/com/apiflows/parser/source/OperationBinder.java

@@ -4,6 +4,7 @@
 import com.apiflows.model.SourceDescription;
 import com.apiflows.model.Step;
 import com.apiflows.model.Workflow;
+import com.apiflows.parser.util.HttpUtil;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
@@ -26,12 +27,18 @@ public class OperationBinder {
      * Binds workflow operations
      * @param openAPIWorkflow
      */
-    public void bind(OpenAPIWorkflow openAPIWorkflow) {
+    public void bind(OpenAPIWorkflow openAPIWorkflow, String location) {
         List<Operation> operations = new ArrayList<>();
 
         for(SourceDescription source : openAPIWorkflow.getSourceDescriptions()) {
-            String filename = getRootFolder(openAPIWorkflow.getLocation()) + "/" + source.getUrl();
-            operations.addAll(getOperations(filename));
+            if(new HttpUtil().isUrl(source.getUrl())) {
+                // absolute url
+                operations.addAll(getOperations(source.getUrl()));
+            } else {
+                // relative path
+                String filename = getRootFolder(location) + "/" + source.getUrl();
+                operations.addAll(getOperations(filename));
+            }
         }
 
         for(Workflow workflow : openAPIWorkflow.getWorkflows()) {
@@ -52,15 +59,27 @@ List<Operation> getOperations(String openapi) {
         ParseOptions options = new ParseOptions();
         options.setResolve(true);
 
-        SwaggerParseResult parseResult = openApiParser.readLocation(openapi, null, options);
+        SwaggerParseResult parseResult = null;
+
+        try {
+            parseResult = openApiParser.readLocation(openapi, null, options);
+        } catch (Exception e) {
+            LOGGER.error("Cannot find or parse source description: " + openapi, e);
+            throw new RuntimeException("Cannot find or parse source description: " + openapi);
+        }
+
+        if(parseResult == null || parseResult.getOpenAPI() == null) {
+            LOGGER.error("Cannot find or parse source description: " + openapi);
+            throw new RuntimeException("Cannot parse source description: " + openapi);
+        }
+
         OpenAPI openAPI = parseResult.getOpenAPI();
 
         for(PathItem pathItem : openAPI.getPaths().values()) {
             operations.addAll(pathItem.readOperations());
         }
 
         return operations;
-
     }
 
     Operation findOperationById(String operationId, List<Operation> operations) {
@@ -123,7 +142,7 @@ String getRootFolder(String location) {
         } else {
             Path filePath = Paths.get(location);
 
-            return filePath.getParent().toString();
+            return (filePath.getParent() != null ? filePath.getParent().toString() : null);
         }
     }
 

src/test/java/com/apiflows/parser/source/OperationBinderTest.java

@@ -39,7 +39,7 @@ void bind() {
 
         OpenAPIWorkflowParserResult result = new OpenAPIWorkflowParser().parse(WORKFLOWS_SPEC_FILE);
 
-        binder.bind(result.getOpenAPIWorkflow());
+        binder.bind(result.getOpenAPIWorkflow(), WORKFLOWS_SPEC_FILE);
 
         assertNotNull(result);
         Workflow workflowApplyCoupon = result.getOpenAPIWorkflow().getWorkflows().get(0);
@@ -62,7 +62,7 @@ void bindFromUrl() {
 
         OpenAPIWorkflowParserResult result = new OpenAPIWorkflowParser().parse(WORKFLOWS_SPEC_FILE);
 
-        binder.bind(result.getOpenAPIWorkflow());
+        binder.bind(result.getOpenAPIWorkflow(), WORKFLOWS_SPEC_FILE);
 
         assertNotNull(result);
         Workflow workflowApplyCoupon = result.getOpenAPIWorkflow().getWorkflows().get(0);