Skip to content

Commit a53cd56

Browse files
bnasslahsenbnasslahsen
committed
code review
1 parent f671dbe commit a53cd56

File tree

13 files changed

+30
-47
lines changed

13 files changed

+30
-47
lines changed

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/converters/SchemaPropertyDeprecatingConverter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
package org.springdoc.core.converters;
2424

2525
import java.lang.annotation.Annotation;
26-
import java.lang.reflect.AnnotatedElement;
2726
import java.lang.reflect.Method;
2827
import java.util.ArrayList;
2928
import java.util.Iterator;

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiConfigParameters.java

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.apache.commons.lang3.StringUtils;
3333
import org.springdoc.core.configuration.SpringDocConfiguration;
3434
import org.springdoc.core.utils.Constants;
35+
import org.springdoc.core.utils.SpringDocPropertiesUtils;
3536

3637
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3738
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -247,30 +248,30 @@ public Map<String, Object> getConfigParameters() {
247248
final Map<String, Object> params = new TreeMap<>();
248249
// empty-string prevents swagger-ui default validation
249250
params.put(VALIDATOR_URL_PROPERTY, validatorUrl != null ? validatorUrl : "");
250-
org.springdoc.core.SpringDocPropertiesUtils.put(CONFIG_URL_PROPERTY, configUrl, params);
251-
org.springdoc.core.SpringDocPropertiesUtils.put(DEEP_LINKING_PROPERTY, this.deepLinking, params);
252-
org.springdoc.core.SpringDocPropertiesUtils.put(DISPLAY_OPERATION_ID_PROPERTY, displayOperationId, params);
253-
org.springdoc.core.SpringDocPropertiesUtils.put("defaultModelsExpandDepth", defaultModelsExpandDepth, params);
254-
org.springdoc.core.SpringDocPropertiesUtils.put("defaultModelExpandDepth", defaultModelExpandDepth, params);
255-
org.springdoc.core.SpringDocPropertiesUtils.put("defaultModelRendering", defaultModelRendering, params);
256-
org.springdoc.core.SpringDocPropertiesUtils.put(DISPLAY_REQUEST_DURATION_PROPERTY, displayRequestDuration, params);
257-
org.springdoc.core.SpringDocPropertiesUtils.put("docExpansion", docExpansion, params);
258-
org.springdoc.core.SpringDocPropertiesUtils.put("maxDisplayedTags", maxDisplayedTags, params);
259-
org.springdoc.core.SpringDocPropertiesUtils.put(SHOW_EXTENSIONS_PROPERTY, showExtensions, params);
260-
org.springdoc.core.SpringDocPropertiesUtils.put(SHOW_COMMON_EXTENSIONS_PROPERTY, showCommonExtensions, params);
261-
org.springdoc.core.SpringDocPropertiesUtils.put("operationsSorter", operationsSorter, params);
262-
org.springdoc.core.SpringDocPropertiesUtils.put("tagsSorter", tagsSorter, params);
263-
org.springdoc.core.SpringDocPropertiesUtils.put(SwaggerUiConfigParameters.LAYOUT_PROPERTY, layout , params);
251+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(CONFIG_URL_PROPERTY, configUrl, params);
252+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(DEEP_LINKING_PROPERTY, this.deepLinking, params);
253+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(DISPLAY_OPERATION_ID_PROPERTY, displayOperationId, params);
254+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("defaultModelsExpandDepth", defaultModelsExpandDepth, params);
255+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("defaultModelExpandDepth", defaultModelExpandDepth, params);
256+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("defaultModelRendering", defaultModelRendering, params);
257+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(DISPLAY_REQUEST_DURATION_PROPERTY, displayRequestDuration, params);
258+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("docExpansion", docExpansion, params);
259+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("maxDisplayedTags", maxDisplayedTags, params);
260+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(SHOW_EXTENSIONS_PROPERTY, showExtensions, params);
261+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(SHOW_COMMON_EXTENSIONS_PROPERTY, showCommonExtensions, params);
262+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("operationsSorter", operationsSorter, params);
263+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("tagsSorter", tagsSorter, params);
264+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(SwaggerUiConfigParameters.LAYOUT_PROPERTY, layout , params);
264265
if (supportedSubmitMethods != null)
265-
org.springdoc.core.SpringDocPropertiesUtils.put("supportedSubmitMethods", supportedSubmitMethods.toString(), params);
266-
org.springdoc.core.SpringDocPropertiesUtils.put(OAUTH2_REDIRECT_URL_PROPERTY, oauth2RedirectUrl, params);
267-
org.springdoc.core.SpringDocPropertiesUtils.put(URL_PROPERTY, url, params);
266+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("supportedSubmitMethods", supportedSubmitMethods.toString(), params);
267+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(OAUTH2_REDIRECT_URL_PROPERTY, oauth2RedirectUrl, params);
268+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(URL_PROPERTY, url, params);
268269
put(URLS_PROPERTY, urls, params);
269-
org.springdoc.core.SpringDocPropertiesUtils.put("urls.primaryName", urlsPrimaryName, params);
270-
org.springdoc.core.SpringDocPropertiesUtils.put(TRY_IT_ENABLED_PROPERTY, tryItOutEnabled, params);
271-
org.springdoc.core.SpringDocPropertiesUtils.put(PERSIST_AUTHORIZATION_PROPERTY, persistAuthorization, params);
272-
org.springdoc.core.SpringDocPropertiesUtils.put(FILTER_PROPERTY, filter, params);
273-
org.springdoc.core.SpringDocPropertiesUtils.put(WITH_CREDENTIALS_PROPERTY, withCredentials, params);
270+
org.springdoc.core.utils.SpringDocPropertiesUtils.put("urls.primaryName", urlsPrimaryName, params);
271+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(TRY_IT_ENABLED_PROPERTY, tryItOutEnabled, params);
272+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(PERSIST_AUTHORIZATION_PROPERTY, persistAuthorization, params);
273+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(FILTER_PROPERTY, filter, params);
274+
org.springdoc.core.utils.SpringDocPropertiesUtils.put(WITH_CREDENTIALS_PROPERTY, withCredentials, params);
274275
return params;
275276
}
276277

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/properties/SwaggerUiOAuthProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import java.util.Map;
2828
import java.util.TreeMap;
2929

