From 7e4fbbe45dd67a747b3bb44e132719bda0136209 Mon Sep 17 00:00:00 2001 From: Marcos Paulo dos Santos Date: Sun, 24 Jul 2022 20:45:07 -0300 Subject: [PATCH] fix: to adjust name of the parameters page and size when set property. --- .../DataRestDelegatingMethodParameterCustomizer.java | 6 ++++-- .../test/org/springdoc/api/app14/SpringDocApp14Test.java | 1 + .../src/test/resources/results/app14.json | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/springdoc-openapi-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java b/springdoc-openapi-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java index 6be158bf8..5e3461a4c 100644 --- a/springdoc-openapi-common/src/main/java/org/springdoc/core/customizers/DataRestDelegatingMethodParameterCustomizer.java +++ b/springdoc-openapi-common/src/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/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app14/SpringDocApp14Test.java b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app14/SpringDocApp14Test.java index 42f34a86e..314fae616 100644 --- a/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app14/SpringDocApp14Test.java +++ b/springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app14/SpringDocApp14Test.java @@ -43,6 +43,7 @@ @TestPropertySource(properties = { "spring.data.web.pageable.default-page-size=25", "spring.data.web.pageable.page-parameter=pages", "spring.data.web.pageable.size-parameter=sizes", + "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 index 721adbfc0..958edbaf9 100644 --- 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": "Zero-based page index (0..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,