fixes #5 sync with KaiZen parser

Author: stevehu

pom.xml

@@ -66,11 +66,14 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.light-4j>1.5.19</version.light-4j>
+        <version.json-overlay>1.5.19</version.json-overlay>
         <version.jackson>2.9.5</version.jackson>
+        <version.javamail>1.6.1</version.javamail>
         <version.slf4j>1.7.25</version.slf4j>
         <version.logback>1.2.3</version.logback>
         <version.junit>4.12</version.junit>
         <version.jsonassert>1.5.0</version.jsonassert>
+        <version.guava>26.0-jre</version.guava>
     </properties>
 
 
@@ -90,6 +93,11 @@
             <artifactId>service</artifactId>
             <version>${version.light-4j}</version>
         </dependency>
+        <dependency>
+            <groupId>com.networknt</groupId>
+            <artifactId>json-overlay</artifactId>
+            <version>${version.json-overlay}</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -110,6 +118,11 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
             <version>${version.jackson}</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>${version.javamail}</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -133,6 +146,12 @@
             <version>${version.jsonassert}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${version.guava}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>

src/main/java/com/networknt/oas/OpenApi.java

@@ -10,7 +10,5 @@
  *******************************************************************************/
 package com.networknt.oas;
 
-import com.networknt.oas.model.OpenApiObject;
-
-public interface OpenApi<T extends OpenApi<?>> extends OpenApiObject<T, T> {
+public interface OpenApi<M> {
 }

src/main/java/com/networknt/oas/OpenApi3Parser.java

@@ -19,43 +19,60 @@
 
 public class OpenApi3Parser extends OpenApiParser {
 
-	private OpenApiParser parser = new OpenApiParser() {
-
-		@Override
-		protected boolean isVersion3(JsonNode tree) {
-			return true;
-		}
-	};
-
+	@Override
 	public OpenApi3 parse(String spec, URL resolutionBase) {
-		return (OpenApi3) parser.parse(spec, resolutionBase);
+		return (OpenApi3) super.parse(spec, resolutionBase);
 	}
 
+	@Override
 	public OpenApi3 parse(String spec, URL resolutionBase, boolean validate) {
-		return (OpenApi3) parser.parse(spec, resolutionBase, validate);
+		return (OpenApi3) super.parse(spec, resolutionBase, validate);
+	}
+
+	@Override
+	public OpenApi3 parse(File specFile) throws Exception {
+		return (OpenApi3) super.parse(specFile);
+	}
+
+	@Override
+	public OpenApi3 parse(File specFile, boolean validate) throws Exception {
+		return (OpenApi3) super.parse(specFile, validate);
+	}
+
+	@Override
+	public OpenApi3 parse(URI uri) throws Exception {
+		return (OpenApi3) super.parse(uri);
 	}
 
-	public OpenApi3 parse(File specFile) {
-		return (OpenApi3) parser.parse(specFile);
+	@Override
+	public OpenApi3 parse(URI uri, boolean validate) throws Exception {
+		return (OpenApi3) super.parse(uri, validate);
 	}
 
-	public OpenApi3 parse(File specFile, boolean validate) {
-		return (OpenApi3) parser.parse(specFile, validate);
+	@Override
+	public OpenApi3 parse(URL resolutionBase) throws Exception {
+		return (OpenApi3) super.parse(resolutionBase);
 	}
 
-	public OpenApi3 parse(URI uri) {
-		return (OpenApi3) parser.parse(uri);
+	@Override
+	public OpenApi3 parse(URL resolutionBase, boolean validate) throws Exception {
+		return (OpenApi3) super.parse(resolutionBase, validate);
 	}
 
-	public OpenApi3 parse(URI uri, boolean validate) {
-		return (OpenApi3) parser.parse(uri, validate);
+	@Override
+	public OpenApi3 parse(JsonNode tree, URL resolutionBase) {
+		return (OpenApi3) super.parse(tree, resolutionBase);
 	}
 
-	public OpenApi3 parse(URL resolutionBase) {
-		return (OpenApi3) parser.parse(resolutionBase);
+	@Override
+	public OpenApi3 parse(JsonNode tree, URL resolutionBase, boolean validate) {
+		return (OpenApi3) super.parse(tree, resolutionBase, validate);
 	}
 
-	public OpenApi3 parse(URL resolutionBase, boolean validate) {
-		return (OpenApi3) parser.parse(resolutionBase, validate);
+	@Override
+	protected boolean isVersion3(JsonNode tree) {
+		return true; // if 'openapi' property is missing or incorrect, that will
+		// show up as a
+		// validation error
 	}
 }

src/main/java/com/networknt/oas/OpenApiParser.java

@@ -11,10 +11,9 @@
 package com.networknt.oas;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.networknt.oas.jsonoverlay.JsonLoader;
-import com.networknt.oas.jsonoverlay.ReferenceRegistry;
-import com.networknt.oas.jsonoverlay.ResolutionBaseRegistry;
-import com.networknt.oas.jsonoverlay.Resolver;
+import com.networknt.jsonoverlay.JsonLoader;
+import com.networknt.jsonoverlay.ReferenceManager;
+import com.networknt.oas.model.OpenApi3;
 import com.networknt.oas.model.impl.OpenApi3Impl;
 
 import java.io.File;
@@ -25,107 +24,115 @@
 
 public class OpenApiParser {
 
-	public OpenApiParser() {
-	}
-
 	public OpenApi<?> parse(String spec, URL resolutionBase) {
 		return parse(spec, resolutionBase, true);
 	}
 
 	public OpenApi<?> parse(String spec, URL resolutionBase, boolean validate) {
 		try {
-			JsonLoader jsonLoader = new JsonLoader();
-			JsonNode tree = jsonLoader.loadString(resolutionBase, spec);
-			ResolutionBaseRegistry resolutionBaseRegistry = new ResolutionBaseRegistry(jsonLoader);
-			resolutionBaseRegistry.register(resolutionBase.toString(), tree);
-			return parse(resolutionBase, validate, resolutionBaseRegistry);
+			JsonLoader loader = new JsonLoader();
+			JsonNode tree = loader.loadString(resolutionBase, spec);
+			return parse(tree, resolutionBase, validate, loader);
+
 		} catch (IOException e) {
-			throw new SwaggerParserException("Failed to parse spec as JSON or YAML", e);
+			throw new OpenApiParserException("Failed to parse spec as JSON or YAML", e);
 		}
 	}
 
-	public OpenApi<?> parse(File specFile) {
+	public OpenApi<?> parse(File specFile) throws Exception {
 		return parse(specFile, true);
 	}
 
-	public OpenApi<?> parse(File specFile, boolean validate) {
+	public OpenApi<?> parse(File specFile, boolean validate) throws Exception {
 		try {
 			return parse(specFile.toURI().toURL(), validate);
 		} catch (IOException e) {
-			throw new SwaggerParserException("Failed to read spec from file", e);
+			throw new OpenApiParserException("Failed to read spec from file", e);
 		}
 	}
 
-	public OpenApi<?> parse(URI uri) {
+	public OpenApi<?> parse(URI uri) throws Exception {
 		return parse(uri, true);
 	}
 
-	public OpenApi<?> parse(URI uri, boolean validate) {
+	public OpenApi<?> parse(URI uri, boolean validate) throws Exception {
 		try {
 			return parse(uri.toURL(), validate);
 		} catch (MalformedURLException e) {
-			throw new SwaggerParserException("Invalid URI for Swagger spec", e);
+			throw new OpenApiParserException("Invalid URI for Swagger spec", e);
 		}
 	}
 
-	public OpenApi<?> parse(URL resolutionBase) {
+	public OpenApi<?> parse(URL resolutionBase) throws Exception {
 		return parse(resolutionBase, true);
 	}
 
-	public OpenApi<?> parse(URL resolutionBase, boolean validate) {
-		return parse(resolutionBase, validate, new ResolutionBaseRegistry(new JsonLoader()));
+	public OpenApi<?> parse(URL resolutionBase, boolean validate) throws Exception {
+		ReferenceManager manager = new ReferenceManager(resolutionBase);
+		return parse(manager, validate);
 	}
 
-	protected OpenApi<?> parse(URL resolutionBase, boolean validate, ResolutionBaseRegistry resolutionBaseRegistry) {
+	public OpenApi<?> parse(JsonNode tree, URL resolutionBase) {
+		return parse(tree, resolutionBase, true);
+	}
+
+	public OpenApi<?> parse(JsonNode tree, URL resolutionBase, boolean validate) {
+		return parse(tree, resolutionBase, validate, null);
+	}
+
+	public OpenApi<?> parse(JsonNode tree, URL resolutionBase, boolean validate, JsonLoader loader) {
+		ReferenceManager manager = new ReferenceManager(resolutionBase, tree, loader);
+		return parse(manager, validate);
+	}
+
+	private OpenApi<?> parse(ReferenceManager manager, boolean validate) {
+		JsonNode tree;
 		try {
-			ReferenceRegistry referenceRegistry = new ReferenceRegistry();
-			new Resolver(referenceRegistry, resolutionBaseRegistry).preresolve(resolutionBase);
-			JsonNode tree = resolutionBaseRegistry.get(resolutionBase.toString()).getJson();
+			tree = manager.loadDoc();
 			if (isVersion3(tree)) {
-				OpenApi3Impl model = new OpenApi3Impl(tree, null, referenceRegistry);
+				OpenApi3 model = (OpenApi3) OpenApi3Impl.factory.create(tree, null, manager);
+				((OpenApi3Impl) model)._setCreatingRef(manager.getDocReference());
 				if (validate) {
 					model.validate();
 				}
 				return model;
 			} else {
-				throw new SwaggerParserException(
-						"Could not determine OpenApi version - missing or invalid 'openapi' or 'swagger' property");
+				throw new OpenApiParserException(
+						"Could not determine OpenApi version from model: no 'openapi' property");
 			}
-		} catch (Exception e) {
-			// throw new SwaggerParserException("Failed to parse Swagger spec", e);
-			throw e;
+		} catch (IOException e) {
+			throw new OpenApiParserException("Failed to parse model", e);
 		}
-
 	}
 
 	protected boolean isVersion3(JsonNode tree) {
 		JsonNode versionNode = tree.path("openapi");
 		return versionNode.isTextual() && versionNode.asText().startsWith("3.");
 	}
 
-	public static class SwaggerParserException extends RuntimeException {
+	public static class OpenApiParserException extends RuntimeException {
 
 		private static final long serialVersionUID = 1L;
 
-		public SwaggerParserException() {
+		public OpenApiParserException() {
 			super();
 		}
 
-		public SwaggerParserException(String message, Throwable cause, boolean enableSuppression,
+		public OpenApiParserException(String message, Throwable cause, boolean enableSuppression,
 				boolean writableStackTrace) {
 			super(message, cause, enableSuppression, writableStackTrace);
 		}
 
-		public SwaggerParserException(String message, Throwable cause) {
+		public OpenApiParserException(String message, Throwable cause) {
 			super(message, cause);
 		}
 
-		public SwaggerParserException(String message) {
+		public OpenApiParserException(String message) {
 			super(message);
 		}
 
-		public SwaggerParserException(Throwable cause) {
+		public OpenApiParserException(Throwable cause) {
 			super(cause);
 		}
 	}
-}
+}