Improve support of Generics inheritance on complex return types.Fixes #537.

Author: bnasslahsen

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

@@ -21,13 +21,14 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
+import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
 
 public interface ReturnTypeParser {
 
 	default Type getReturnType(MethodParameter methodParameter) {
 		if (methodParameter.getGenericParameterType() instanceof ParameterizedType)
-			return methodParameter.getGenericParameterType();
+			return GenericTypeResolver.resolveType(methodParameter.getGenericParameterType(),methodParameter.getContainingClass());
 		return methodParameter.getParameterType();
 	}
 }

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app105/CrudController.java

@@ -0,0 +1,31 @@
+package test.org.springdoc.api.app105;
+
+import java.util.List;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@SuppressWarnings("rawtypes")
+public abstract class CrudController<T extends HavingPK> {
+
+	@GetMapping(path = "{id}")
+	@ResponseBody
+	@Operation(description = "Get single object")
+	public T get( //
+			@Parameter(description = "The id to get.", required = true) @PathVariable("id") int id) {
+		return null;
+	}
+
+	@GetMapping(path = "")
+	@ResponseBody
+	@Operation(description = "Receive a list of objects")
+	public List<T> list() {
+		return null;
+	}
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app105/Design.java

@@ -0,0 +1,4 @@
+package test.org.springdoc.api.app105;
+
+public class Design extends HavingPK {
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app105/DesignController.java

@@ -0,0 +1,15 @@
+package test.org.springdoc.api.app105;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "design")
+@Controller
+@RequestMapping("/design")
+public class DesignController extends CrudController<Design> {
+
+
+
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app105/HavingPK.java

@@ -0,0 +1,4 @@
+package test.org.springdoc.api.app105;
+
+public class HavingPK {
+}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/app105/SpringDocApp105Test.java

@@ -0,0 +1,10 @@
+package test.org.springdoc.api.app105;
+
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+public class SpringDocApp105Test extends AbstractSpringDocTest {
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+}

springdoc-openapi-webmvc-core/src/test/resources/results/app105.json

@@ -0,0 +1,79 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/design/{id}": {
+      "get": {
+        "tags": [
+          "design"
+        ],
+        "description": "Get single object",
+        "operationId": "get",
+        "parameters": [
+          {
+            "name": "id",
+            "in": "path",
+            "description": "The id to get.",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/Design"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/design": {
+      "get": {
+        "tags": [
+          "design"
+        ],
+        "description": "Receive a list of objects",
+        "operationId": "list",
+        "responses": {
+          "200": {
+            "description": "default response",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Design"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Design": {
+        "type": "object"
+      }
+    }
+  }
+}