code reivew

Author: bnasslahsen

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

@@ -40,8 +40,6 @@
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;

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

@@ -355,13 +355,26 @@ protected Parameter customiseParameter(Parameter parameter, ParameterInfo parame
 	public boolean isParamToIgnore(MethodParameter parameter) {
 		if (SpringDocAnnotationsUtils.isAnnotationToIgnore(parameter))
 			return true;
-		if ((parameter.getParameterAnnotation(PathVariable.class) != null && parameter.getParameterAnnotation(PathVariable.class).required())
-				|| (parameter.getParameterAnnotation(RequestParam.class) != null && parameter.getParameterAnnotation(RequestParam.class).required())
-				|| (parameter.getParameterAnnotation(org.springframework.web.bind.annotation.RequestBody.class) != null && parameter.getParameterAnnotation(org.springframework.web.bind.annotation.RequestBody.class).required()))
+		if (isRequiredAnnotation(parameter))
 			return false;
 		return isRequestTypeToIgnore(parameter.getParameterType());
 	}
 
+	/**
+	 * Is required annotation boolean.
+	 *
+	 * @param parameter the parameter
+	 * @return the boolean
+	 */
+	private boolean isRequiredAnnotation(MethodParameter parameter) {
+		RequestParam requestParam = parameter.getParameterAnnotation(RequestParam.class);
+		PathVariable pathVariable = parameter.getParameterAnnotation(PathVariable.class);
+		org.springframework.web.bind.annotation.RequestBody requestBody = parameter.getParameterAnnotation(org.springframework.web.bind.annotation.RequestBody.class);
+		return (requestParam != null && requestParam.required())
+				|| (pathVariable != null && pathVariable.required())
+				|| (requestBody != null && requestBody.required());
+	}
+
 	/**
 	 * Sets params.
 	 *

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

@@ -30,6 +30,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -185,7 +186,7 @@ public void buildGenericResponse(Components components, Map<String, Object> find
 	private Map<String, ApiResponse> computeResponseFromDoc(Components components, MethodParameter methodParameter, ApiResponses apiResponsesOp,
 			MethodAttributes methodAttributes) {
 		// Parsing documentation, if present
-		Set<io.swagger.v3.oas.annotations.responses.ApiResponse> responsesArray = getApiResponses(methodParameter.getMethod());
+		Set<io.swagger.v3.oas.annotations.responses.ApiResponse> responsesArray = getApiResponses(Objects.requireNonNull(methodParameter.getMethod()));
 		if (!responsesArray.isEmpty()) {
 			methodAttributes.setWithApiResponseDoc(true);
 			for (io.swagger.v3.oas.annotations.responses.ApiResponse apiResponseAnnotations : responsesArray) {
@@ -271,7 +272,7 @@ private void buildGenericApiResponses(Components components, MethodParameter met
 		else {
 			// Use response parameters with no description filled - No documentation
 			// available
-			String httpCode = evaluateResponseStatus(methodParameter.getMethod(), methodParameter.getMethod().getClass(), true);
+			String httpCode = evaluateResponseStatus(methodParameter.getMethod(), Objects.requireNonNull(methodParameter.getMethod()).getClass(), true);
 			ApiResponse apiResponse = methodAttributes.getGenericMapResponse().containsKey(httpCode) ? methodAttributes.getGenericMapResponse().get(httpCode)
 					: new ApiResponse();
 			if (httpCode != null)
@@ -304,7 +305,7 @@ private void buildApiResponses(Components components, MethodParameter methodPara
 		else {
 			// Use response parameters with no description filled - No documentation
 			// available
-			String httpCode = evaluateResponseStatus(methodParameter.getMethod(), methodParameter.getMethod().getClass(), false);
+			String httpCode = evaluateResponseStatus(methodParameter.getMethod(), Objects.requireNonNull(methodParameter.getMethod()).getClass(), false);
 			ApiResponse apiResponse = new ApiResponse();
 			if (httpCode != null)
 				buildApiResponses(components, methodParameter, apiResponsesOp, methodAttributes, httpCode, apiResponse, false);
@@ -546,19 +547,23 @@ private Map<String, ApiResponse> getGenericMapResponse(Class<?> beanType) {
 	 */
 	private boolean isValidHttpCode(String httpCode, MethodParameter methodParameter) {
 		boolean result = false;
-		Set<io.swagger.v3.oas.annotations.responses.ApiResponse> responseSet = getApiResponses(methodParameter.getMethod());
-		if (isHttpCodePresent(httpCode, responseSet))
-			result = true;
-		else if (AnnotatedElementUtils.findMergedAnnotation(methodParameter.getMethod(),
-				io.swagger.v3.oas.annotations.Operation.class) != null) {
-			io.swagger.v3.oas.annotations.Operation apiOperation = AnnotatedElementUtils.findMergedAnnotation(methodParameter.getMethod(),
-					io.swagger.v3.oas.annotations.Operation.class);
-			responseSet = new HashSet<>(Arrays.asList(apiOperation.responses()));
+		final Method method = methodParameter.getMethod();
+		if(method!=null){
+			Set<io.swagger.v3.oas.annotations.responses.ApiResponse> responseSet = getApiResponses(method);
 			if (isHttpCodePresent(httpCode, responseSet))
 				result = true;
+			else {
+				final io.swagger.v3.oas.annotations.Operation apiOperation = AnnotatedElementUtils.findMergedAnnotation(method,
+						io.swagger.v3.oas.annotations.Operation.class);
+				if (apiOperation != null) {
+					responseSet = new HashSet<>(Arrays.asList(apiOperation.responses()));
+					if (isHttpCodePresent(httpCode, responseSet))
+						result = true;
+				}
+				else if (httpCode.equals(evaluateResponseStatus(method, method.getClass(), false)))
+					result = true;
+			}
 		}
-		else if (httpCode.equals(evaluateResponseStatus(methodParameter.getMethod(), methodParameter.getMethod().getClass(), false)))
-			result = true;
 		return result;
 	}
 

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

@@ -23,6 +23,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.util.Objects;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
@@ -66,7 +67,7 @@ else if (genericType instanceof ParameterizedType) {
 				else if (resolvedType.hasGenerics()) {
 					ResolvableType[] resolvableTypes = resolvedType.getGenerics();
 					resolveType(resolvableTypes, contextClass);
-					return ResolvableType.forClassWithGenerics(resolvedType.getRawClass(), resolvableTypes).getType();
+					return ResolvableType.forClassWithGenerics(Objects.requireNonNull(resolvedType.getRawClass()), resolvableTypes).getType();
 				}
 			}
 		}
@@ -89,7 +90,7 @@ static void resolveType(ResolvableType[] resolvableTypes, Class<?> contextClass)
 			else if (resolvableTypes[i].hasGenerics()) {
 				resolveType(resolvableTypes[i].getGenerics(), contextClass);
 				if (resolvableTypes[i].getRawClass() != null)
-					resolvableTypes[i] = ResolvableType.forClassWithGenerics(resolvableTypes[i].getRawClass(), resolvableTypes[i].getGenerics());
+					resolvableTypes[i] = ResolvableType.forClassWithGenerics(Objects.requireNonNull(resolvableTypes[i].getRawClass()), resolvableTypes[i].getGenerics());
 			}
 		}
 	}

