Method to get JsonNode with internal $ref pointers deferenced

GettingStarted.md

@@ -127,3 +127,9 @@ public class Test {
 
 }
 ```
+## Get JsonNode of a complete deferenced JsonNode
+```
+OpenApi3 model = (OpenApi3) new OpenApiParser().parse(url);
+model.validate();
+JsonNode mySchema = ((SchemaImpl)model.getPath("/pets").getPost().getResponse("200").getContentMediaType("application/json").getSchema()).getDereferencedJsonTree();
+```

kaizen-openapi-parser/src/main/java/com/reprezen/kaizen/oasparser/jsonoverlay/JsonOverlay.java

@@ -10,15 +10,19 @@
  *******************************************************************************/
 package com.reprezen.kaizen.oasparser.jsonoverlay;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.MissingNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.base.Optional;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.ObjectOverlay;
 
 public abstract class JsonOverlay<V> {
 
@@ -77,12 +81,56 @@ public V get() {
     public void set(V value) {
         this.value = value;
     }
+
+    private JsonNode internalDeferenceRecursive(JsonNode node) {
+    	if (node != null) {
+    		if (node.isObject() && node.has("$ref")) {
+        		//Parse reference
+    			Iterator<ResolutionBase> i = ResolutionBase.getAllBases().iterator();
+    			while(i.hasNext()) {
+    				JsonNode candidate = Reference.get(node.get("$ref").asText(), i.next(), true).getJson();
+    				if (candidate != null && !candidate.isMissingNode()) {
+    					return this.internalDeferenceRecursive(candidate);
+    				}
+    			}
+        	} else if (node.isContainerNode()) {
+        		if (node.isArray()) {
+        			ArrayNode arrayNode = (ArrayNode)node;
+        			for (int i = 0; i < arrayNode.size(); i++) {
+        				JsonNode expectedChangedNode = this.internalDeferenceRecursive(arrayNode.get(i));
+        				if (arrayNode.get(i) != expectedChangedNode /* Simple check of instance */) {
+        					arrayNode.set(i, expectedChangedNode);
+        				}
+        			}
+        		} else if (node.isObject()) {
+        			ObjectNode objectNode = (ObjectNode)node;
+        			Iterator<String> fieldNameIterator = objectNode.fieldNames();
+        			while (fieldNameIterator.hasNext()) {
+        				String fieldName = fieldNameIterator.next();
+        				JsonNode expectedChangedNode = this.internalDeferenceRecursive(objectNode.get(fieldName));
+        				if (objectNode.get(fieldName) != expectedChangedNode /* Simple check of instance */) {
+        					objectNode.set(fieldName, expectedChangedNode);
+        				}
+        			}
+        		}
+        	}
+    	}
+    	return node;
+    }
+
+    public JsonNode getDereferencedJsonTree() {
+    	if (ref != null) {
+            return internalDeferenceRecursive(resolvedJson);
+        } else {
+        	return internalDeferenceRecursive(json);
+        }
+    }
 
     public JsonNode getJson() {
         if (ref != null) {
             return resolvedJson;
         } else {
-            return json;
+        	return json;
         }
     }
 

kaizen-openapi-parser/src/main/java/com/reprezen/kaizen/oasparser/val/NumericUtils.java

@@ -131,14 +131,16 @@ enum NumericType {
         LONG(Long.class), //
         SHORT(Short.class);
 
-        private static Map<Class<? extends Number>, NumericType> types = Maps.newHashMap();
+        private static Map<Class<? extends Number>, NumericType> types;
 
         private NumericType(Class<? extends Number> cls) {
             register(cls, this);
         }
 
         private void register(Class<? extends Number> cls, NumericType type) {
-            types.put(cls, type);
+        	if (NumericType.types == null)
+        		NumericType.types = Maps.newHashMap();
+        	types.put(cls, type);
         }
 
         public static NumericType of(Object value) {

kaizen-openapi-parser/src/test/java/com/reprezen/swaggerparser/test/DerefTest.java

@@ -0,0 +1,75 @@
+/*******************************************************************************
+ *  Copyright (c) 2017 ModelSolv, Inc. and others.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *     ModelSolv, Inc. - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+package com.reprezen.swaggerparser.test;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Deque;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+import org.yaml.snakeyaml.Yaml;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
+import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Queues;
+import com.reprezen.kaizen.oasparser.OpenApiParser;
+import com.reprezen.kaizen.oasparser.jsonoverlay.JsonOverlay;
+import com.reprezen.kaizen.oasparser.jsonoverlay.Reference;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.CollectionOverlay;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.CollectionStore;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.ListOverlay;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.MapOverlay;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.ObjectOverlay;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.ValListOverlay;
+import com.reprezen.kaizen.oasparser.jsonoverlay.coll.ValMapOverlay;
+import com.reprezen.kaizen.oasparser.model3.OpenApi3;
+import com.reprezen.kaizen.oasparser.ovl3.OpenApi3Impl;
+import com.reprezen.kaizen.oasparser.ovl3.RequestBodyImpl;
+import com.reprezen.kaizen.oasparser.ovl3.ResponseImpl;
+import com.reprezen.swaggerparser.test.JsonTreeWalker.PathKey;
+import com.reprezen.swaggerparser.test.JsonTreeWalker.WalkMethod;
+
+import com.reprezen.kaizen.oasparser.ovl3.SchemaImpl;
+
+/**
+ * Basic test based on BigParseTest to test pointer deferencing
+ * 
+ * @author Francesco Guardiani @slinkydeveloper
+ *
+ */
+
+public class DerefTest extends Assert {
+
+    @Test
+    public void test() throws JsonProcessingException, IOException {
+    	URL modelUrl = DerefTest.class.getResource("/models/petstore-expanded.yaml");
+        Object parsedYaml = new Yaml().load(modelUrl.openStream());
+        JsonNode tree = new YAMLMapper().convertValue(parsedYaml, JsonNode.class);
+        final OpenApi3 model = (OpenApi3) new OpenApiParser().parse(modelUrl);
+        model.validate();
+        JsonNode aReallyImportantNode = ((SchemaImpl)model.getPath("/pets").getPost().getResponse("200").getContentMediaType("application/json").getSchema()).getDereferencedJsonTree();
+        JsonNode anotherReallyImportantNode = ((ResponseImpl)model.getPath("/pets").getPost().getResponse("200")).getDereferencedJsonTree();
+        System.out.println(aReallyImportantNode);
+        System.out.println(anotherReallyImportantNode);
+    }
+}

kaizen-openapi-parser/src/test/resources/models/newPet.yaml

@@ -0,0 +1,8 @@
+NewPet:
+  required:
+    - name
+  properties:
+    name:
+      type: string
+    tag:
+      type: string    

kaizen-openapi-parser/src/test/resources/models/parseTest.yaml

@@ -158,6 +158,13 @@ paths:
         - sec3: []
       servers: *id001
       x-foo: foo
+    post:
+      operationId: updatePetWithForm
+      requestBody:
+        $ref: '#/components/requestBodies/reqBody1'
+      responses:
+        '200':
+          description: Pet updated.
     x-foo: foo
     parameters: *id002
   x-foo: foo
@@ -231,8 +238,16 @@ components:
       x-foo: foo
     schema2:
       title: title
-      additionalProperties:
-        type: integer
+      properties:
+        a:
+          $ref: '#/components/schemas/schema3'
+    schema3:
+      title: schema3
+      properties:
+        a:
+          type: array
+          items:
+            type: number
   responses: 
     resp1:
       description: description
@@ -251,6 +266,10 @@ components:
   requestBodies: 
     reqBody1:
       description: description
+      content:
+          'application/json':
+            schema:
+              $ref: '#/components/schemas/schema2'
     reqBody2:
       description: description
   headers:
@@ -333,4 +352,4 @@ externalDocs:
   description: description
   url: url
   x-foo: foo
-x-foo: foo
+x-foo: foo