30-
import org.springdoc.core.SpringDocPropertiesUtils;
3130
import org.springdoc.core.configuration.SpringDocConfiguration;
31+
import org.springdoc.core.utils.SpringDocPropertiesUtils;
3232

3333
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3434
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericParameterService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,9 @@ Schema calculateSchema(Components components, ParameterInfo parameterInfo, Reque
327327

328328
if (parameterInfo.getParameterModel() == null || parameterInfo.getParameterModel().getSchema() == null) {
329329
Type type = ReturnTypeParser.getType(methodParameter);
330-
if(type instanceof Class && optionalWebConversionServiceProvider.isPresent()){
330+
if(type instanceof Class clazz && optionalWebConversionServiceProvider.isPresent()){
331331
WebConversionServiceProvider webConversionServiceProvider = optionalWebConversionServiceProvider.get();
332-
if (!MethodParameterPojoExtractor.isSwaggerPrimitiveType((Class) type))
332+
if (!MethodParameterPojoExtractor.isSwaggerPrimitiveType(clazz))
333333
type = webConversionServiceProvider.getSpringConvertedType(methodParameter.getParameterType());
334334
}
335335
schemaN = SpringDocAnnotationsUtils.extractSchema(components, type, jsonView, methodParameter.getParameterAnnotations());

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/GenericResponseService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
import io.swagger.v3.oas.models.responses.ApiResponses;
5050
import org.apache.commons.lang3.ArrayUtils;
5151
import org.apache.commons.lang3.StringUtils;
52-
import org.slf4j.Logger;
53-
import org.slf4j.LoggerFactory;
5452
import org.springdoc.core.models.ControllerAdviceInfo;
5553
import org.springdoc.core.models.MethodAttributes;
5654
import org.springdoc.core.parsers.ReturnTypeParser;

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/service/OpenAPIService.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.fasterxml.jackson.databind.ObjectMapper;
4545
import io.swagger.v3.core.jackson.TypeNameResolver;
4646
import io.swagger.v3.core.util.AnnotationsUtils;
47-
import io.swagger.v3.core.util.Json;
4847
import io.swagger.v3.oas.annotations.Hidden;
4948
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
5049
import io.swagger.v3.oas.annotations.security.SecuritySchemes;
@@ -481,9 +480,9 @@ public Schema resolveProperties(Schema schema, Locale locale) {
481480
public void setServerBaseUrl(String serverBaseUrl) {
482481
String customServerBaseUrl = serverBaseUrl;
483482

484-
if (serverBaseUrlCustomizers != null && serverBaseUrlCustomizers.isPresent()) {
485-
for (ServerBaseUrlCustomizer customiser : serverBaseUrlCustomizers.get()) {
486-
customServerBaseUrl = customiser.customize(customServerBaseUrl);
483+
if (serverBaseUrlCustomizers.isPresent()) {
484+
for (ServerBaseUrlCustomizer customizer : serverBaseUrlCustomizers.get()) {
485+
customServerBaseUrl = customizer.customize(customServerBaseUrl);
487486
}
488487
}
489488

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
*/
2020

21-
package org.springdoc.core;
21+
package org.springdoc.core.utils;
2222

2323
import java.util.List;
2424
import java.util.Map;

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app6/SpringDocApp6Test.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
import org.springframework.test.context.TestPropertySource;
3131
import org.springframework.test.web.reactive.server.EntityExchangeResult;
3232

33-
import static org.junit.jupiter.api.Assertions.assertEquals;
34-
import static org.junit.jupiter.api.Assertions.assertTrue;
35-
3633
@TestPropertySource(properties = { "springdoc.swagger-ui.oauth.clientId=myClientId", "springdoc.swagger-ui.disable-swagger-default-url=true" })
3734
public class SpringDocApp6Test extends AbstractSpringDocTest {
3835

‎springdoc-openapi-starter-webflux-ui/src/test/java/test/org/springdoc/ui/app7/SpringDocApp7Test.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
import org.springframework.test.context.TestPropertySource;
3131
import org.springframework.test.web.reactive.server.EntityExchangeResult;
3232

33-
import static org.junit.jupiter.api.Assertions.assertEquals;
34-
import static org.junit.jupiter.api.Assertions.assertTrue;
35-
3633
@TestPropertySource(properties = "springdoc.swagger-ui.disable-swagger-default-url=true")
3734
public class SpringDocApp7Test extends AbstractSpringDocTest {
3835

‎springdoc-openapi-starter-webmvc-api/src/test/java/test/org/springdoc/api/app181/AbstractParameterObject.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package test.org.springdoc.api.app181;
22

3-
import io.swagger.v3.oas.annotations.Parameter;
4-
import io.swagger.v3.oas.annotations.media.Schema;
5-
63
public class AbstractParameterObject<T> {
74

85
int primitiveBaseField;

0 commit comments

Comments
 (0)