Wrong Parameter Name with Default Sort. Fixes #1010.

Author: bnasslahsen

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/customisers/DataRestDelegatingMethodParameterCustomizer.java

@@ -62,8 +62,7 @@ public DataRestDelegatingMethodParameterCustomizer(Optional<SpringDataWebPropert
 	@Override
 	public void customize(MethodParameter originalParameter, MethodParameter methodParameter) {
 		PageableDefault pageableDefault = originalParameter.getParameterAnnotation(PageableDefault.class);
-		if (pageableDefault != null || (org.springframework.data.domain.Pageable.class.isAssignableFrom(originalParameter.getParameterType()) && (optionalSpringDataWebProperties.isPresent() || optionalRepositoryRestConfiguration.isPresent())))
-		{
+		if (pageableDefault != null || (org.springframework.data.domain.Pageable.class.isAssignableFrom(originalParameter.getParameterType()) && (optionalSpringDataWebProperties.isPresent() || optionalRepositoryRestConfiguration.isPresent()))) {
 			Field field = FieldUtils.getDeclaredField(DelegatingMethodParameter.class, "additionalParameterAnnotations", true);
 			try {
 				Annotation[] parameterAnnotations = (Annotation[]) field.get(methodParameter);
@@ -100,7 +99,7 @@ public Class<? extends Annotation> annotationType() {
 
 				@Override
 				public String name() {
-					return getName(parameterName, pageableDefault, parameter.name());
+					return getName(parameterName, parameter.name());
 				}
 
 				@Override
@@ -390,11 +389,10 @@ public String ref() {
 	 * Gets name.
 	 *
 	 * @param parameterName the parameter name
-	 * @param pageableDefault the pageable default
 	 * @param originalName the original name
 	 * @return the name
 	 */
-	private String getName(String parameterName, PageableDefault pageableDefault, String originalName) {
+	private String getName(String parameterName , String originalName) {
 		String name = null;
 		switch (parameterName) {
 			case "size":
@@ -406,9 +404,7 @@ else if (optionalSpringDataWebProperties.isPresent())
 					name = originalName;
 				break;
 			case "sort":
-				if (pageableDefault != null && ArrayUtils.isNotEmpty(pageableDefault.sort()))
-					name = String.join(",", pageableDefault.sort());
-				else if (optionalRepositoryRestConfiguration.isPresent())
+				if (optionalRepositoryRestConfiguration.isPresent())
 					name = optionalRepositoryRestConfiguration.get().getSortParamName();
 				else if (optionalSpringDataWebProperties.isPresent())
 					name = optionalSpringDataWebProperties.get().getSort().getSortParameter();

springdoc-openapi-data-rest/src/test/resources/results/app13.json

@@ -41,7 +41,7 @@
             }
           },
           {
-            "name": "name",
+            "name": "sort",
             "in": "query",
             "description": "Sorting criteria in the format: property(,asc|desc). Default sort order is ascending. Multiple sort criteria are supported.",
             "required": false,