Skip to content

Commit ba6da56

Browse files
author
bnasslahsen
committed
code cleanup
1 parent 2e9756a commit ba6da56

File tree

6 files changed

+20
-34
lines changed

6 files changed

+20
-34
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ public final class Constants {
1616
public static final String SPRINGDOC_SWAGGER_UI_ENABLED = "springdoc.swagger-ui.enabled";
1717
public static final String SPRINGDOC_SWAGGER_UI_CONFIG_URL ="springdoc.swagger-ui.configUrl";
1818
public static final String SPRINGDOC_SWAGGER_UI_URL ="springdoc.swagger-ui.url";
19-
public static final String SPRINGDOC_SWAGGER_UI_URL_VALUE ="${" + SPRINGDOC_SWAGGER_UI_URL + ":#{null}}";
19+
public static final String NULL = ":#{null}";
20+
public static final String SPRINGDOC_SWAGGER_UI_URL_VALUE ="${" + SPRINGDOC_SWAGGER_UI_URL + NULL +"}";
2021
public static final String SPRINGDOC_OAUTH2_REDIRECT_URL ="springdoc.swagger-ui.oauth2RedirectUrl";
21-
public static final String SPRINGDOC_OAUTH2_REDIRECT_URL_VALUE ="${" + SPRINGDOC_OAUTH2_REDIRECT_URL + ":#{null}}";
22-
public static final String SPRINGDOC_SWAGGER_UI_CONFIG_URL_VALUE ="${" + SPRINGDOC_SWAGGER_UI_CONFIG_URL + ":#{null}}";
22+
public static final String SPRINGDOC_OAUTH2_REDIRECT_URL_VALUE ="${" + SPRINGDOC_OAUTH2_REDIRECT_URL + NULL +"}";
23+
public static final String SPRINGDOC_SWAGGER_UI_CONFIG_URL_VALUE ="${" + SPRINGDOC_SWAGGER_UI_CONFIG_URL+ NULL +"}";
2324
public static final String SPRINGDOC_SHOW_ACTUATOR = "springdoc.show-actuator";
24-
public static final String SPRINGDOC_SHOW_ACTUATOR_VALUE = "${" + SPRINGDOC_SHOW_ACTUATOR + ":false}";
25-
public static final String SPRINGDOC_PACKAGES_TO_SCAN = "${springdoc.packages-to-scan:#{null}}";
26-
public static final String SPRINGDOC_PATHS_TO_MATCH = "${springdoc.paths-to-match:#{null}}";
25+
public static final String SPRINGDOC_PACKAGES_TO_SCAN = "${springdoc.packages-to-scan"+ NULL +"}";
26+
public static final String SPRINGDOC_PATHS_TO_MATCH = "${springdoc.paths-to-match"+ NULL +"}";
2727
public static final String SPRINGDOC_ACTUATOR_TAG = "Actuator";
2828
public static final String SPRINGDOC_ACTUATOR_DESCRIPTION = "Monitor and interact";
2929
public static final String SPRINGDOC_ACTUATOR_DOC_URL = "https://docs.spring.io/spring-boot/docs/current/actuator-api/html/";
@@ -35,7 +35,7 @@ public final class Constants {
3535
public static final String APPLICATION_OPENAPI_YAML = "application/vnd.oai.openapi";
3636
public static final String DEFAULT_SWAGGER_UI_PATH = DEFAULT_PATH_SEPARATOR + "swagger-ui.html";
3737
public static final String SWAGGER_UI_PATH = "${springdoc.swagger-ui.path:#{T(org.springdoc.core.Constants).DEFAULT_SWAGGER_UI_PATH}}";
38-
public static final String MVC_SERVLET_PATH = "${spring.mvc.servlet.path:#{null}}";
38+
public static final String MVC_SERVLET_PATH = "${spring.mvc.servlet.path"+ NULL +"}";
3939
public static final String GET_METHOD = "get";
4040
public static final String POST_METHOD = "post";
4141
public static final String PUT_METHOD = "put";

‎springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocPropertiesUtils.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,27 @@
66
import java.util.List;
77
import java.util.Map;
88

9-
public abstract class SpringDocPropertiesUtils {
9+
public interface SpringDocPropertiesUtils {
1010

11-
private SpringDocPropertiesUtils() { }
12-
13-
public static void put(String name, List<String> value, Map<String, Object> params) {
11+
static void put(String name, List<String> value, Map<String, Object> params) {
1412
if (!CollectionUtils.isEmpty(value)) {
1513
params.put(name, value);
1614
}
1715
}
1816

19-
public static void put(final String name, final Integer value, final Map<String, Object> params) {
17+
static void put(final String name, final Integer value, final Map<String, Object> params) {
2018
if (value != null) {
2119
params.put(name, value.toString());
2220
}
2321
}
2422

25-
public static void put(final String name, final Boolean value, final Map<String, Object> params) {
23+
static void put(final String name, final Boolean value, final Map<String, Object> params) {
2624
if (value != null) {
2725
params.put(name, value.toString());
2826
}
2927
}
3028

31-
public static void put(final String name, final String value, final Map<String, Object> params) {
29+
static void put(final String name, final String value, final Map<String, Object> params) {
3230
if (!StringUtils.isEmpty(value)) {
3331
params.put(name, value);
3432
}

‎springdoc-openapi-ui/src/main/java/org/springdoc/ui/SwaggerIndexTransformer.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ private String addInitOauth(String html) throws JsonProcessingException {
4646
String json = objectMapper.writeValueAsString(swaggerUiOAuthProperties.getConfigParameters());
4747
stringBuilder.append(json);
4848
stringBuilder.append(")");
49-
String result = html.replace("window.ui = ui", stringBuilder.toString());
50-
return result;
49+
return html.replace("window.ui = ui", stringBuilder.toString());
5150
}
5251

5352
private String readFullyAsString(InputStream inputStream)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Tag getTag() {
3535
return actuatorTag;
3636
}
3737

38-
public boolean isRestController(Map<String, Object> restControllers, HandlerMethod handlerMethod, String operationPath) {
38+
public boolean isRestController(String operationPath) {
3939
return operationPath.startsWith(AntPathMatcher.DEFAULT_PATH_SEPARATOR);
4040
}
4141

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

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
import io.swagger.v3.oas.annotations.Hidden;
99
import io.swagger.v3.oas.annotations.Operation;
1010
import io.swagger.v3.oas.models.OpenAPI;
11-
import org.springdoc.core.AbstractRequestBuilder;
12-
import org.springdoc.core.AbstractResponseBuilder;
13-
import org.springdoc.core.OpenAPIBuilder;
14-
import org.springdoc.core.OperationBuilder;
15-
import org.springdoc.core.SecurityOAuth2Provider;
11+
import org.springdoc.core.*;
1612
import org.springdoc.core.customizers.OpenApiCustomiser;
1713
import org.springframework.beans.factory.annotation.Value;
1814
import org.springframework.core.annotation.AnnotationUtils;
@@ -27,16 +23,9 @@
2723
import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
2824

2925
import javax.servlet.http.HttpServletRequest;
30-
import java.util.HashSet;
31-
import java.util.LinkedHashMap;
32-
import java.util.List;
33-
import java.util.Map;
34-
import java.util.Optional;
35-
import java.util.Set;
36-
37-
import static org.springdoc.core.Constants.API_DOCS_URL;
38-
import static org.springdoc.core.Constants.APPLICATION_OPENAPI_YAML;
39-
import static org.springdoc.core.Constants.DEFAULT_API_DOCS_URL_YAML;
26+
import java.util.*;
27+
28+
import static org.springdoc.core.Constants.*;
4029
import static org.springframework.util.AntPathMatcher.DEFAULT_PATH_SEPARATOR;
4130

4231
@RestController
@@ -111,7 +100,7 @@ private void calculatePath(Map<String, Object> restControllers, Map<RequestMappi
111100
Map<String, String> regexMap = new LinkedHashMap<>();
112101
for (String pattern : patterns) {
113102
String operationPath = PathUtils.parsePath(pattern, regexMap);
114-
if ( ((actuatorProvider.isPresent() && actuatorProvider.get().isRestController(restControllers, handlerMethod, operationPath))
103+
if ( ((actuatorProvider.isPresent() && actuatorProvider.get().isRestController(operationPath))
115104
|| isRestController(restControllers, handlerMethod, operationPath))
116105
&& isPackageToScan(handlerMethod.getBeanType().getPackage().getName())
117106
&& isPathToMatch(operationPath)) {

‎springdoc-openapi-webmvc-core/src/main/java/org/springdoc/core/SpringDocWebMvcConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public ActuatorProvider actuatorProvider(WebMvcEndpointHandlerMapping webMvcEndp
7070
}
7171

7272
@Bean
73-
public OperationCustomizer ActuatorCustomizer(ActuatorProvider actuatorProvider){
73+
public OperationCustomizer actuatorCustomizer(ActuatorProvider actuatorProvider){
7474
return new OperationCustomizer() {
7575

7676
private int methodCount;

0 commit comments

Comments
 (0)