fix defaultValue when using @PageableDefault together with one-indexed-parameters

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java

@@ -64,6 +64,9 @@
 
 /**
  * The type Data rest delegating method parameter customizer.
+ *
+ *  @author bnasslahsen
+ *  @author pheyken
  */
 public class DataRestDelegatingMethodParameterCustomizer implements DelegatingMethodParameterCustomizer {
 
@@ -1131,8 +1134,13 @@ else if (isSpringDataWebPropertiesPresent())
 					defaultValue = defaultSchemaVal;
 				break;
 			case "page":
-				if (pageableDefault != null)
-					defaultValue = String.valueOf(pageableDefault.page());
+				if (pageableDefault != null) {
+					if (isSpringDataWebPropertiesPresent() && optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().isOneIndexedParameters()) {
+						defaultValue = String.valueOf(pageableDefault.page() + 1);
+					} else {
+						defaultValue = String.valueOf(pageableDefault.page());
+					}
+				}
 				else if (isSpringDataWebPropertiesPresent() && optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().isOneIndexedParameters())
 					defaultValue = "1";
 				else

springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/v31/app14/HelloController.java

@@ -21,7 +21,7 @@
  *  *  *  *
  *  *  *
  *  *
- *  
+ *
  */
 
 package test.org.springdoc.api.v31.app14;
@@ -31,6 +31,8 @@
 import org.springdoc.core.annotations.ParameterObject;
 
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -43,4 +45,11 @@ public ResponseEntity<List<PersonDTO>> getAllPets(@ParameterObject Pageable page
 		return null;
 	}
 
+	@GetMapping("/test1")
+	public String getPatientList1(@PageableDefault(size = 100, sort = { "someField", "someoTHER" },
+		direction = Sort.Direction.DESC)
+								  @ParameterObject Pageable pageable) {
+		return "bla";
+	}
+
 }

springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/resources/results/3.1.0/app14.json

@@ -11,6 +11,66 @@
     }
   ],
   "paths": {
+    "/test1": {
+      "get": {
+        "tags": [
+          "hello-controller"
+        ],
+        "operationId": "getPatientList1",
+        "parameters": [
+          {
+            "name": "prefix_pages",
+            "in": "query",
+            "description": "One-based page index (1..N)",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 1,
+              "minimum": 0
+            }
+          },
+          {
+            "name": "prefix_sizes",
+            "in": "query",
+            "description": "The size of the page to be returned",
+            "required": false,
+            "schema": {
+              "type": "integer",
+              "default": 100,
+              "minimum": 1
+            }
+          },
+          {
+            "name": "sorts",
+            "in": "query",
+            "description": "Sorting criteria in the format: property,(asc|desc). Default sort order is ascending. Multiple sort criteria are supported.",
+            "required": false,
+            "schema": {
+              "type": "array",
+              "default": [
+                "someField,DESC",
+                "someoTHER,DESC"
+              ],
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/search": {
       "get": {
         "tags": [