project update

Author: springdoc

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

@@ -267,8 +267,4 @@ private PathItem buildPathItem(RequestMethod requestMethod, Operation operation,
         }
         return pathItemObject;
     }
-
-    protected void setServerBaseUrl(String setServerBaseUrl) {
-        this.openAPIBuilder.setServerBaseUrl(setServerBaseUrl);
-    }
 }

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

@@ -27,19 +27,11 @@ public final class Constants {
     public static final String TRACE_METHOD = "trace";
     public static final String HEAD_METHOD = "head";
     public static final String OPTIONS_METHOD = "options";
-
     public static final String QUERY_PARAM = "query";
-    public static final String HEADER_PARAM = "header";
-    public static final String COOKIE_PARAM = "cookie";
-    public static final String PATH_PARAM = "path";
-    public static final String FORM_PARAM = "form";
 
     public static final String DEFAULT_DESCRIPTION = "default response";
     public static final String DEFAULT_TITLE = "OpenAPI definition";
     public static final String DEFAULT_VERSION = "v0";
-    public static final String DEFAULT_PROPS_LOCATION = "/swagger.properties";
-    public static final String DEFAULT_LICENSE_VALUE = "Apache 2.0 License";
-    public static final String DEFAULT_LICENSE_URL = "http://www.apache.org/licenses/LICENSE-2.0.html";
     public static final String OPENAPI_STRING_TYPE = "string";
     public static final String OPENAPI_ARRAY_TYPE = "array";
 

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

@@ -46,17 +46,11 @@ public String[] getMethodProduces() {
         return methodProduces;
     }
 
-    public void setMethodProduces(String[] methodProduces) {
-        this.methodProduces = methodProduces;
-    }
 
     public String[] getMethodConsumes() {
         return methodConsumes;
     }
 
-    public void setMethodConsumes(String[] methodConsumes) {
-        this.methodConsumes = methodConsumes;
-    }
 
     public void calculateConsumesProduces(Method method) {
         PostMapping reqPostMappringMethod = ReflectionUtils.getAnnotation(method, PostMapping.class);

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

@@ -44,6 +44,7 @@ public class OpenAPIBuilder {
     private String serverBaseUrl;
     private final Map<HandlerMethod, String> springdocTags = new HashMap<>();
 
+     @SuppressWarnings("WeakerAccess")
      OpenAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context, SecurityParser securityParser) {
         if (openAPI.isPresent()) {
             this.openAPI = openAPI.get();
@@ -120,7 +121,7 @@ public Operation buildTags(HandlerMethod handlerMethod, Operation operation, Ope
             tagsStr.add(springdocTags.get(handlerMethod));
 
         Optional<Set<io.swagger.v3.oas.models.tags.Tag>> tags = AnnotationsUtils
-                .getTags(allTags.toArray(new Tag[allTags.size()]), true);
+                .getTags(allTags.toArray(new Tag[0]), true);
 
         if (tags.isPresent()) {
             Set<io.swagger.v3.oas.models.tags.Tag> tagsSet = tags.get();
@@ -137,7 +138,7 @@ public Operation buildTags(HandlerMethod handlerMethod, Operation operation, Ope
         securityRequirement.ifPresent(securityRequirements -> securityParser.buildSecurityRequirement(securityRequirements, operation));
 
         if (!CollectionUtils.isEmpty(tagsStr))
-            operation.setTags(new ArrayList<String>(tagsStr));
+            operation.setTags(new ArrayList<>(tagsStr));
 
         return operation;
     }

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

@@ -6,7 +6,7 @@ class ParameterInfo {
 
     private String pName;
 
-    private java.lang.reflect.Parameter parameter;
+    private final java.lang.reflect.Parameter parameter;
 
     private io.swagger.v3.oas.annotations.Parameter parameterDoc;
 
@@ -42,18 +42,10 @@ public java.lang.reflect.Parameter getParameter() {
         return parameter;
     }
 
-    public void setParameter(java.lang.reflect.Parameter parameter) {
-        this.parameter = parameter;
-    }
-
     public io.swagger.v3.oas.annotations.Parameter getParameterDoc() {
         return parameterDoc;
     }
 
-    public void setParameterDoc(io.swagger.v3.oas.annotations.Parameter parameterDoc) {
-        this.parameterDoc = parameterDoc;
-    }
-
     public io.swagger.v3.oas.models.parameters.Parameter getParameterModel() {
         return parameterModel;
     }
@@ -66,8 +58,4 @@ public int getIndex() {
         return index;
     }
 
-    public void setIndex(int index) {
-        this.index = index;
-    }
-
 }

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

@@ -17,7 +17,7 @@
 class SecurityParser {
 
     private static boolean isEmpty(io.swagger.v3.oas.annotations.security.OAuthFlows oAuthFlows) {
-        boolean result = false;
+        boolean result;
         if (oAuthFlows == null) {
             result = true;
         } else if (!isEmpty(oAuthFlows.implicit()) || !isEmpty(oAuthFlows.authorizationCode()) || !isEmpty(oAuthFlows.clientCredentials()) || !isEmpty(oAuthFlows.password())) {
@@ -27,7 +27,7 @@ private static boolean isEmpty(io.swagger.v3.oas.annotations.security.OAuthFlows
     }
 
     private static boolean isEmpty(io.swagger.v3.oas.annotations.security.OAuthFlow oAuthFlow) {
-        boolean result = false;
+        boolean result;
         if (oAuthFlow == null) {
             result = true;
         } else if (!StringUtils.isBlank(oAuthFlow.authorizationUrl()) || !StringUtils.isBlank(oAuthFlow.refreshUrl()) || !StringUtils.isBlank(oAuthFlow.tokenUrl()) || !isEmpty(oAuthFlow.scopes())  ) {

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/ActuatorProvider.java

@@ -1,18 +1,20 @@
 package org.springdoc.api;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
 import static org.springdoc.core.Constants.SPRINGDOC_SHOW_ACTUATOR;
 
-@ConditionalOnProperty(name = SPRINGDOC_SHOW_ACTUATOR, matchIfMissing = false)
+@ConditionalOnProperty(name = SPRINGDOC_SHOW_ACTUATOR)
 @Component
 class ActuatorProvider {
 
-    @Autowired
-    private WebMvcEndpointHandlerMapping webMvcEndpointHandlerMapping;
+    private final WebMvcEndpointHandlerMapping webMvcEndpointHandlerMapping;
+
+    public ActuatorProvider(WebMvcEndpointHandlerMapping webMvcEndpointHandlerMapping) {
+        this.webMvcEndpointHandlerMapping = webMvcEndpointHandlerMapping;
+    }
 
     public WebMvcEndpointHandlerMapping getWebMvcHandlerMapping() {
         return webMvcEndpointHandlerMapping;

springdoc-openapi-webmvc-core/src/main/java/org/springdoc/api/OpenApiResource.java

@@ -11,10 +11,10 @@
 import org.springdoc.core.AbstractResponseBuilder;
 import org.springdoc.core.OpenAPIBuilder;
 import org.springdoc.core.OperationBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -37,18 +37,18 @@ public class OpenApiResource extends AbstractOpenApiResource {
 
     private final RequestMappingInfoHandlerMapping requestMappingHandlerMapping;
 
-    @Autowired(required = false)
-    private ActuatorProvider servletContextProvider;
+    private final ActuatorProvider servletContextProvider;
 
     @Value(SPRINGDOC_SHOW_ACTUATOR_VALUE)
     private boolean showActuator;
 
     public OpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
                            AbstractResponseBuilder responseBuilder, OperationBuilder operationParser,
-                           RequestMappingInfoHandlerMapping requestMappingHandlerMapping,
+                           RequestMappingInfoHandlerMapping requestMappingHandlerMapping, @Nullable ActuatorProvider servletContextProvider,
                            List<OpenApiCustomiser> openApiCustomisers) {
         super(openAPIBuilder, requestBuilder, responseBuilder, operationParser, openApiCustomisers);
         this.requestMappingHandlerMapping = requestMappingHandlerMapping;
+        this.servletContextProvider = servletContextProvider;
     }
 
     @Operation(hidden = true)