project update

Author: [email protected]

springdoc-openapi-common/src/main/java/org/springdoc/config/SpringDocConfiguration.java

@@ -1,10 +1,16 @@
 package org.springdoc.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 
 @Configuration
 @ComponentScan(basePackages = {"org.springdoc"})
 public class SpringDocConfiguration {
 
+    @Bean
+    LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer() {
+        return new LocalVariableTableParameterNameDiscoverer();
+    }
 }

springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractParameterBuilder.java

@@ -17,6 +17,7 @@
 import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.reflect.MethodUtils;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.web.method.HandlerMethod;
 
@@ -30,6 +31,12 @@
 @SuppressWarnings("rawtypes")
 public abstract class AbstractParameterBuilder {
 
+    protected LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer;
+
+    public AbstractParameterBuilder(LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
+        this.localSpringDocParameterNameDiscoverer = localSpringDocParameterNameDiscoverer;
+    }
+
     Parameter mergeParameter(List<Parameter> existingParamDoc, Parameter paramCalcul) {
         Parameter result = paramCalcul;
         if (paramCalcul != null && paramCalcul.getName() != null) {
@@ -168,6 +175,10 @@ Schema calculateSchema(Components components, java.lang.reflect.Parameter parame
         return schemaN;
     }
 
+    public LocalVariableTableParameterNameDiscoverer getLocalSpringDocParameterNameDiscoverer() {
+        return localSpringDocParameterNameDiscoverer;
+    }
+
     protected abstract Schema calculateSchemaFromParameterizedType(Components components, Type returnType, JsonView jsonView);
 
     private Schema extractFileSchema(String paramName, RequestBodyInfo requestBodyInfo) {

springdoc-openapi-common/src/main/java/org/springdoc/core/AbstractRequestBuilder.java

@@ -7,6 +7,7 @@
 import io.swagger.v3.oas.models.parameters.Parameter;
 import org.apache.commons.lang3.StringUtils;
 import org.springdoc.core.RequestInfo.ParameterType;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -50,8 +51,12 @@ public Operation build(Components components, HandlerMethod handlerMethod, Reque
 
         operation.setOperationId(operationId);
         // requests
+        LocalVariableTableParameterNameDiscoverer d = parameterBuilder.getLocalSpringDocParameterNameDiscoverer();
+        String[] pNames = d.getParameterNames(handlerMethod.getMethod());
         java.lang.reflect.Parameter[] parameters = handlerMethod.getMethod().getParameters();
-        String[] pNames = Arrays.stream(parameters).map(java.lang.reflect.Parameter::getName).toArray(String[]::new);
+        if (pNames == null) {
+            pNames = Arrays.stream(parameters).map(java.lang.reflect.Parameter::getName).toArray(String[]::new);
+        }
         RequestBodyInfo requestBodyInfo = new RequestBodyInfo(methodAttributes);
         List<Parameter> operationParameters = (operation.getParameters() != null) ? operation.getParameters()
                 : new ArrayList<>();

springdoc-openapi-webflux-core/src/main/java/org/springdoc/core/ParameterBuilder.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.media.Schema;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,6 +18,10 @@
 @Component
 public class ParameterBuilder extends AbstractParameterBuilder {
 
+    public ParameterBuilder(LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
+        super(localSpringDocParameterNameDiscoverer);
+    }
+
     @Override
     protected Schema calculateSchemaFromParameterizedType(Components components, Type paramType, JsonView jsonView) {
         Schema schemaN;

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/core/ParameterBuilder.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.media.Schema;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -14,6 +15,10 @@
 @Component
 public class ParameterBuilder extends AbstractParameterBuilder {
 
+    public ParameterBuilder(LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer) {
+        super(localSpringDocParameterNameDiscoverer);
+    }
+
     @Override
     protected Schema calculateSchemaFromParameterizedType(Components components, Type paramType, JsonView jsonView) {
         return SpringDocAnnotationsUtils.extractSchema(components, paramType, jsonView);