fixes #192

Author: springdoc

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

@@ -283,20 +283,20 @@ private Map<String, io.swagger.v3.oas.annotations.Parameter> getApiParameters(Me
         Set<io.swagger.v3.oas.annotations.Parameters> apiParamerersDoc = AnnotatedElementUtils
                 .findAllMergedAnnotations(method, io.swagger.v3.oas.annotations.Parameters.class);
         Map<String, io.swagger.v3.oas.annotations.Parameter> apiParamerersMap = apiParamerersDoc.stream()
-                .flatMap(x -> Stream.of(x.value())).collect(Collectors.toMap(x -> x.name(), x -> x));
+                .flatMap(x -> Stream.of(x.value())).collect(Collectors.toMap(io.swagger.v3.oas.annotations.Parameter::name, x -> x));
 
         Set<io.swagger.v3.oas.annotations.Parameters> apiParametersDocDeclaringClass = AnnotatedElementUtils
-                .findAllMergedAnnotations(method, io.swagger.v3.oas.annotations.Parameters.class);
+                .findAllMergedAnnotations(declaringClass, io.swagger.v3.oas.annotations.Parameters.class);
         apiParamerersMap.putAll(apiParametersDocDeclaringClass.stream()
-                .flatMap(x -> Stream.of(x.value())).collect(Collectors.toMap(x -> x.name(), x -> x)));
+                .flatMap(x -> Stream.of(x.value())).collect(Collectors.toMap(io.swagger.v3.oas.annotations.Parameter::name, x -> x)));
 
         Set<io.swagger.v3.oas.annotations.Parameter> apiParamererDoc = AnnotatedElementUtils
                 .findAllMergedAnnotations(method, io.swagger.v3.oas.annotations.Parameter.class);
-        apiParamerersMap.putAll(apiParamererDoc.stream().collect(Collectors.toMap(x -> x.name(), x -> x)));
+        apiParamerersMap.putAll(apiParamererDoc.stream().collect(Collectors.toMap(io.swagger.v3.oas.annotations.Parameter::name, x -> x)));
 
         Set<io.swagger.v3.oas.annotations.Parameter> apiParameterDocDeclaringClass = AnnotatedElementUtils
-                .findAllMergedAnnotations(method, io.swagger.v3.oas.annotations.Parameter.class);
-        apiParamerersMap.putAll(apiParameterDocDeclaringClass.stream().collect(Collectors.toMap(x -> x.name(), x -> x)));
+                .findAllMergedAnnotations(declaringClass, io.swagger.v3.oas.annotations.Parameter.class);
+        apiParamerersMap.putAll(apiParameterDocDeclaringClass.stream().collect(Collectors.toMap(io.swagger.v3.oas.annotations.Parameter::name, x -> x)));
 
         return apiParamerersMap;
     }

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

