Wrong schema generation with PagedModel generated VIA_DTO and wrapped in ResponseEntity. Fixes #2933

Author: bnasslahsen

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/PageOpenAPIConverter.java

@@ -26,7 +26,6 @@
 
 package org.springdoc.core.converters;
 
-import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Iterator;
 
@@ -94,7 +93,7 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 			Class<?> cls = javaType.getRawClass();
 			if (replacePageWithPagedModel && PAGE_TO_REPLACE.equals(cls.getCanonicalName())) {
 				if (!type.isSchemaProperty())
-					type = resolvePagedModelType(type);
+					type = resolvePagedModelType(javaType);
 				else
 					type.name(getParentTypeName(type, cls));
 			}
@@ -108,13 +107,12 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 	 * @param type the type
 	 * @return the annotated type
 	 */
-	private AnnotatedType resolvePagedModelType(AnnotatedType type) {
-		Type pageType = type.getType();
-		if (pageType instanceof ParameterizedType) {
-			Type argumentType = ((ParameterizedType) type.getType()).getActualTypeArguments()[0];
+	private AnnotatedType resolvePagedModelType(JavaType type) {
+		if(type.hasGenericTypes()){
+			JavaType innerType = type.containedType(0);
 			Type pagedModelType = ResolvableType
-				.forClassWithGenerics(PagedModel.class, ResolvableType.forType(argumentType))
-				.getType();
+					.forClassWithGenerics(PagedModel.class, ResolvableType.forType(innerType))
+					.getType();
 			return new AnnotatedType(pagedModelType).resolveAsRef(true);
 		}
 		else {

springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/v30/app10/HelloController.java

@@ -31,6 +31,7 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.web.PagedModel;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -43,6 +44,11 @@ public Page<String> pageSimple() {
 		return pageImpl("test");
 	}
 
+	@GetMapping("/page-simple-response")
+	public ResponseEntity<Page<UserDto>> pageSimpleResponse() {
+		return null;
+	}
+	
 	@GetMapping("/paged-model-simple")
 	public PagedModel<String> pagedModelSimple() {
 		return pagedModel("test");
@@ -76,4 +82,8 @@ private <T> Page<T> pageImpl(T value) {
 		return new PageImpl<>(List.of(value));
 	}
 
+	public record UserDto(
+			String id,
+			String email
+	) {}
 }

springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-direct.json

@@ -91,6 +91,26 @@
         }
       }
     },
+    "/page-simple-response": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "pageSimpleResponse",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/PageUserDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/page-raw": {
       "get": {
         "tags": [
@@ -294,6 +314,63 @@
           }
         }
       },
+      "PageUserDto": {
+        "type": "object",
+        "properties": {
+          "totalPages": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalElements": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "size": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserDto"
+            }
+          },
+          "number": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "sort": {
+            "$ref": "#/components/schemas/SortObject"
+          },
+          "pageable": {
+            "$ref": "#/components/schemas/PageableObject"
+          },
+          "first": {
+            "type": "boolean"
+          },
+          "last": {
+            "type": "boolean"
+          },
+          "numberOfElements": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "empty": {
+            "type": "boolean"
+          }
+        }
+      },
+      "UserDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      },
       "Page": {
         "type": "object",
         "properties": {

springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/resources/results/3.0.1/app10-via_dto.json

@@ -91,6 +91,26 @@
         }
       }
     },
+    "/page-simple-response": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "pageSimpleResponse",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/PagedModelUserDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/page-raw": {
       "get": {
         "tags": [
@@ -207,6 +227,31 @@
             "$ref": "#/components/schemas/PageMetadata"
           }
         }
+      },
+      "PagedModelUserDto": {
+        "type": "object",
+        "properties": {
+          "content": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserDto"
+            }
+          },
+          "page": {
+            "$ref": "#/components/schemas/PageMetadata"
+          }
+        }
+      },
+      "UserDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
       }
     }
   }