refs #1275 - implemente flattenComposedSchema option, cleanup and fix

Author: frantuma

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java

@@ -207,7 +207,7 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
                         result.setOpenAPI(new OpenAPIResolver(result.getOpenAPI(), auth, null).resolve());
                         new ResolverFully(options.isResolveCombinators()).resolveFully(result.getOpenAPI());
                     } else if (options.isFlatten()) {
-                        InlineModelResolver inlineModelResolver = new InlineModelResolver();
+                        InlineModelResolver inlineModelResolver = new InlineModelResolver(options.isFlattenComposedSchemas());
                         inlineModelResolver.setSkipMatches(options.isSkipMatches());
                         inlineModelResolver.flatten(result.getOpenAPI());
                     }

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -74,7 +74,7 @@ public void testFlattenComposedSchema() {
         options.setResolve(true);
         options.setFlatten(true);
         options.setFlattenComposedSchemas(true);
-        SwaggerParseResult parseResult = openApiParser.readLocation("flattenComposedSchema.yaml", null, options);
+        SwaggerParseResult parseResult = openApiParser.readLocation("flattenComposedSchemaComplete.json", null, options);
 
         OpenAPI openAPI = parseResult.getOpenAPI();
         assertNotNull(openAPI.getComponents().getSchemas().get("val_Members_val_member"));
@@ -89,11 +89,11 @@ public void testNotFlattenComposedSchema() {
         options.setResolve(true);
         options.setFlatten(true);
 
-        SwaggerParseResult parseResult = openApiParser.readLocation("flattenComposedSchema.yaml", null, options);
+        SwaggerParseResult parseResult = openApiParser.readLocation("flattenComposedSchemaComplete.json", null, options);
 
         OpenAPI openAPI = parseResult.getOpenAPI();
         assertNull(openAPI.getComponents().getSchemas().get("val_Members_val_member"));
-        assertNull(openAPI.getComponents().getSchemas().get("val_MemberProducts_val_product"));
+        assertNotNull(openAPI.getComponents().getSchemas().get("val_MemberProducts_val_product"));
 
     }
 

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/util/InlineModelResolverTest.java

@@ -1347,6 +1347,5 @@ public void testInlineItemsSchema() throws Exception {
 
         assertNotNull(openAPI);
         assertNotNull(openAPI.getComponents().getSchemas().get("inline_response_200"));
-        Yaml.prettyPrint(openAPI);
     }
 }

modules/swagger-parser-v3/src/test/resources/flattenComposedSchema.yaml

@@ -0,0 +1,115 @@
+{
+  "openapi": "3.0.2",
+  "info": {
+    "title": "test",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/validation": {
+      "post": {
+        "tags": [
+          "mytag"
+        ],
+        "summary": "summary",
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/mtg_Message"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "desc",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/mtg_Message"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "mtg_Message": {
+        "type": "object"
+      },
+      "val_MemberProducts": {
+        "additionalProperties": false,
+        "description": "val_MemberProducts desc",
+        "properties": {
+          "val_product": {
+            "items": {
+              "type": "object",
+              "properties": {
+                "val_unique_reference1": {
+                  "type": "string"
+                }
+              }
+            },
+            "maxItems": 4,
+            "minItems": 1,
+            "type": "array"
+          }
+        },
+        "required": [
+          "val_product"
+        ],
+        "type": "object"
+      },
+      "val_Members": {
+        "additionalProperties": false,
+        "description": "valmembers desc",
+        "properties": {
+          "val_member": {
+            "description": "valmember desc",
+            "items": {
+              "type": "object",
+              "oneOf": [
+                {
+                  "$ref": "#/components/schemas/val_MemberChoice1"
+                },
+                {
+                  "$ref": "#/components/schemas/val_MemberChoice2"
+                }
+              ]
+            },
+            "minItems": 1,
+            "type": "array"
+          }
+        },
+        "required": [
+          "val_member"
+        ],
+        "type": "object"
+      },
+      "val_MemberChoice1": {
+        "additionalProperties": false,
+        "description": "val_MemberChoice1 desc",
+        "properties": {
+          "val_unique_reference1": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      },
+      "val_MemberChoice2": {
+        "additionalProperties": false,
+        "description": "val_MemberChoice2 desc",
+        "properties": {
+          "val_unique_reference2": {
+            "type": "string"
+          }
+        },
+        "type": "object"
+      }
+    }
+  }
+}