When extends JpaRepository, using @parameter over the method results in duplicate of the same parameter. Fixes #2038

Author: bnasslahsen

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/core/DataRestOperationService.java

@@ -35,6 +35,7 @@
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springdoc.core.GenericParameterService;
 import org.springdoc.core.MethodAttributes;
 import org.springdoc.core.OperationService;
 import org.springdoc.core.SpringDocAnnotationsUtils;
@@ -205,12 +206,17 @@ private Operation buildSearchOperation(HandlerMethod handlerMethod, DataRestRepo
 			String pName = parameterMetadatum.getName();
 			ResourceDescription description = parameterMetadatum.getDescription();
 			if (description instanceof TypedResourceDescription) {
-				Type type = getParameterType(pName,method,description);
+				Type type = getParameterType(pName, method, description);
 				Schema<?> schema = SpringDocAnnotationsUtils.extractSchema(openAPI.getComponents(), type, null, null);
 				Parameter parameter = getParameterFromAnnotations(openAPI, methodAttributes, method, pName);
-				if (parameter == null)
+				if (parameter == null) {
 					parameter = new Parameter().name(pName).in(ParameterIn.QUERY.toString()).schema(schema);
-				operation.addParametersItem(parameter);
+					operation.addParametersItem(parameter);
+				}
+				else if (CollectionUtils.isEmpty(operation.getParameters()))
+					operation.addParametersItem(parameter);
+				else
+					GenericParameterService.mergeParameter(operation.getParameters(), parameter);
 			}
 		}
 
@@ -238,7 +244,7 @@ private Type getParameterType(String pName, Method method, ResourceDescription d
 		java.lang.reflect.Parameter[] parameters = method.getParameters();
 		for (int i = 0; i < parameters.length; i++) {
 			java.lang.reflect.Parameter parameter = parameters[i];
-			if (pName.equals(parameter.getName()) || (parameter.getAnnotation(Param.class)!=null && pName.equals(parameter.getAnnotation(Param.class).value()))) {
+			if (pName.equals(parameter.getName()) || (parameter.getAnnotation(Param.class) != null && pName.equals(parameter.getAnnotation(Param.class).value()))) {
 				ResolvableType resolvableType = ResolvableType.forMethodParameter(method, i);
 				type = resolvableType.getType();
 				break;

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app37/ProductRepository.java

@@ -9,6 +9,7 @@
 
 import ch.qos.logback.core.rolling.helper.DateTokenConverter;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.query.Param;
@@ -23,6 +24,15 @@
 @RepositoryRestResource(path = "product")
 public interface ProductRepository extends JpaRepository<ProductEntity, Long> {
 
+
+	List<ProductEntity> findByPrice( @Parameter(
+			name = "price",
+			description = "test desc",
+			in = ParameterIn.QUERY,
+			required = true
+	)
+	@Param("price")String price);
+
 	/**
 	 * 根据商品名称查询商品信息
 	 *

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

@@ -326,12 +326,46 @@
         }
       }
     },
-    "/product/search/findTopByNameOrderByDateDesc": {
+    "/product/search/findByPrice": {
       "get": {
         "tags": [
           "product-entity-search-controller"
         ],
         "operationId": "executeSearch-productentity-get_5",
+        "parameters": [
+          {
+            "name": "price",
+            "in": "query",
+            "description": "test desc",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/hal+json": {
+                "schema": {
+                  "$ref": "#/components/schemas/CollectionModelEntityModelProductEntity"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not Found"
+          }
+        }
+      }
+    },
+    "/product/search/findTopByNameOrderByDateDesc": {
+      "get": {
+        "tags": [
+          "product-entity-search-controller"
+        ],
+        "operationId": "executeSearch-productentity-get_6",
         "parameters": [
           {
             "name": "name2",