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

MaksimOrlov · MaksimOrlov · commit 018d75b01abe · 2020-02-08T23:15:07.000+02:00
diff --git a/springfox-spring-web/src/main/java/springfox/documentation/spring/web/scanners/ApiModelReader.java b/springfox-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/springfox-spring-webmvc/src/test/groovy/springfox/documentation/spring/web/readers/ApiModelReaderSpec.groovy b/springfox-spring-webmvc/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)

Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ class ApiModelReaderSpec extends DocumentationContextSpec {`
`539`	`539`
`540`	`540`	`}`
`541`	`541`
`542`		`- def "Test to verify that recursive type holder doesn't generate spare models"() {`
	`542`	`+ def "Test to verify that type holder doesn't generate spare models"() {`
`543`	`543`	`given:`
`544`	`544`	`HandlerMethod handlerMethod =`
`545`	`545`	`dummyHandlerMethod('methodToTestSpareModelsWithKnownTypes', Foo, Holder)`