code review + upgrade spring-boot to 2.6.4 and spring-native 0.11.3

Author: bnasslahsen

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.2</version>
+		<version>2.6.4</version>
 	</parent>
 
 	<licenses>
@@ -77,7 +77,7 @@
 		<jaxb-impl.version>2.1</jaxb-impl.version>
 		<javax.jws-api.version>1.1</javax.jws-api.version>
 		<jjwt.version>0.9.1</jjwt.version>
-		<spring-native.version>0.11.1</spring-native.version>
+		<spring-native.version>0.11.3</spring-native.version>
 		<therapi-runtime-javadoc.version>0.13.0</therapi-runtime-javadoc.version>
 		<spring-cloud.version>2021.0.0</spring-cloud.version>
 		<spring-cloud-netflix.version>2.2.10.RELEASE</spring-cloud-netflix.version>

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

@@ -210,15 +210,6 @@ public abstract class AbstractOpenApiResource extends SpecFilter {
 	 */
 	protected final SpringDocProviders springDocProviders;
 
-	static {
-		try {
-			modelAndViewClass = Class.forName("org.springframework.web.servlet.ModelAndView");
-		}
-		catch (ClassNotFoundException classNotFoundException) {
-			LOGGER.trace(classNotFoundException.getMessage());
-		}
-	}
-
 	/**
 	 * Instantiates a new Abstract open api resource.
 	 * @param groupName the group name
@@ -1324,4 +1315,13 @@ private void sortOutput(ObjectMapper objectMapper) {
 		objectMapper.addMixIn(OpenAPI.class, SortedOpenAPIMixin.class);
 		objectMapper.addMixIn(Schema.class, SortedSchemaMixin.class);
 	}
+
+	/**
+	 * Sets model and view class.
+	 *
+	 * @param modelAndViewClass the model and view class
+	 */
+	public static void setModelAndViewClass(Class<?> modelAndViewClass) {
+		AbstractOpenApiResource.modelAndViewClass = modelAndViewClass;
+	}
 }

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

@@ -101,25 +101,11 @@ public class GenericResponseService {
 	 */
 	private List<ControllerAdviceInfo> controllerAdviceInfos = new ArrayList<>();
 
-	/**
-	 * The constant LOGGER.
-	 */
-	private static final Logger LOGGER = LoggerFactory.getLogger(GenericResponseService.class);
-
 	/**
 	 * The Response entity exception handler class.
 	 */
 	private static Class<?> responseEntityExceptionHandlerClass;
 
-	static {
-		try {
-			responseEntityExceptionHandlerClass = Class.forName("org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler");
-		}
-		catch (ClassNotFoundException classNotFoundException) {
-			LOGGER.trace(classNotFoundException.getMessage());
-		}
-	}
-
 	/**
 	 * Instantiates a new Generic response builder.
 	 *
@@ -628,4 +614,12 @@ private boolean isHttpCodePresent(String httpCode, Set<io.swagger.v3.oas.annotat
 		return !responseSet.isEmpty() && responseSet.stream().anyMatch(apiResponseAnnotations -> httpCode.equals(apiResponseAnnotations.responseCode()));
 	}
 
+	/**
+	 * Sets response entity exception handler class.
+	 *
+	 * @param responseEntityExceptionHandlerClass the response entity exception handler class
+	 */
+	public static void setResponseEntityExceptionHandlerClass(Class<?> responseEntityExceptionHandlerClass) {
+		GenericResponseService.responseEntityExceptionHandlerClass = responseEntityExceptionHandlerClass;
+	}
 }

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

@@ -299,5 +299,27 @@ public SpringDocUtils replaceParameterObjectWithClass(Class source, Class target
 		AdditionalModelsConverter.replaceParameterObjectWithClass(source, target);
 		return this;
 	}
+
+	/**
+	 * Sets response entity exception handler class.
+	 *
+	 * @param clazz the clazz
+	 * @return the response entity exception handler class
+	 */
+	public SpringDocUtils setResponseEntityExceptionHandlerClass(Class<?> clazz) {
+		GenericResponseService.setResponseEntityExceptionHandlerClass(clazz);
+		return this;
+	}
+
+	/**
+	 * Sets model and view class.
+	 *
+	 * @param clazz the clazz
+	 * @return the model and view class
+	 */
+	public SpringDocUtils setModelAndViewClass(Class<?> clazz) {
+		AbstractOpenApiResource.setModelAndViewClass(clazz);
+		return this;
+	}
 }
 

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

@@ -59,10 +59,13 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
+import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.function.RouterFunction;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
 import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
 import static org.springdoc.core.Constants.SPRINGDOC_USE_MANAGEMENT_PORT;
+import static org.springdoc.core.SpringDocUtils.getConfig;
 
 /**
  * The type Spring doc web mvc configuration.
@@ -74,6 +77,11 @@
 @ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
 public class SpringDocWebMvcConfiguration {
 
+	static {
+		getConfig().setResponseEntityExceptionHandlerClass(ResponseEntityExceptionHandler.class)
+				.setModelAndViewClass(ModelAndView.class);
+	}
+
 	/**
 	 * Open api resource open api resource.
 	 *
@@ -132,7 +140,7 @@ RequestService requestBuilder(GenericParameterService parameterBuilder, RequestB
 	@Bean
 	@ConditionalOnMissingBean
 	@Lazy(false)
-	SpringWebProvider springWebProvider(){
+	SpringWebProvider springWebProvider() {
 		return new SpringWebMvcProvider();
 	}
 
@@ -237,7 +245,7 @@ OpenApiActuatorResource openApiActuatorResource(ObjectFactory<OpenAPIService> op
 			return new OpenApiActuatorResource(openAPIBuilderObjectFactory,
 					requestBuilder, responseBuilder,
 					operationParser,
-					operationCustomizers, openApiCustomisers,methodFilters,
+					operationCustomizers, openApiCustomisers, methodFilters,
 					springDocConfigProperties, springDocProviders);
 		}
 	}