Merge pull request #1182 from swagger-api/issue-1147

fix for issue Reference not correctly rewritten with setResolve #1147

Author: gracekarina

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

@@ -49,6 +49,7 @@ public OpenAPI resolve() {
         pathProcessor.processPaths();
         componentsProcessor.processComponents();
 
+
         if(openApi.getPaths() != null) {
             for(String pathname : openApi.getPaths().keySet()) {
                 PathItem pathItem = openApi.getPaths().get(pathname);

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/ComponentsProcessor.java

@@ -55,7 +55,7 @@ public void processComponents() {
             return;
         }
 
-        final Map<String, Schema> schemas = openApi.getComponents().getSchemas();
+
         final Map<String, ApiResponse> responses = openApi.getComponents().getResponses();
         final Map<String, RequestBody> requestBodies = openApi.getComponents().getRequestBodies();
         final Map<String, Parameter> parameters = openApi.getComponents().getParameters();
@@ -65,13 +65,7 @@ public void processComponents() {
         final Map<String, Callback> callbacks = openApi.getComponents().getCallbacks();
         final Map<String, SecurityScheme> securitySchemes = openApi.getComponents().getSecuritySchemes();
 
-        //schemas
-        if (schemas != null) {
-            Set<String> keySet = new LinkedHashSet<>();
-            while(schemas.keySet().size() > keySet.size()) {
-                processSchemas(keySet, schemas);
-            }
-        }
+
 
         //responses
         if (responses != null) {
@@ -136,6 +130,16 @@ public void processComponents() {
                 processSecuritySchemes(keySet, securitySchemes);
             }
         }
+
+        final Map<String, Schema> schemas = openApi.getComponents().getSchemas();
+
+        //schemas
+        if (schemas != null) {
+            Set<String> keySet = new LinkedHashSet<>();
+            while(schemas.keySet().size() > keySet.size()) {
+                processSchemas(keySet, schemas);
+            }
+        }
     }
 
     private void processSecuritySchemes(Set<String> securitySchemeKey, Map<String, SecurityScheme> securitySchemes) {

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

@@ -66,6 +66,17 @@ public class OpenAPIV3ParserTest {
     protected int serverPort = getDynamicPort();
     protected WireMockServer wireMockServer;
 
+    @Test
+    public void testIssue1147() {
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        options.setFlatten(true);
+        SwaggerParseResult parseResult = new OpenAPIV3Parser().readLocation("issue-1147/issue1147.yaml", null, options);
+        OpenAPI apispec = parseResult.getOpenAPI();
+        assertNotNull(apispec);
+        assertEquals(((Schema)apispec.getComponents().getSchemas().get("StringObject").getProperties().get("val")).get$ref(),"#/components/schemas/String");
+    }
+
     @Test
     public void testIssue1148_Flatten_Dot() {
         ParseOptions options = new ParseOptions();

modules/swagger-parser-v3/src/test/resources/issue-1147/common.yaml

@@ -0,0 +1,14 @@
+openapi: 3.0.0
+info:
+  version: "1.0"
+  title: Swagger Parser Issue
+paths: {}
+components:
+  schemas:
+    String:
+      type: string
+    StringObject:
+      type: object
+      properties:
+        val:
+          $ref: '#/components/schemas/String'

modules/swagger-parser-v3/src/test/resources/issue-1147/issue1147.yaml

@@ -0,0 +1,19 @@
+openapi: 3.0.0
+info:
+  version: "1.0"
+  title: Swagger Parser Issue
+paths:
+  /:
+    post:
+      requestBody:
+        $ref: '#/components/requestBodies/RefRequestBody'
+      responses:
+        default:
+          description: "Error"
+components:
+  requestBodies:
+    RefRequestBody:
+      content:
+        'application/json':
+          schema:
+            $ref: 'common.yaml#/components/schemas/StringObject'