chore: act upon SonarQube warnings

Author: Mattias-Sehlstedt

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

@@ -82,6 +82,7 @@
 import io.swagger.v3.oas.models.servers.Server;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.annotations.RouterOperations;
@@ -556,8 +557,9 @@ protected void calculateWebhooks(OpenAPI calculatedOpenAPI, Locale locale) {
                 .filter(clazz -> isPackageToScan(clazz.getPackage()))
                 .toArray(Class<?>[]::new);
         Webhooks[] webhooksAttr = openAPIService.getWebhooks(refinedClasses);
-        if (ArrayUtils.isEmpty(webhooksAttr))
+        if (ArrayUtils.isEmpty(webhooksAttr)) {
 			return;
+		}
 		var webhooks = Arrays.stream(webhooksAttr).map(Webhooks::value).flatMap(Arrays::stream).toArray(Webhook[]::new);
 		Arrays.stream(webhooks).forEach(webhook -> {
 			io.swagger.v3.oas.annotations.Operation apiOperation = webhook.operation();
@@ -683,7 +685,7 @@ protected void calculatePath(HandlerMethod handlerMethod, RouterOperation router
 			// allow for customisation
 			operation = customizeOperation(operation, components, handlerMethod);
 
-			if (StringUtils.contains(operationPath, "*")) {
+			if (Strings.CS.contains(operationPath, "*")) {
 				Matcher matcher = pathPattern.matcher(operationPath);
 				while (matcher.find()) {
 					String pathParam = matcher.group(1);
@@ -1297,7 +1299,7 @@ private PathItem buildPathItem(RequestMethod requestMethod, Operation operation,
 				if (ParameterIn.PATH.toString().equals(parameter.getIn())) {
 					// check it's present in the path
 					String name = parameter.getName();
-					if (!StringUtils.containsAny(operationPath, "{" + name + "}", "{*" + name + "}"))
+					if (!Strings.CS.containsAny(operationPath, "{" + name + "}", "{*" + name + "}"))
 						paramIt.remove();
 				}
 			}

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

@@ -36,8 +36,6 @@
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.core.converter.ModelConverterContext;
 import io.swagger.v3.oas.models.media.Schema;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springdoc.core.providers.ObjectMapperProvider;
 
 import static org.springdoc.core.utils.SpringDocUtils.cloneViaJson;
@@ -65,11 +63,6 @@ public class AdditionalModelsConverter implements ModelConverter {
 	 */
 	private static final Map<Class, Class> paramObjectReplacementMap = new HashMap<>();
 
-	/**
-	 * The constant LOGGER.
-	 */
-	private static final Logger LOGGER = LoggerFactory.getLogger(AdditionalModelsConverter.class);
-
 	/**
 	 * The Spring doc object mapper.
 	 */

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

@@ -203,9 +203,13 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
 	private Schema composePolymorphicSchema(AnnotatedType type, Schema schema, Collection<Schema> schemas) {
 		String ref = schema.get$ref();
 		List<Schema> composedSchemas = findComposedSchemas(ref, schemas);
-		if (composedSchemas.isEmpty()) return schema;
+		if (composedSchemas.isEmpty()) {
+			return schema;
+		}
         ComposedSchema result = new ComposedSchema();
-		if (isConcreteClass(type)) result.addOneOfItem(schema);
+		if (isConcreteClass(type)) {
+			result.addOneOfItem(schema);
+		}
 		JavaType javaType = springDocObjectMapper.jsonMapper().constructType(type.getType());
 		Class<?> clazz = javaType.getRawClass();
 		if (TYPES_TO_SKIP.stream().noneMatch(typeToSkip -> typeToSkip.equals(clazz.getSimpleName())))

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/customizers/QuerydslPredicateOperationCustomizer.java

@@ -57,8 +57,6 @@
 import org.springframework.data.querydsl.binding.QuerydslBindings;
 import org.springframework.data.querydsl.binding.QuerydslBindingsFactory;
 import org.springframework.data.querydsl.binding.QuerydslPredicate;
-import org.springframework.data.util.CastUtils;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.method.HandlerMethod;
@@ -174,12 +172,12 @@ private boolean getFieldValueOfBoolean(QuerydslBindings instance, String fieldNa
 	 * @return the querydsl bindings
 	 */
 	private QuerydslBindings extractQdslBindings(QuerydslPredicate predicate) {
-		ClassTypeInformation<?> classTypeInformation = ClassTypeInformation.from(predicate.root());
-		TypeInformation<?> domainType = classTypeInformation.getRequiredActualType();
+		TypeInformation<?> typeInformation = TypeInformation.of(predicate.root());
+		TypeInformation<?> domainType = typeInformation.getRequiredActualType();
 
 		Optional<Class<? extends QuerydslBinderCustomizer<?>>> bindingsAnnotation = Optional.of(predicate)
 				.map(QuerydslPredicate::bindings)
-				.map(CastUtils::cast);
+				.map(binder -> (Class<? extends QuerydslBinderCustomizer<?>>) binder);
 
 		return bindingsAnnotation
 				.map(it -> querydslBindingsFactory.createBindingsFor(domainType, it))

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

@@ -445,8 +445,7 @@ private void setHeaders(String[] headers) {
 				}
 				else {
 					String key = header.substring(0, neqIdx);
-					if (!this.headers.containsKey(key))
-						this.headers.put(key, StringUtils.EMPTY);
+					this.headers.putIfAbsent(key, StringUtils.EMPTY);
 				}
 			}
 	}

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

@@ -760,8 +760,7 @@ private Map<String, ApiResponse> getGenericMapResponse(HandlerMethod handlerMeth
 					}
 
 					if (addToGenericMap || exceptions.isEmpty()) {
-						methodAdviceInfo.getApiResponses().forEach((key, apiResponse) ->
-								genericApiResponseMap.putIfAbsent(key, apiResponse));
+						methodAdviceInfo.getApiResponses().forEach(genericApiResponseMap::putIfAbsent);
 					}
 				}
 			}

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

@@ -26,7 +26,6 @@
 
 package org.springdoc.core.service;
 
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
@@ -256,7 +255,7 @@ public Optional<RequestBody> buildRequestBodyFromDoc(
 	 */
 	public void calculateRequestBodyInfo(Components components, MethodAttributes methodAttributes,
 			ParameterInfo parameterInfo, RequestBodyInfo requestBodyInfo) {
-		RequestBody requestBody = requestBodyInfo.getRequestBody();
+		RequestBody requestBody;
 		MethodParameter methodParameter = parameterInfo.getMethodParameter();
 
 

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

@@ -492,7 +492,7 @@ private static boolean ctorParamHasAnyAnnotationSimpleName(Field f, Collection<S
 					}
 				}
 			}
-		} catch (Throwable ignored) {
+		} catch (Exception ignored) {
 			// best-effort only
 		}
 		return false;
@@ -525,7 +525,7 @@ private static boolean hasJsonPropertyName(java.lang.reflect.Parameter p, String
 		try {
 			JsonProperty jp = p.getAnnotation(JsonProperty.class);
 			return jp != null && expected.equals(jp.value());
-		} catch (Throwable ignored) {
+		} catch (Exception ignored) {
 			return false;
 		}
 	}
@@ -545,7 +545,9 @@ private static Method findGetter(Field f) {
 		for (String m : names) {
 			try {
 				return f.getDeclaringClass().getMethod(m);
-			} catch (NoSuchMethodException ignored) {}
+			} catch (NoSuchMethodException ignored) {
+				// best-effort only
+			}
 		}
 		return null;
 	}

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

@@ -544,9 +544,10 @@ public static Optional<Map<String, Header>> getHeaders(io.swagger.v3.oas.annotat
 	 * @param javadocProvider the javadoc provider
 	 */
 	public static void clearCache(JavadocProvider javadocProvider) {
-		if (javadocProvider != null)
+		if (javadocProvider != null) {
 			javadocProvider.clearCache();
-		MODEL_CONVERTER_CONTEXT_MAP.remove();;
+		}
+		MODEL_CONVERTER_CONTEXT_MAP.remove();
 	}
 
 	/**

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

@@ -73,7 +73,9 @@ private static Boolean kotlinMarkedNullableFallback(Field f) {
 					return p.getReturnType().isMarkedNullable();
 				}
 			}
-		} catch (Throwable ignored) {}
+		} catch (Exception ignored) {
+			// best-effort only
+		}
 		return null;
 	}
 
@@ -94,7 +96,9 @@ static Boolean kotlinConstructorParamIsOptional(Field f) {
 					}
 				}
 			}
-		} catch (Throwable ignored) {}
+		} catch (Exception ignored) {
+			// best-effort only
+		}
 		return null;
 	}