Merge pull request #1360 from swagger-api/issue-1359

apply flatten option for converted definitions

Author: HugoMario

modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java

@@ -88,7 +88,7 @@ public SwaggerParseResult readLocation(String url, List<AuthorizationValue> auth
 
         SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(url, convert(auths), resolve);
 
-        return convert(result);
+        return readResult(result, auths, options);
     }
 
     @Override
@@ -102,6 +102,11 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
                 result.setSwagger(resolved);
             }
         }
+        return readResult(result, auth, options);
+
+    }
+
+    private SwaggerParseResult readResult(SwaggerDeserializationResult result, List<AuthorizationValue> auth, ParseOptions options) {
         SwaggerParseResult out = convert(result);
         if (out != null && options != null && options.isFlatten()) {
             try {
@@ -118,7 +123,6 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
             } catch (Exception ignore) {}
         }
         return out;
-
     }
 
     public List<io.swagger.models.auth.AuthorizationValue> convert(List<AuthorizationValue> auths) {

modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

@@ -1,5 +1,6 @@
 package io.swagger.parser.test;
 
+import io.swagger.util.Yaml;
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -850,4 +851,23 @@ public void testissue1261() throws Exception {
         assertEquals(schema.getAllOf().get(0).get$ref(),"#/components/schemas/Foo");
 
     }
+
+    @Test()
+    public void testInlineDefinitionProperty() throws Exception {
+        SwaggerConverter converter = new SwaggerConverter();
+        ParseOptions parseOptions = new ParseOptions();
+        parseOptions.setResolve(true);
+        parseOptions.setFlatten(true);
+        SwaggerParseResult result = converter.readLocation("src/test/resources/issue-1359.yaml", null, parseOptions);
+        OpenAPI oas = result.getOpenAPI();
+        assertNotNull(oas);
+
+        Schema pet = oas.getComponents().getSchemas().get("Pet");
+        Schema property = (Schema) pet.getProperties().get("categoryInline");
+        assertEquals("#/components/schemas/Pet_categoryInline", property.get$ref());
+
+        Schema petCategoryInline = oas.getComponents().getSchemas().get("Pet_categoryInline");
+        assertNotNull(petCategoryInline);
+
+    }
 }

modules/swagger-parser-v2-converter/src/test/resources/issue-1359.yaml

@@ -0,0 +1,59 @@
+swagger: '2.0'
+info:
+  description: |
+    This is a sample Petstore server.  You can find
+    out more about Swagger at
+    [http://swagger.io](http://swagger.io) or on
+    [irc.freenode.net, #swagger](http://swagger.io/irc/).
+  version: 1.0.0
+  title: Swagger Petstore
+  termsOfService: http://swagger.io/terms/
+  contact:
+    email: [email protected]
+  license:
+    name: Apache 2.0
+    url: http://www.apache.org/licenses/LICENSE-2.0.html
+host: petstore.swagger.io
+paths: {}
+definitions:
+  Category:
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Category
+  Pet:
+    type: object
+    required:
+      - name
+      - photoUrls
+    properties:
+      id:
+        type: integer
+        format: int64
+      category:
+        $ref: '#/definitions/Category'
+      categoryInline:
+        type: object
+        properties:
+          id:
+            type: integer
+            format: int64
+          name:
+            type: string
+      name:
+        type: string
+        example: doggie
+      status:
+        type: string
+        description: pet status in the store
+        enum:
+          - available
+          - pending
+          - sold
+    xml:
+      name: Pet