refs #3303 - add test

Author: frantuma

modules/swagger-core/src/main/java/io/swagger/v3/core/filter/SpecFilter.java

@@ -23,7 +23,16 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 public class SpecFilter {
@@ -384,7 +393,7 @@ protected OpenAPI removeBrokenReferenceDefinitions(OpenAPI openApi) {
             }
         }
 
-        referencedDefinitions.addAll(resolveAllNestededRefs(referencedDefinitions, referencedDefinitions, openApi));
+        referencedDefinitions.addAll(resolveAllNestedRefs(referencedDefinitions, referencedDefinitions, openApi));
         openApi.getComponents()
                 .getSchemas()
                 .keySet()
@@ -394,7 +403,7 @@ protected OpenAPI removeBrokenReferenceDefinitions(OpenAPI openApi) {
         return openApi;
     }
 
-    private Set<String> resolveAllNestededRefs(Set<String> refs, Set<String> accumulatedRefs, OpenAPI openApi) {
+    protected Set<String> resolveAllNestedRefs(Set<String> refs, Set<String> accumulatedRefs, OpenAPI openApi) {
         Set<String> justDiscoveredReferencedDefinitions = new TreeSet<>();
         for (String ref : refs) {
             locateReferencedDefinitions(ref, justDiscoveredReferencedDefinitions, openApi);
@@ -406,7 +415,7 @@ private Set<String> resolveAllNestededRefs(Set<String> refs, Set<String> accumul
             // Remove all refs that have already been discovered.
             justDiscoveredReferencedDefinitions.removeAll(accumulatedRefs);
             accumulatedRefs.addAll(justDiscoveredReferencedDefinitions);
-            return resolveAllNestededRefs(justDiscoveredReferencedDefinitions, accumulatedRefs, openApi);
+            return resolveAllNestedRefs(justDiscoveredReferencedDefinitions, accumulatedRefs, openApi);
         }
     }
 

modules/swagger-core/src/test/java/io/swagger/v3/core/filter/SpecFilterTest.java

@@ -43,6 +43,7 @@ public class SpecFilterTest {
 
     private static final String RESOURCE_RECURSIVE_MODELS = "specFiles/recursivemodels.json";
     private static final String RESOURCE_PATH = "specFiles/petstore-3.0-v2.json";
+    private static final String RESOURCE_PATH_3303 = "specFiles/petstore-3.0-v2-ticket-3303.json";
     private static final String RESOURCE_REFERRED_SCHEMAS = "specFiles/petstore-3.0-referred-schemas.json";
     private static final String RESOURCE_PATH_WITHOUT_MODELS = "specFiles/petstore-3.0-v2_withoutModels.json";
     private static final String RESOURCE_DEPRECATED_OPERATIONS = "specFiles/deprecatedoperationmodel.json";
@@ -241,6 +242,21 @@ public void shouldRemoveBrokenRefs() throws IOException {
         assertNotNull(filtered.getComponents().getSchemas().get("Pet"));
     }
 
+    @Test
+    public void shouldRemoveBrokenNestedRefs() throws IOException {
+        final OpenAPI openAPI = getOpenAPI(RESOURCE_PATH_3303);
+        openAPI.getPaths().get("/pet/{petId}").getGet().getResponses().getDefault().getHeaders().remove("X-Rate-Limit-Limit");
+        assertNotNull(openAPI.getComponents().getSchemas().get("PetHeader"));
+        final RemoveUnreferencedDefinitionsFilter remover = new RemoveUnreferencedDefinitionsFilter();
+        final OpenAPI filtered = new SpecFilter().filter(openAPI, remover, null, null, null);
+
+        assertNull(filtered.getComponents().getSchemas().get("PetHeader"));
+        assertNull(filtered.getComponents().getSchemas().get("Bar"));
+        assertNotNull(filtered.getComponents().getSchemas().get("Category"));
+        assertNotNull(filtered.getComponents().getSchemas().get("Pet"));
+        assertNotNull(filtered.getComponents().getSchemas().get("Foo"));
+    }
+
     @Test
     public void shouldNotRemoveGoodRefs() throws IOException {
         final OpenAPI openAPI = getOpenAPI(RESOURCE_PATH);