Merge pull request #1494 from barryadk/v1_add_inline_model_resolver

feat: Add Inline Resolver to OpenAPI 2.0 parser

Author: frantuma

modules/swagger-parser/src/main/java/io/swagger/parser/SwaggerParser.java

@@ -5,6 +5,8 @@
 import io.swagger.models.Swagger;
 import io.swagger.models.auth.AuthorizationValue;
 import io.swagger.parser.util.DeserializationUtils;
+import io.swagger.parser.util.InlineModelResolver;
+import io.swagger.parser.util.ParseOptions;
 import io.swagger.parser.util.SwaggerDeserializationResult;
 import io.swagger.util.Json;
 
@@ -59,6 +61,12 @@ public Swagger read(String location) {
     }
 
     public Swagger read(String location, List<AuthorizationValue> auths, boolean resolve) {
+        ParseOptions options = new ParseOptions();
+        options.setResolve(resolve);
+        return read(location, auths, options);
+    }
+
+    public Swagger read(String location, List<AuthorizationValue> auths, ParseOptions options) {
         if (location == null) {
             return null;
         }
@@ -68,11 +76,16 @@ public Swagger read(String location, List<AuthorizationValue> auths, boolean res
         try {
             output = new Swagger20Parser().read(location, auths);
             if (output != null) {
-            	if(resolve){
-            		return new SwaggerResolver(output, auths, location).resolve();
-            	} else {
-            		return output;
-            	}
+                if (options != null) {
+                    if (options.isResolve()) {
+                        output = new SwaggerResolver(output, auths, location).resolve();
+                    }
+                    if (options.isFlatten()) {
+                        InlineModelResolver inlineModelResolver = new InlineModelResolver();
+                        inlineModelResolver.flatten(output);
+                    }
+                }
+                return output;
             }
         } catch (IOException e) {
         }
@@ -146,14 +159,20 @@ public Swagger parse(String swaggerAsString, List<AuthorizationValue> auths) {
     }
 
     public Swagger read(JsonNode node) {
-        return read(node, new ArrayList<AuthorizationValue>(), false);
+        return read(node, false);
     }
 
     public Swagger read(JsonNode node, boolean resolve) {
-        return read(node, new ArrayList<AuthorizationValue>(), resolve);
+        return read(node, new ArrayList<>(), resolve);
     }
 
     public Swagger read(JsonNode node, List<AuthorizationValue> authorizationValues, boolean resolve) {
+        ParseOptions options = new ParseOptions();
+        options.setResolve(resolve);
+        return read(node, authorizationValues, options);
+    }
+
+    public Swagger read(JsonNode node, List<AuthorizationValue> authorizationValues, ParseOptions options) {
         if (node == null) {
             return null;
         }
@@ -164,11 +183,16 @@ public Swagger read(JsonNode node, List<AuthorizationValue> authorizationValues,
         try {
             output = new Swagger20Parser().read(node);
             if (output != null) {
-                if (resolve) {
-                    return new SwaggerResolver(output, authorizationValues).resolve();
-                } else {
-                    return output;
+                if (options != null) {
+                    if (options.isResolve()) {
+                        output = new SwaggerResolver(output, authorizationValues).resolve();
+                    }
+                    if (options.isFlatten()) {
+                        InlineModelResolver inlineModelResolver = new InlineModelResolver();
+                        inlineModelResolver.flatten(output);
+                    }
                 }
+                return output;
             }
         } catch (IOException e) {
         }