fix loop when response inherits generic class fixes #2271, #2280

Author: bnasslahsen

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

@@ -27,6 +27,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.util.Arrays;
 import java.util.Objects;
 
 import org.springframework.core.MethodParameter;
@@ -92,7 +93,8 @@ static void resolveType(ResolvableType[] resolvableTypes, Class<?> contextClass)
 					resolvableTypes[i] = resolvableType;
 			}
 			else if (resolvableTypes[i].hasGenerics()) {
-				resolveType(resolvableTypes[i].getGenerics(), contextClass);
+				if(!Arrays.equals(resolvableTypes[i].getGenerics(), resolvableTypes))
+					resolveType(resolvableTypes[i].getGenerics(), contextClass);
 				if (resolvableTypes[i].getRawClass() != null)
 					resolvableTypes[i] = ResolvableType.forClassWithGenerics(Objects.requireNonNull(resolvableTypes[i].getRawClass()), resolvableTypes[i].getGenerics());
 			}
@@ -201,4 +203,4 @@ default Type getReturnType(MethodParameter methodParameter) {
 		return methodParameter.getParameterType();
 	}
 
-}
+}

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/SpringdocApp207Test.java

@@ -0,0 +1,12 @@
+package test.org.springdoc.api.v30.app207;
+
+import test.org.springdoc.api.v30.AbstractSpringDocV30Test;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+public class SpringdocApp207Test extends AbstractSpringDocV30Test {
+
+	@SpringBootApplication
+	static class SpringDocTestApp {}
+
+}

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SuperController.java

@@ -0,0 +1,20 @@
+package test.org.springdoc.api.v30.app207.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import test.org.springdoc.api.v30.app207.model.SuperEntity;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
+
+public abstract class SuperController<T extends SuperEntity<T>> {
+
+    @GetMapping({"page/{current}/{size}", "page"})
+    public List<? extends T> findPage(@PathVariable(required = false) Long current,
+                                      @PathVariable(required = false) Long size,
+                                      @RequestParam(required = false) T params) {
+        return new ArrayList<>();
+    }
+}

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/controller/SysUserController.java

@@ -0,0 +1,14 @@
+package test.org.springdoc.api.v30.app207.controller;
+
+
+import test.org.springdoc.api.v30.app207.model.SysUser;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/sysUser")
+public class SysUserController extends SuperController<SysUser> {
+
+	
+}

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/model/SuperEntity.java

@@ -0,0 +1,5 @@
+package test.org.springdoc.api.v30.app207.model;
+
+public class SuperEntity<T> {
+
+}

springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/v30/app207/model/SysUser.java

@@ -0,0 +1,4 @@
+package test.org.springdoc.api.v30.app207.model;
+
+public class SysUser extends SuperEntity<SysUser> {
+}

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app207.json

@@ -0,0 +1,109 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "OpenAPI definition",
+    "version": "v0"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/api/sysUser/page/{current}/{size}": {
+      "get": {
+        "tags": [
+          "sys-user-controller"
+        ],
+        "operationId": "findPage",
+        "parameters": [
+          {
+            "name": "current",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          },
+          {
+            "name": "size",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          },
+          {
+            "name": "params",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/SysUser"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SuperEntityObject"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/sysUser/page": {
+      "get": {
+        "tags": [
+          "sys-user-controller"
+        ],
+        "operationId": "findPage_1",
+        "parameters": [
+          {
+            "name": "params",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "$ref": "#/components/schemas/SysUser"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SuperEntityObject"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "SysUser": {
+        "type": "object"
+      },
+      "SuperEntityObject": {
+        "type": "object"
+      }
+    }
+  }
+}