springdoc-openapi-kotlin/src/main/java/org/springdoc/kotlin/KotlinCoroutinesReturnTypeParser.java

@@ -43,6 +43,7 @@ public class KotlinCoroutinesReturnTypeParser implements ReturnTypeParser {
 	public Type getReturnType(MethodParameter methodParameter) {
 		Method method = methodParameter.getMethod();
 		Type returnType = Object.class;
+		assert method != null;
 		Optional<Parameter> continuationParameter = Arrays.stream(method.getParameters())
 				.filter(parameter -> parameter.getType().getCanonicalName().equals(Continuation.class.getCanonicalName()))
 				.findFirst();

springdoc-openapi-security/src/main/java/org/springdoc/security/SpringSecurityOAuth2Provider.java

@@ -21,6 +21,7 @@
 package org.springdoc.security;
 
 import java.util.Map;
+import java.util.Objects;
 
 import org.springdoc.core.SecurityOAuth2Provider;
 
@@ -65,7 +66,7 @@ public Map<RequestMappingInfo, HandlerMethod> getHandlerMethods() {
 
 	@Override
 	public Map getFrameworkEndpoints() {
-		return oauth2EndpointHandlerMapping.getApplicationContext().getBeansWithAnnotation(FrameworkEndpoint.class);
+		return Objects.requireNonNull(oauth2EndpointHandlerMapping.getApplicationContext()).getBeansWithAnnotation(FrameworkEndpoint.class);
 	}
 
 }

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

@@ -24,6 +24,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
@@ -215,7 +216,7 @@ && isPackageToScan(handlerMethod.getBeanType().getPackage()) && isPathToMatch(op
 	 */
 	protected void getWebFluxRouterFunctionPaths() {
 		ApplicationContext applicationContext = requestMappingHandlerMapping.getApplicationContext();
-		Map<String, RouterFunction> routerBeans = applicationContext.getBeansOfType(RouterFunction.class);
+		Map<String, RouterFunction> routerBeans = Objects.requireNonNull(applicationContext).getBeansOfType(RouterFunction.class);
 		for (Map.Entry<String, RouterFunction> entry : routerBeans.entrySet()) {
 			RouterFunction routerFunction = entry.getValue();
 			RouterFunctionVisitor routerFunctionVisitor = new RouterFunctionVisitor();