@@ -4,8 +4,8 @@
 
 class SecuritySchemePair {
 
-    private String key;
-    private SecurityScheme securityScheme;
+    private final String key;
+    private final SecurityScheme securityScheme;
 
     public SecuritySchemePair(String key, SecurityScheme securityScheme) {
         super();

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

@@ -26,9 +26,9 @@
 @Component
 class SpringDocAnnotationsUtils extends AnnotationsUtils {
 
-    static final String COMPONENTS_REF = "#/components/schemas/";
+    private static final String COMPONENTS_REF = "#/components/schemas/";
 
-    private List<ModelConverter> modelConverters;
+    private final List<ModelConverter> modelConverters;
 
     public SpringDocAnnotationsUtils(List<ModelConverter> modelConverters) {
         this.modelConverters = modelConverters;

springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfig.java renamed to springdoc-openapi-common/src/main/java/org/springdoc/core/SwaggerUiConfigProperties.java

@@ -14,12 +14,9 @@
  */
 @Configuration
 @ConfigurationProperties(prefix = "springdoc.swagger-ui")
-public class SwaggerUiConfig {
+public class SwaggerUiConfigProperties {
     // URL to fetch external configuration document from.
     private String configUrl;
-    // The url pointing to API definition (normally
-    // swagger.json/swagger.yaml/openapi.json/openapi.yaml).
-    private String url;
     // If set, enables filtering. The top bar will show an edit box that
     // could be used to filter the tagged operations that are shown.
     private String filter;
@@ -45,12 +42,9 @@ public class SwaggerUiConfig {
     private Boolean showExtensions;
     // Controls the display of extensions
     private Boolean showCommonExtensions;
-    // Set a different validator URL, for example for locally deployed validators
-    private String validatorUrl;
 
     public Map<String, String> getConfigParameters() {
         final Map<String, String> params = new TreeMap<>();
-        put("url", url, params);
         put("configUrl", configUrl, params);
         put("filter", filter, params);
         put("deepLinking", this.deepLinking, params);
@@ -63,7 +57,6 @@ public Map<String, String> getConfigParameters() {
         put("maxDisplayedTags", maxDisplayedTags, params);
         put("showExtensions", showExtensions, params);
         put("showCommonExtensions", showCommonExtensions, params);
-        put("validatorUrl", validatorUrl, params);
         return params;
     }
 
@@ -93,14 +86,6 @@ public void setConfigUrl(String configUrl) {
         this.configUrl = configUrl;
     }
 
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
     public String getFilter() {
         return filter;
     }
@@ -188,12 +173,4 @@ public Boolean getShowCommonExtensions() {
     public void setShowCommonExtensions(Boolean showCommonExtensions) {
         this.showCommonExtensions = showCommonExtensions;
     }
-
-    public String getValidatorUrl() {
-        return validatorUrl;
-    }
-
-    public void setValidatorUrl(String validatorUrl) {
-        this.validatorUrl = validatorUrl;
-    }
-}
+ }

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

@@ -3,7 +3,6 @@
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -19,7 +18,7 @@ public class Pageable {
     @Max(2000)
     private int size;
 
-    private List<String> sort = new ArrayList<>() ;
+    private List<String> sort;
 
     public Pageable(@NotNull @Min(0) int page, @NotNull @Min(1) @Max(2000) int size, List<String> sort) {
         this.page = page;

springdoc-openapi-kotlin/src/main/java/org/springdoc/core/KotlinCoroutinesRequestBuilder.java

@@ -12,7 +12,7 @@
 @Component
 public class KotlinCoroutinesRequestBuilder extends AbstractRequestBuilder {
 
-    private List<AbstractRequestBuilder> requestBuilders;
+    private final List<AbstractRequestBuilder> requestBuilders;
 
     public KotlinCoroutinesRequestBuilder(AbstractParameterBuilder parameterBuilder, RequestBodyBuilder requestBodyBuilder,
                           OperationBuilder operationBuilder, List<AbstractRequestBuilder> requestBuilders) {

springdoc-openapi-ui/src/main/java/org/springdoc/ui/SwaggerWelcome.java

@@ -1,7 +1,7 @@
 package org.springdoc.ui;
 
 import io.swagger.v3.oas.annotations.Operation;
-import org.springdoc.core.SwaggerUiConfig;
+import org.springdoc.core.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -27,7 +27,7 @@ class SwaggerWelcome {
     private String swaggerPath;
 
     @Autowired
-    private SwaggerUiConfig swaggerUiConfig;
+    private SwaggerUiConfigProperties swaggerUiConfig;
 
     @Operation(hidden = true)
     @GetMapping(SWAGGER_UI_PATH)

springdoc-openapi-webflux-ui/src/main/java/org/springdoc/ui/SwaggerWelcome.java

@@ -1,6 +1,6 @@
 package org.springdoc.ui;
 
-import org.springdoc.core.SwaggerUiConfig;
+import org.springdoc.core.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -30,7 +30,7 @@ public class SwaggerWelcome {
     private String webJarsPrefixUrl;
 
     @Autowired
-    private SwaggerUiConfig swaggerUiConfig;
+    private SwaggerUiConfigProperties swaggerUiConfig;
 
     @Bean
     @ConditionalOnProperty(name = SPRINGDOC_SWAGGER_UI_ENABLED, matchIfMissing = true)
@@ -48,7 +48,7 @@ RouterFunction<ServerResponse> routerFunction() {
                 .stream()
                 .reduce(
                         UriComponentsBuilder
-                                .fromUriString(url.toString()),
+                                .fromUriString(url),
                         (b, e) -> b.queryParam(e.getKey(), e.getValue()),
                         (left, right) -> left);
 

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1Test.java

@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springdoc.core.SwaggerUiConfig;
+import org.springdoc.core.SwaggerUiConfigProperties;
 import org.springdoc.ui.SwaggerWelcome;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
@@ -15,7 +15,7 @@
 @RunWith(SpringRunner.class)
 @WebFluxTest
 @ActiveProfiles("test")
-@ContextConfiguration(classes = {SwaggerWelcome.class,SwaggerUiConfig.class})
+@ContextConfiguration(classes = {SwaggerWelcome.class, SwaggerUiConfigProperties.class})
 public class SpringDocApp1Test {
 
     @Autowired

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocTestApp.java

@@ -1,9 +1,7 @@
 package test.org.springdoc.ui.app1;
 
-import org.springdoc.core.SwaggerUiConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
 @SpringBootApplication
 public class SpringDocTestApp {