Merge pull request swagger-api#1028 from swagger-api/issue-984

refs swagger-api#984 - stackoverflow fix in resolveFully

Author: frantuma

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

@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.IdentityHashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -56,7 +57,7 @@ public ResolverFully(boolean aggregateCombinators) {
     private Map<String, RequestBody> requestBodies;
     private Map<String, Header> headers;
     private Map<String, Link> links;
-    private Map<String, Schema> resolvedProperties = new HashMap<>();
+    private Map<String, Schema> resolvedProperties = new IdentityHashMap<>();
 
     public void resolveFully(OpenAPI openAPI) {
         Components components = openAPI.getComponents();

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

@@ -8,7 +8,6 @@
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import io.swagger.v3.core.util.Json;
-import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -1165,6 +1164,23 @@ public void recursiveResolving2() {
         }
     }
 
+    @Test
+    public void recursiveIssue984() {
+        ParseOptions parseOptions = new ParseOptions();
+        parseOptions.setResolve(true);
+        parseOptions.setResolveFully(true);
+        OpenAPI openAPI = new OpenAPIV3Parser().read("issue-984-simple.yaml", null, parseOptions);
+        if (openAPI == null) fail("failed parsing issue-984");
+        try {
+            Json.pretty(openAPI);
+            //System.out.println(Json.pretty(openAPI));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            fail("Recursive loop found");
+        }
+    }
+
     @Test
     public void propertyNameMixup() {
         ParseOptions parseOptions = new ParseOptions();

modules/swagger-parser-v3/src/test/resources/issue-984-simple.yaml

@@ -0,0 +1,55 @@
+openapi: 3.0.0
+info:
+  description: test
+  version: "1.0"
+  title: test
+paths:
+  /cu:
+    post:
+      operationId: savecu
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/AbTestFoo"
+  "/bar":
+    put:
+      operationId: updateBar
+      responses:
+        "200":
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CoTestBar"
+servers:
+  - url: /foo/bar
+components:
+  schemas:
+    Thing:
+      type: object
+      properties:
+        moreThings:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/ThingAs"
+    ThingAs:
+      type: object
+      properties:
+        concept:
+          $ref: "#/components/schemas/Thing"
+    AbTestFoo:
+      type: object
+      properties:
+        moreThings:
+          type: array
+          uniqueItems: true
+          items:
+            $ref: "#/components/schemas/ThingAs"
+          readOnly: true
+    CoTestBar:
+      allOf:
+        - $ref: "#/components/schemas/Thing"