Merge pull request #1180 from swagger-api/issue1148

fix for setFlatten with Schema containing dot produces invalid ref

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/InlineModelResolver.java

@@ -14,6 +14,7 @@
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.core.util.Json;
+import io.swagger.v3.parser.models.RefType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -340,7 +341,7 @@ public void flattenProperties(Map<String, Schema> properties, String path) {
                 if (existing != null) {
                     propsToUpdate.put(key, new Schema().$ref(existing));
                 } else {
-                    propsToUpdate.put(key, new Schema().$ref(modelName));
+                    propsToUpdate.put(key, new Schema().$ref(RefType.SCHEMAS.getInternalPrefix()+modelName));
                     modelsToAdd.put(modelName, model);
                     addGenerated(modelName, model);
                     openAPI.getComponents().addSchemas(modelName, model);

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

@@ -202,8 +202,6 @@ public void testIssue304() {
     public void testAllOfFlatAndNested() {
         for (String path : Arrays.asList("./src/test/resources/allOf-properties-ext-ref/models/swagger.json",
                 "./src/test/resources/allOf-properties-ext-ref/swagger.json")) {
-            //ParseOptions options = new ParseOptions();
-            //options.setResolve(true);
             OpenAPI swagger = new OpenAPIV3Parser().read(path);
 
             assertEquals(3, swagger.getComponents().getSchemas().size());

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

@@ -66,6 +66,16 @@ public class OpenAPIV3ParserTest {
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
 
+    @Test
+    public void testIssue1148_Flatten_Dot() {
+        ParseOptions options = new ParseOptions();
+        options.setFlatten(true);
+        SwaggerParseResult parseResult = new OpenAPIV3Parser().readLocation("issue1148.yaml", null, options);
+        OpenAPI apispec = parseResult.getOpenAPI();
+        assertNotNull(apispec);
+        assertEquals(((Schema)apispec.getComponents().getSchemas().get("Some.User").getProperties().get("address")).get$ref(),"#/components/schemas/Some.User_address");
+    }
+
 
     @Test
     public void testIssue1169() {

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

@@ -0,0 +1,27 @@
+openapi: 3.0.0
+servers:
+  - url: 'http://petstore.swagger.io/v2'
+info:
+  version: 1.0.0
+  title: OpenAPI Petstore
+  license:
+    name: Apache-2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+paths:
+  /example:
+    get:
+      operationId: example
+      responses:
+        '200':
+          description: successful operation
+components:
+  schemas:
+    Some.User:
+      type: object
+      properties:
+        address:
+          type: object
+          nullable: true
+          properties:
+            city:
+              type: string