Improve page return for search controllers

bnasslahsen · bnasslahsen · commit 32abfbc08a65 · 2021-03-02T22:56:37.000+01:00
diff --git a/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestResponseService.java b/springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestResponseService.java
@@ -192,7 +192,7 @@ private Type findSearchReturnType(MethodResourceMapping methodResourceMapping, C
 		Type returnType;
 		Type returnRepoType = ReturnTypeParser.resolveType(methodResourceMapping.getMethod().getGenericReturnType(), methodResourceMapping.getMethod().getDeclaringClass());
 		if (methodResourceMapping.isPagingResource()) {
-			returnType = ResolvableType.forClassWithGenerics(PagedModel.class, domainType).getType();
+			returnType =  resolveGenericType(PagedModel.class, EntityModel.class, domainType);
 		}
 		else if (ResolvableType.forType(returnRepoType).getRawClass() != null
 				&& Iterable.class.isAssignableFrom(Objects.requireNonNull(ResolvableType.forType(returnRepoType).getRawClass()))) {
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app10.json b/springdoc-openapi-data-rest/src/test/resources/results/app10.json
@@ -624,7 +624,7 @@
             "content": {
               "application/hal+json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PagedModelCustomer"
+                  "$ref": "#/components/schemas/PagedModelEntityModelCustomer"
                 }
               }
             }
@@ -1091,7 +1091,7 @@
           }
         }
       },
-      "PagedModelCustomer": {
+      "PagedModelEntityModelCustomer": {
         "type": "object",
         "properties": {
           "_embedded": {
@@ -1100,7 +1100,7 @@
               "customers": {
                 "type": "array",
                 "items": {
-                  "$ref": "#/components/schemas/Customer"
+                  "$ref": "#/components/schemas/EntityModelCustomer"
                 }
               }
             }
diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app16.json b/springdoc-openapi-data-rest/src/test/resources/results/app16.json
@@ -694,7 +694,7 @@
             "content": {
               "application/hal+json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PagedModelCustomer"
+                  "$ref": "#/components/schemas/PagedModelEntityModelCustomer"
                 }
               }
             }
@@ -1166,7 +1166,7 @@
           }
         }
       },
-      "PagedModelCustomer": {
+      "PagedModelEntityModelCustomer": {
         "type": "object",
         "properties": {
           "_embedded": {
@@ -1175,7 +1175,7 @@
               "customers": {
                 "type": "array",
                 "items": {
-                  "$ref": "#/components/schemas/Customer"
+                  "$ref": "#/components/schemas/EntityModelCustomer"
                 }
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ private Type findSearchReturnType(MethodResourceMapping methodResourceMapping, C`
`192`	`192`	`Type returnType;`
`193`	`193`	`Type returnRepoType = ReturnTypeParser.resolveType(methodResourceMapping.getMethod().getGenericReturnType(), methodResourceMapping.getMethod().getDeclaringClass());`
`194`	`194`	`if (methodResourceMapping.isPagingResource()) {`
`195`		`- returnType = ResolvableType.forClassWithGenerics(PagedModel.class, domainType).getType();`
	`195`	`+ returnType = resolveGenericType(PagedModel.class, EntityModel.class, domainType);`
`196`	`196`	`}`
`197`	`197`	`else if (ResolvableType.forType(returnRepoType).getRawClass() != null`
`198`	`198`	`&& Iterable.class.isAssignableFrom(Objects.requireNonNull(ResolvableType.forType(returnRepoType).getRawClass()))) {`
Original file line number	Diff line number	Diff line change
`@@ -624,7 +624,7 @@`
`624`	`624`	`"content": {`
`625`	`625`	`"application/hal+json": {`
`626`	`626`	`"schema": {`
`627`		`- "$ref": "#/components/schemas/PagedModelCustomer"`
	`627`	`+ "$ref": "#/components/schemas/PagedModelEntityModelCustomer"`
`628`	`628`	`}`
`629`	`629`	`}`
`630`	`630`	`}`
`@@ -1091,7 +1091,7 @@`
`1091`	`1091`	`}`
`1092`	`1092`	`}`
`1093`	`1093`	`},`
`1094`		`- "PagedModelCustomer": {`
	`1094`	`+ "PagedModelEntityModelCustomer": {`
`1095`	`1095`	`"type": "object",`
`1096`	`1096`	`"properties": {`
`1097`	`1097`	`"_embedded": {`
`@@ -1100,7 +1100,7 @@`
`1100`	`1100`	`"customers": {`
`1101`	`1101`	`"type": "array",`
`1102`	`1102`	`"items": {`
`1103`		`- "$ref": "#/components/schemas/Customer"`
	`1103`	`+ "$ref": "#/components/schemas/EntityModelCustomer"`
`1104`	`1104`	`}`
`1105`	`1105`	`}`
`1106`	`1106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@`
`694`	`694`	`"content": {`
`695`	`695`	`"application/hal+json": {`
`696`	`696`	`"schema": {`
`697`		`- "$ref": "#/components/schemas/PagedModelCustomer"`
	`697`	`+ "$ref": "#/components/schemas/PagedModelEntityModelCustomer"`
`698`	`698`	`}`
`699`	`699`	`}`
`700`	`700`	`}`
`@@ -1166,7 +1166,7 @@`
`1166`	`1166`	`}`
`1167`	`1167`	`}`
`1168`	`1168`	`},`
`1169`		`- "PagedModelCustomer": {`
	`1169`	`+ "PagedModelEntityModelCustomer": {`
`1170`	`1170`	`"type": "object",`
`1171`	`1171`	`"properties": {`
`1172`	`1172`	`"_embedded": {`
`@@ -1175,7 +1175,7 @@`
`1175`	`1175`	`"customers": {`
`1176`	`1176`	`"type": "array",`
`1177`	`1177`	`"items": {`
`1178`		`- "$ref": "#/components/schemas/Customer"`
	`1178`	`+ "$ref": "#/components/schemas/EntityModelCustomer"`
`1179`	`1179`	`}`
`1180`	`1180`	`}`
`1181`	`1181`	`}`