Merge branch 'marcospds-prefix-parameter'

springdoc · Jul 30, 2022 · c948b31 · c948b31
2 parents fdc2998 + 7cd7d8f
commit c948b31
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java b/...main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java
@@ -675,7 +675,8 @@ private String getName(String parameterName, String originalName) {
 				if (isRepositoryRestConfigurationPresent())
 					name = optionalRepositoryRestConfigurationProvider.get().getRepositoryRestConfiguration().getLimitParamName();
 				else if (isSpringDataWebPropertiesPresent())
-					name = optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().getSizeParameter();
+					name = optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().getPrefix() +
+							optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().getSizeParameter();
 				else
 					name = originalName;
 				break;
@@ -691,7 +692,8 @@ else if (isSpringDataWebPropertiesPresent())
 				if (isRepositoryRestConfigurationPresent())
 					name = optionalRepositoryRestConfigurationProvider.get().getRepositoryRestConfiguration().getPageParamName();
 				else if (isSpringDataWebPropertiesPresent())
-					name = optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().getPageParameter();
+					name = optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().getPrefix() +
+						optionalSpringDataWebPropertiesProvider.get().getSpringDataWebProperties().getPageable().getPageParameter();
 				else
 					name = originalName;
 				break;

diff --git a/...gdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app14/SpringDocApp14Test.java b/...gdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app14/SpringDocApp14Test.java
@@ -44,6 +44,7 @@
 		"spring.data.web.pageable.page-parameter=pages",
 		"spring.data.web.pageable.size-parameter=sizes",
 		"spring.data.web.pageable.one-indexed-parameters=true",
+		"spring.data.web.pageable.prefix=prefix_",
 		"spring.data.web.sort.sort-parameter=sorts" })
 @EnableAutoConfiguration(exclude = {
 		RepositoryRestMvcAutoConfiguration.class, SpringDocDataRestConfiguration.class

diff --git a/springdoc-openapi-data-rest/src/test/resources/results/app14.json b/springdoc-openapi-data-rest/src/test/resources/results/app14.json
@@ -19,7 +19,7 @@
         "operationId": "getAllPets",
         "parameters": [
           {
-            "name": "pages",
+            "name": "prefix_pages",
             "in": "query",
             "description": "One-based page index (1..N)",
             "required": false,
@@ -30,7 +30,7 @@
             }
           },
           {
-            "name": "sizes",
+            "name": "prefix_sizes",
             "in": "query",
             "description": "The size of the page to be returned",
             "required": false,
@@ -97,4 +97,4 @@
       }
     }
   }
-}
+}