Fix tests folder

Author: gcatanese

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

@@ -1,5 +1,8 @@
 package com.github.parser.source;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.TextNode;
 import com.github.model.OpenAPIWorkflow;
 import com.github.model.SourceDescription;
 import com.github.model.Step;
@@ -13,6 +16,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -36,7 +42,11 @@ public void bind(OpenAPIWorkflow openAPIWorkflow) {
 
         for(Workflow workflow : openAPIWorkflow.getWorkflows()) {
             for(Step step : workflow.getSteps()) {
-                step.setOperation(findOperationById(step.getOperationId(), operations));
+                if(step.getOperationId() != null) {
+                    step.setOperation(findOperationById(step.getOperationId(), operations));
+                } else if(step.getOperationRef() != null) {
+                    step.setOperation(findOperationByRef(step.getOperationRef(), operations));
+                }
             }
         }
     }
@@ -71,6 +81,46 @@ Operation findOperationById(String operationId, List<Operation> operations) {
         return operation;
     }
 
+    Operation findOperationByRef(String operationRef, List<Operation> operations) {
+        Operation operation = null;
+
+        // TODO
+
+//        for(Operation o : operations) {
+//
+//            if(operationRef != null && operationRef.equals(o.getOperationId())) {
+//                operation = o;
+//            }
+//        }
+
+        return operation;
+    }
+
+
+//
+//    String getJsonReference(String jsonReference) throws IOException {
+//        ObjectMapper objectMapper = new ObjectMapper();
+//
+//        JsonNode jsonNode;
+//
+//        if(isUrl(jsonReference)) {
+//            jsonNode = objectMapper.readTree(new URL(jsonReference));
+//        } else {
+//            jsonNode = objectMapper.readTree(new URL(jsonReference));
+//        }
+//
+//        // Navigate to the node containing the reference
+//        JsonNode referenceNode = jsonNode.at("/paths/users/~1findbystatus~1{status}/get");
+//
+//        // Get the JSON reference as a string
+//        String r = referenceNode.toString();
+//
+//
+//        // Unescape the JSON reference
+//        return jsonNode.isTextual() ? ((TextNode) jsonNode).asText() : jsonReference;
+//
+//    }
+
     String getRootFolder(String location) {
         if(isUrl(location)) {
             return location.substring(0, location.lastIndexOf("/") + 1);

…ub/parser/OpenAPIWorkflowParserTest.java …ub/parser/OpenAPIWorkflowParserTest.javasrc/test/com/github/parser/OpenAPIWorkflowParserTest.java renamed to src/test/java/com/github/parser/OpenAPIWorkflowParserTest.java src/test/com/github/parser/OpenAPIWorkflowParserTest.java renamed to src/test/java/com/github/parser/OpenAPIWorkflowParserTest.java

@@ -9,7 +9,7 @@ class OpenAPIWorkflowParserTest {
 
     @Test
     void parse() {
-        final String WORKFLOWS_SPEC_FILE = "src/test/resources/1.0.0/pet-coupons.workflow.yaml";
+        final String WORKFLOWS_SPEC_FILE = "src/test/java/resources/1.0.0/pet-coupons.workflow.yaml";
 
         OpenAPIWorkflowParserResult result = parser.parse(WORKFLOWS_SPEC_FILE);
         assertNotNull(result.getOpenAPIWorkflow());

…b/parser/source/OperationBinderTest.java …b/parser/source/OperationBinderTest.javasrc/test/com/github/parser/source/OperationBinderTest.java renamed to src/test/java/com/github/parser/source/OperationBinderTest.java src/test/com/github/parser/source/OperationBinderTest.java renamed to src/test/java/com/github/parser/source/OperationBinderTest.java

@@ -6,6 +6,7 @@
 import io.swagger.v3.oas.models.Operation;
 import org.junit.jupiter.api.Test;
 
+import java.net.MalformedURLException;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -16,7 +17,7 @@ class OperationBinderTest {
 
     @Test
     void getOperations() {
-        final String OPENAPI_FILE = "src/test/resources/1.0.0/pet-coupons.openapi.yaml";
+        final String OPENAPI_FILE = "src/test/java/resources/1.0.0/pet-coupons.openapi.yaml";
         List<Operation> operations = binder.getOperations(OPENAPI_FILE);
 
         assertNotNull(operations);
@@ -35,7 +36,7 @@ void getOperationsFromUrl() {
 
     @Test
     void bind() {
-        final String WORKFLOWS_SPEC_FILE = "src/test/resources/1.0.0/pet-coupons.workflow.yaml";
+        final String WORKFLOWS_SPEC_FILE = "src/test/java/resources/1.0.0/pet-coupons.workflow.yaml";
 
         OpenAPIWorkflowParserResult result = new OpenAPIWorkflowParser().parse(WORKFLOWS_SPEC_FILE);
 
@@ -78,4 +79,6 @@ void bindFromUrl() {
         assertNull(workflowApplyCoupon.getSteps().get(2).getOperationId());
         assertEquals("place-order", workflowApplyCoupon.getSteps().get(2).getWorkflowId());
     }
+
+
 }

…ub/parser/source/WorkflowBinderTest.java …ub/parser/source/WorkflowBinderTest.javasrc/test/com/github/parser/source/WorkflowBinderTest.java renamed to src/test/java/com/github/parser/source/WorkflowBinderTest.java src/test/com/github/parser/source/WorkflowBinderTest.java renamed to src/test/java/com/github/parser/source/WorkflowBinderTest.java

@@ -14,11 +14,9 @@ class WorkflowBinderTest {
 
     private WorkflowBinder binder = new WorkflowBinder();
 
-
-
     @Test
     void bind() {
-        final String WORKFLOWS_SPEC_FILE = "src/test/resources/1.0.0/pet-coupons.workflow.yaml";
+        final String WORKFLOWS_SPEC_FILE = "src/test/java/resources/1.0.0/pet-coupons.workflow.yaml";
 
         OpenAPIWorkflowParserResult result = new OpenAPIWorkflowParser().parse(WORKFLOWS_SPEC_FILE);
 

…com/github/parser/util/HttpUtilTest.java …com/github/parser/util/HttpUtilTest.javasrc/test/com/github/parser/util/HttpUtilTest.java renamed to src/test/java/com/github/parser/util/HttpUtilTest.java src/test/com/github/parser/util/HttpUtilTest.java renamed to src/test/java/com/github/parser/util/HttpUtilTest.java

@@ -10,7 +10,7 @@ class PathUtilTest {
 
     @Test
     void getFromFile() {
-        final String WORKFLOWS_SPEC_FILE = "src/test/resources/1.0.0/pet-coupons.workflow.yaml";
+        final String WORKFLOWS_SPEC_FILE = "src/test/java/resources/1.0.0/pet-coupons.workflow.yaml";
         assertFalse(pathUtil.getFromFile(WORKFLOWS_SPEC_FILE).isEmpty());
     }