Merge pull request #56 from API-Flows/arazzo-refactor-components

Arazzo refactor components

Author: gcatanese

src/main/java/com/apiflows/model/Step.java

@@ -12,7 +12,7 @@ public class Step {
 
     private String stepId;
     private String operationId;
-    private String operationRef;
+    private String operationPath;
     private Operation operation;
     private String workflowId;
     private Workflow workflow;
@@ -42,12 +42,12 @@ public void setOperationId(String operationId) {
         this.operationId = operationId;
     }
 
-    public String getOperationRef() {
-        return operationRef;
+    public String getOperationPath() {
+        return operationPath;
     }
 
-    public void setOperationRef(String operationRef) {
-        this.operationRef = operationRef;
+    public void setOperationPath(String operationPath) {
+        this.operationPath = operationPath;
     }
 
     public Operation getOperation() {
@@ -147,8 +147,8 @@ public Step operationId(String operationId) {
         return this;
     }
 
-    public Step operationRef(String operationRef) {
-        this.setOperationRef(operationRef);
+    public Step operationPath(String operationPath) {
+        this.setOperationPath(operationPath);
         return this;
     }
 

src/main/java/com/apiflows/parser/OpenAPIWorkflowValidator.java

@@ -161,13 +161,13 @@ List<String> validateStep(Step step, String workflowId ) {
 
         int numAssignedValues = (step.getOperationId() != null ? 1 : 0) +
                 (step.getWorkflowId() != null ? 1 : 0) +
-                (step.getOperationRef() != null ? 1 : 0);
+                (step.getOperationPath() != null ? 1 : 0);
 
         if (numAssignedValues != 1) {
             if(stepId != null) {
-                errors.add("'Step " + stepId + " should provide only one of the following: [operationId, operationRef, workflowId]");
+                errors.add("'Step " + stepId + " should provide only one of the following: [operationId, operationPath, workflowId]");
             } else {
-                errors.add("'Workflow[" + workflowId + "]' should provide only one of the following: [operationId, operationRef, workflowId]");
+                errors.add("'Workflow[" + workflowId + "]' should provide only one of the following: [operationId, operationPath, workflowId]");
             }
         }
 
@@ -370,7 +370,7 @@ List<String> validateFailureAction(String workflowId, String stepId, FailureActi
     }
 
     List<String> validateCriterion(Criterion criterion, String stepId) {
-        List<String> SUPPORTED_VALUES = Arrays.asList("simple", "regex", "JSONPath");
+        List<String> SUPPORTED_VALUES = Arrays.asList("simple", "regex", "jsonpath", "xpath");
 
         List<String> errors = new ArrayList<>();
 

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

@@ -31,22 +31,24 @@ public void bind(OpenAPIWorkflow openAPIWorkflow, String location) {
         List<Operation> operations = new ArrayList<>();
 
         for(SourceDescription source : openAPIWorkflow.getSourceDescriptions()) {
-            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));
+            if(source.isOpenApi()) {
+                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()) {
             for(Step step : workflow.getSteps()) {
                 if(step.getOperationId() != null) {
                     step.setOperation(findOperationById(step.getOperationId(), operations));
-                } else if(step.getOperationRef() != null) {
-                    step.setOperation(findOperationByRef(step.getOperationRef(), operations));
+                } else if(step.getOperationPath() != null) {
+                    step.setOperation(findOperationByRef(step.getOperationPath(), operations));
                 }
             }
         }

src/test/java/com/apiflows/parser/OpenAPIWorkflowValidatorTest.java

@@ -106,7 +106,7 @@ void validateStepMissingEntity() {
                 .description("First step in the workflow")
                 .operationId(null)
                 .workflowId(null)
-                .operationRef(null);
+                .operationPath(null);
         String worklowId = "q1";
 
         assertEquals(1, validator.validateStep(step, worklowId).size());