#3014, #3243, #2345, #3211, #3082

springfox · Feb 8, 2020 · 018d75b · 018d75b
1 parent 6e660f0
commit 018d75b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...-spring-web/src/main/java/springfox/documentation/spring/web/scanners/ApiModelReader.java b/...-spring-web/src/main/java/springfox/documentation/spring/web/scanners/ApiModelReader.java
@@ -221,6 +221,9 @@ private MergingContext mergeNodes(final Set<String> nodes, final UniqueTypeNameA
     final Set<String> currentDependencies = new HashSet<String>();
 
     for (final String modelId : nodes) {
+      if (adapter.getTypeName(modelId).isPresent()) {
+        continue;
+      }
 
       if (!mergingContext.hasSeenBefore(modelId)) {
         Set<ComparisonCondition> newDependencies = mergeModelBranch(adapter,

diff --git a/...bmvc/src/test/groovy/springfox/documentation/spring/web/readers/ApiModelReaderSpec.groovy b/...bmvc/src/test/groovy/springfox/documentation/spring/web/readers/ApiModelReaderSpec.groovy
@@ -539,7 +539,7 @@ class ApiModelReaderSpec extends DocumentationContextSpec {
 
   }
 
-  def "Test to verify that recursive type holder doesn't generate spare models"() {
+  def "Test to verify that type holder doesn't generate spare models"() {
     given:
       HandlerMethod handlerMethod =
           dummyHandlerMethod('methodToTestSpareModelsWithKnownTypes', Foo, Holder)