failed to load api definition after spring boot 3.4.0-M2. Fixes #2687

Author: bnasslahsen

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.0</version>
+		<version>3.4.0-M3</version>
 	</parent>
 
 	<licenses>
@@ -65,8 +65,8 @@
 		<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
 		<jjwt.version>0.9.1</jjwt.version>
 		<therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
-		<spring-cloud-function.version>4.1.2</spring-cloud-function.version>
-		<spring-security-oauth2-authorization-server.version>1.3.0</spring-security-oauth2-authorization-server.version>
+		<spring-cloud-function.version>4.2.0-M1</spring-cloud-function.version>
+		<spring-security-oauth2-authorization-server.version>1.4.0-M2</spring-security-oauth2-authorization-server.version>
 	</properties>
 
 	<dependencyManagement>
@@ -319,6 +319,14 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 	</repositories>
 	<pluginRepositories>
 		<pluginRepository>

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java

@@ -74,7 +74,6 @@
 import org.springdoc.core.filters.GlobalOpenApiMethodFilter;
 import org.springdoc.core.filters.OpenApiMethodFilter;
 import org.springdoc.core.models.GroupedOpenApi;
-import org.springdoc.core.parsers.ReturnTypeParser;
 import org.springdoc.core.properties.SpringDocConfigProperties;
 import org.springdoc.core.providers.ActuatorProvider;
 import org.springdoc.core.providers.CloudFunctionProvider;
@@ -361,18 +360,7 @@ RequestBodyService requestBodyBuilder(GenericParameterService parameterBuilder,
 	SecurityService securityParser(PropertyResolverUtils propertyResolverUtils) {
 		return new SecurityService(propertyResolverUtils);
 	}
-
-	/**
-	 * Generic return type parser return type parser.
-	 *
-	 * @return the return type parser
-	 */
-	@Bean
-	@Lazy(false)
-	ReturnTypeParser genericReturnTypeParser() {
-		return new ReturnTypeParser() {};
-	}
-
+	
 	/**
 	 * Parameter builder generic parameter builder.
 	 *

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration/SpringDocKotlinConfiguration.kt

@@ -2,7 +2,6 @@ package org.springdoc.core.configuration
 
 import io.swagger.v3.oas.annotations.Parameter
 import org.springdoc.core.customizers.ParameterCustomizer
-import org.springdoc.core.parsers.KotlinCoroutinesReturnTypeParser
 import org.springdoc.core.utils.Constants
 import org.springdoc.core.utils.SpringDocUtils
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
@@ -46,18 +45,6 @@ class SpringDocKotlinConfiguration() {
 			.addDeprecatedType(Deprecated::class.java)
 	}
 
-	/**
-	 * Kotlin coroutines return type parser kotlin coroutines return type parser.
-	 *
-	 * @return the kotlin coroutines return type parser
-	 */
-	@Bean
-	@Lazy(false)
-	@ConditionalOnMissingBean
-	fun kotlinCoroutinesReturnTypeParser(): KotlinCoroutinesReturnTypeParser {
-		return KotlinCoroutinesReturnTypeParser()
-	}
-
 	/**
 	 * Kotlin springdoc-openapi ParameterCustomizer
 	 *

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/data/DataRestResponseService.java

@@ -39,10 +39,10 @@
 import io.swagger.v3.oas.models.responses.ApiResponse;
 import io.swagger.v3.oas.models.responses.ApiResponses;
 import org.springdoc.core.models.MethodAttributes;
-import org.springdoc.core.parsers.ReturnTypeParser;
 import org.springdoc.core.service.GenericResponseService;
 import org.springdoc.core.utils.SpringDocDataRestUtils;
 
+import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.data.rest.core.mapping.MethodResourceMapping;
@@ -197,7 +197,7 @@ private void addResponse(RequestMethod requestMethod, String operationPath, ApiR
 	 */
 	private Type findSearchReturnType(MethodResourceMapping methodResourceMapping, Class<?> domainType) {
 		Type returnType;
-		Type returnRepoType = ReturnTypeParser.resolveType(methodResourceMapping.getMethod().getGenericReturnType(), methodResourceMapping.getMethod().getDeclaringClass());
+		Type returnRepoType = GenericTypeResolver.resolveType(methodResourceMapping.getMethod().getGenericReturnType(), methodResourceMapping.getMethod().getDeclaringClass());
 		if (methodResourceMapping.isPagingResource()) {
 			returnType = resolveGenericType(PagedModel.class, EntityModel.class, domainType);
 		}
@@ -224,7 +224,7 @@ else if (ClassUtils.isPrimitiveOrWrapper(methodResourceMapping.getReturnedDomain
 	 * @return the type
 	 */
 	private Type getType(MethodParameter methodParameterReturn, RequestMethod requestMethod, DataRestRepository dataRestRepository, ResourceMetadata resourceMetadata) {
-		Type returnType = ReturnTypeParser.resolveType(methodParameterReturn.getGenericParameterType(), methodParameterReturn.getContainingClass());
+		Type returnType = GenericTypeResolver.resolveType(methodParameterReturn.getGenericParameterType(), methodParameterReturn.getContainingClass());
 		Class returnedEntityType = dataRestRepository.getReturnType();
 
 		if (returnType instanceof ParameterizedType) {
@@ -240,7 +240,7 @@ else if ((HttpEntity.class.equals(parameterizedType.getRawType())
 				}
 			}
 			else if ((CollectionModel.class.equals(parameterizedType.getRawType())
-					&& Object.class.equals(parameterizedType.getActualTypeArguments()[0]))) {
+					&& parameterizedType.getActualTypeArguments()[0]!=null)) {
 				return getTypeForCollectionModel(returnedEntityType, resourceMetadata.isPagingResource());
 			}
 		}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/extractor/MethodParameterPojoExtractor.java

@@ -52,8 +52,8 @@
 
 import io.swagger.v3.core.util.PrimitiveType;
 import io.swagger.v3.oas.annotations.Parameter;
-import org.springdoc.core.parsers.ReturnTypeParser;
 
+import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
 
 import static org.springdoc.core.utils.Constants.DOT;
@@ -158,7 +158,7 @@ private static Stream<MethodParameter> fromGetterOfField(Class<?> paramClass, Fi
 	private static Class<?> extractType(Class<?> paramClass, Field field) {
 		Class<?> type = field.getType();
 		if (field.getGenericType() instanceof TypeVariable<?>) {
-			Type fieldType = ReturnTypeParser.resolveType(field.getGenericType(), paramClass);
+			Type fieldType = GenericTypeResolver.resolveType(field.getGenericType(), paramClass);
 
 			if (fieldType instanceof Class<?>)
 				type = (Class<?>) fieldType;