Improve management of abstract generic. Fixes #829

Author: bnasslahsen

springdoc-openapi-common/src/main/java/org/springdoc/core/ReturnTypeParser.java

@@ -59,21 +59,47 @@ static Type resolveType(Type genericType, @Nullable Class<?> contextClass) {
 			else if (genericType instanceof ParameterizedType) {
 				ResolvableType resolvedType = ResolvableType.forType(genericType);
 				if (resolvedType.hasUnresolvableGenerics()) {
-					ParameterizedType parameterizedType = (ParameterizedType) genericType;
-					Class<?>[] generics = new Class<?>[parameterizedType.getActualTypeArguments().length];
-					Type[] typeArguments = parameterizedType.getActualTypeArguments();
-					ResolvableType contextType = ResolvableType.forClass(contextClass);
-					findTypeForGenerics(generics, typeArguments, contextType);
-					Class<?> rawClass = resolvedType.getRawClass();
-					if (rawClass != null) {
-						return ResolvableType.forClassWithGenerics(rawClass, generics).getType();
-					}
+					ResolvableType resolvableType = getResolvedType(resolvedType, contextClass);
+					if (resolvableType != null)
+						return resolvableType.getType();
+				}
+				else if (resolvedType.hasGenerics()) {
+					ResolvableType[] resolvableTypes = resolvedType.getGenerics();
+					resolveType(resolvableTypes, contextClass);
+					return ResolvableType.forClassWithGenerics(resolvedType.getRawClass(), resolvableTypes).getType();
 				}
 			}
 		}
 		return genericType;
 	}
 
+	static void resolveType(ResolvableType[] resolvableTypes, Class<?> contextClass) {
+		for (int i = 0; i < resolvableTypes.length; i++) {
+			if (resolvableTypes[i].hasUnresolvableGenerics() && resolvableTypes[i].getType() instanceof ParameterizedType) {
+				ResolvableType resolvableType = getResolvedType(resolvableTypes[i], contextClass);
+				if (resolvableType != null)
+					resolvableTypes[i] = resolvableType;
+			}
+			else if (resolvableTypes[i].hasGenerics()) {
+				resolveType(resolvableTypes[i].getGenerics(), contextClass);
+				if (resolvableTypes[i].getRawClass() != null)
+					resolvableTypes[i] = ResolvableType.forClassWithGenerics(resolvableTypes[i].getRawClass(), resolvableTypes[i].getGenerics());
+			}
+		}
+	}
+
+	static ResolvableType getResolvedType(ResolvableType resolvableType, Class<?> contextClass) {
+		ParameterizedType parameterizedType = (ParameterizedType) resolvableType.getType();
+		Class<?>[] generics = new Class<?>[parameterizedType.getActualTypeArguments().length];
+		Type[] typeArguments = parameterizedType.getActualTypeArguments();
+		ResolvableType contextType = ResolvableType.forClass(contextClass);
+		findTypeForGenerics(generics, typeArguments, contextType);
+		Class<?> rawClass = resolvableType.getRawClass();
+		if (rawClass != null)
+			return ResolvableType.forClassWithGenerics(rawClass, generics);
+		return null;
+	}
+
 	/**
 	 * Find type for generics.
 	 *

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app79/BaseClientModel.java

@@ -0,0 +1,8 @@
+package test.org.springdoc.api.app79;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public abstract class BaseClientModel {
+	@JsonProperty("id")
+	int id;
+}

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app79/BaseController.java

@@ -0,0 +1,23 @@
+package test.org.springdoc.api.app79;
+
+import java.util.List;
+
+import io.swagger.v3.oas.annotations.Operation;
+import reactor.core.publisher.Mono;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+
+public abstract class BaseController<TClientModel extends BaseClientModel> {
+	@Operation
+	@GetMapping("/test1")
+	Mono<ResponseEntity<TClientModel>> get1() {
+		return null;
+	}
+
+	@Operation
+	@GetMapping("/test2")
+	Mono<ResponseEntity<List<TClientModel>>> get2() {
+		return null;
+	}
+}

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app79/SpecificClientModel.java

@@ -0,0 +1,10 @@
+package test.org.springdoc.api.app79;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public class SpecificClientModel extends BaseClientModel {
+	@JsonProperty("name")
+	@Schema(title = "my title", pattern = "this is it", example = "this is example")
+	String name;
+}

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app79/SpecificController.java

@@ -0,0 +1,6 @@
+package test.org.springdoc.api.app79;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class SpecificController extends BaseController<SpecificClientModel> {}

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/app79/SpringDocApp79Test.java

@@ -0,0 +1,36 @@
+/*
+ *
+ *  *
+ *  *  *
+ *  *  *  * Copyright 2019-2020 the original author or authors.
+ *  *  *  *
+ *  *  *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  *  *  * you may not use this file except in compliance with the License.
+ *  *  *  * You may obtain a copy of the License at
+ *  *  *  *
+ *  *  *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *  *  *
+ *  *  *  * Unless required by applicable law or agreed to in writing, software
+ *  *  *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  *  *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  *  *  * See the License for the specific language governing permissions and
+ *  *  *  * limitations under the License.
+ *  *  *
+ *  *
+ *
+ *
+ */
+
+package test.org.springdoc.api.app79;
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+public class SpringDocApp79Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication
+	@ComponentScan(basePackages = { "org.springdoc", "test.org.springdoc.api.app79" })
+	static class SpringDocTestApp {}
+}

springdoc-openapi-webflux-core/src/test/resources/results/app79.json

@@ -0,0 +1,77 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/test2": {
+      "get": {
+        "tags": [
+          "specific-controller"
+        ],
+        "operationId": "get2",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SpecificClientModel"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/test1": {
+      "get": {
+        "tags": [
+          "specific-controller"
+        ],
+        "operationId": "get1",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/SpecificClientModel"
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "SpecificClientModel": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "title": "my title",
+            "pattern": "this is it",
+            "type": "string",
+            "example": "this is example"
+          }
+        }
+      }
+    }
+  }
+}