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

Author: bnasslahsen

pom.xml

@@ -69,7 +69,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-function.version>4.0.0-M1</spring-cloud-function.version>
 	</properties>

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

@@ -212,15 +212,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
@@ -1326,4 +1317,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-starter-common/src/main/java/org/springdoc/core/service/GenericResponseService.java

@@ -109,25 +109,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.
 	 *
@@ -636,4 +622,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-starter-common/src/main/java/org/springdoc/core/utils/SpringDocUtils.java

@@ -33,6 +33,7 @@
 import org.springdoc.core.extractor.MethodParameterPojoExtractor;
 import org.springdoc.core.service.AbstractRequestService;
 import org.springdoc.core.service.GenericParameterService;
+import org.springdoc.core.service.GenericResponseService;
 
 /**
  * The type Spring doc utils.
@@ -304,5 +305,28 @@ 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-starter-webmvc-api/src/main/java/org/springdoc/webmvc/core/configuration/SpringDocWebMvcConfiguration.java

@@ -65,10 +65,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.utils.Constants.SPRINGDOC_ENABLED;
 import static org.springdoc.core.utils.Constants.SPRINGDOC_USE_MANAGEMENT_PORT;
+import static org.springdoc.core.utils.SpringDocUtils.getConfig;
 
 /**
  * The type Spring doc web mvc configuration.
@@ -80,6 +83,10 @@
 @ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
 public class SpringDocWebMvcConfiguration {
 
+	static {
+		getConfig().setResponseEntityExceptionHandlerClass(ResponseEntityExceptionHandler.class)
+				.setModelAndViewClass(ModelAndView.class);
+	}
 	/**
 	 * Open api resource open api resource.
 	 *