Add support for Spring Boot 4.0.0-RC1.Fixes #3095

Author: bnasslahsen

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.0-M2</version>
+		<version>4.0.0-RC1</version>
 	</parent>
 
 	<licenses>
@@ -56,12 +56,12 @@
 		</central-publishing-maven-plugin.version>
 		<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
 		<swagger-api.version>2.2.38</swagger-api.version>
-		<swagger-ui.version>5.30.0</swagger-ui.version>
+		<swagger-ui.version>5.30.1</swagger-ui.version>
 		<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>5.0.0-M1</spring-cloud-function.version>
-		<spring-security-oauth2-authorization-server.version>2.0.0-M1
+		<spring-security-oauth2-authorization-server.version>2.0.0-M2
 		</spring-security-oauth2-authorization-server.version>
 		<scalar.version>0.3.12</scalar.version>
 		<skipPublishing>false</skipPublishing>

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

@@ -115,7 +115,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.boot.autoconfigure.web.format.WebConversionService;
-import org.springframework.boot.data.autoconfigure.web.SpringDataWebProperties;
+import org.springframework.boot.data.autoconfigure.web.DataWebProperties;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
@@ -589,7 +589,7 @@ WebConversionServiceProvider webConversionServiceProvider() {
 	/**
 	 * The type Spring doc spring data web properties provider.
 	 */
-	@ConditionalOnClass(SpringDataWebProperties.class)
+	@ConditionalOnClass(DataWebProperties.class)
 	static class SpringDocSpringDataWebPropertiesProvider {
 		/**
 		 * Spring data web properties provider spring data web properties provider.
@@ -600,7 +600,7 @@ static class SpringDocSpringDataWebPropertiesProvider {
 		@Bean
 		@ConditionalOnMissingBean
 		@Lazy(false)
-		SpringDataWebPropertiesProvider springDataWebPropertiesProvider(Optional<SpringDataWebProperties> optionalSpringDataWebProperties) {
+		SpringDataWebPropertiesProvider springDataWebPropertiesProvider(Optional<DataWebProperties> optionalSpringDataWebProperties) {
 			return new SpringDataWebPropertiesProvider(optionalSpringDataWebProperties);
 		}
 	}

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

@@ -28,7 +28,6 @@
 
 import java.util.Optional;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springdoc.core.configuration.hints.SpringDocDataRestHints;
 import org.springdoc.core.converters.models.DefaultPageable;
 import org.springdoc.core.data.DataRestOperationService;
@@ -42,12 +41,11 @@
 import org.springdoc.core.providers.ObjectMapperProvider;
 import org.springdoc.core.providers.SpringRepositoryRestResourceProvider;
 import org.springdoc.core.service.AbstractRequestService;
-import org.springdoc.core.service.GenericParameterService;
 import org.springdoc.core.service.GenericResponseService;
 import org.springdoc.core.service.OpenAPIService;
 import org.springdoc.core.service.OperationService;
-import org.springdoc.core.service.RequestBodyService;
 import org.springdoc.core.utils.SpringDocDataRestUtils;
+import tools.jackson.databind.ObjectMapper;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

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

@@ -27,9 +27,7 @@
 package org.springdoc.core.configuration
 
 import org.springdoc.core.converters.KotlinInlineClassUnwrappingConverter
-import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer
 import org.springdoc.core.customizers.KotlinDeprecatedPropertyCustomizer
-import org.springdoc.core.extractor.DelegatingMethodParameter
 import org.springdoc.core.providers.ObjectMapperProvider
 import org.springdoc.core.utils.Constants
 import org.springdoc.core.utils.SpringDocKotlinUtils
@@ -44,7 +42,6 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Lazy
 import kotlin.coroutines.Continuation
-import kotlin.reflect.full.primaryConstructor
 
 /**
  * The type Spring doc kotlin configuration.

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

@@ -297,16 +297,14 @@ private Type getTypeForCollectionModel(Class returnedEntityType, boolean pagingR
 	 */
 	private Type getTypeForWildcardType(RequestMethod requestMethod, DataRestRepository dataRestRepository, Class returnedEntityType, ParameterizedType parameterizedType) {
 		WildcardType wildcardType = (WildcardType) parameterizedType.getActualTypeArguments()[0];
+		Class<?> type = findType(requestMethod, dataRestRepository);
 		if (wildcardType.getUpperBounds()[0] instanceof ParameterizedType wildcardTypeUpperBound) {
 			if (RepresentationModel.class.equals(wildcardTypeUpperBound.getRawType())) {
-				Class<?> type = findType(requestMethod, dataRestRepository);
 				if (MapModel.class.equals(type))
 					return ResolvableType.forClassWithGenerics(ResponseEntity.class, type).getType();
-				else
-					return resolveGenericType(ResponseEntity.class, type, returnedEntityType);
 			}
 		}
-		return null;
+		return resolveGenericType(ResponseEntity.class, type, returnedEntityType);
 	}
 
 	/**

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

@@ -0,0 +1,51 @@
+package org.springdoc.core.data;
+
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+import org.springframework.hateoas.CollectionModel;
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.hateoas.mediatype.hal.CollectionModelMixin;
+import org.springframework.hateoas.mediatype.hal.LinkMixin;
+import org.springframework.hateoas.mediatype.hal.RepresentationModelMixin;
+import org.springframework.util.Assert;
+
+/**
+ * Jackson 2 module implementation
+ *
+ * @author bnasslahsen
+ */
+public class SpringDocJackson2HalModule extends SimpleModule {
+
+	private static final long serialVersionUID = 7806951456457932384L;
+
+	/**
+	 * Instantiates a new Spring doc jackson 2 hal module.
+	 */
+	public SpringDocJackson2HalModule() {
+
+		super("json-hal-module", new Version(1, 0, 0, null, "org.springframework.hateoas", "spring-hateoas"));
+
+		setMixInAnnotation(Link.class, LinkMixin.class);
+		setMixInAnnotation(RepresentationModel.class, RepresentationModelMixin.class);
+		setMixInAnnotation(CollectionModel.class, CollectionModelMixin.class);
+	}
+
+
+	/**
+	 * Is already registered in boolean.
+	 *
+	 * @param mapper the mapper
+	 * @return the boolean
+	 */
+	public static boolean isAlreadyRegisteredIn(ObjectMapper mapper) {
+
+		Assert.notNull(mapper, "ObjectMapper must not be null!");
+		return LinkMixin.class.equals(mapper.findMixInClassFor(Link.class));
+	}
+	
+
+
+}

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/DataRestHalProvider.java

@@ -28,10 +28,11 @@
 
 import java.util.Optional;
 
+import org.springdoc.core.data.SpringDocJackson2HalModule;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.hateoas.autoconfigure.HateoasProperties;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
-import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
 
 /**
  * The type Data rest hal provider.
@@ -62,8 +63,8 @@ public DataRestHalProvider(Optional<RepositoryRestConfiguration> repositoryRestC
 	public void afterPropertiesSet() {
 		if (!isHalEnabled())
 			return;
-		if (!Jackson2HalModule.isAlreadyRegisteredIn(objectMapperProvider.jsonMapper()))
-			objectMapperProvider.jsonMapper().registerModule(new Jackson2HalModule());
+		if (!SpringDocJackson2HalModule.isAlreadyRegisteredIn(objectMapperProvider.jsonMapper()))
+			objectMapperProvider.jsonMapper().registerModule(new SpringDocJackson2HalModule());
 	}
 
 	@Override

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/HateoasHalProvider.java

@@ -29,9 +29,10 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.springdoc.core.data.SpringDocJackson2HalModule;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.hateoas.autoconfigure.HateoasProperties;
-import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
 import org.springframework.lang.NonNull;
 import org.springframework.util.ReflectionUtils;
 
@@ -103,8 +104,8 @@ public void afterPropertiesSet() {
 			return;
 		}
 		var mapper = objectMapperProvider.jsonMapper();
-		if (!Jackson2HalModule.isAlreadyRegisteredIn(mapper)) {
-			mapper.registerModule(new Jackson2HalModule());
+		if (!SpringDocJackson2HalModule.isAlreadyRegisteredIn(mapper)) {
+			mapper.registerModule(new SpringDocJackson2HalModule());
 		}
 	}
 }

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDataWebPropertiesProvider.java

@@ -27,7 +27,7 @@
 
 import java.util.Optional;
 
-import org.springframework.boot.data.autoconfigure.web.SpringDataWebProperties;
+import org.springframework.boot.data.autoconfigure.web.DataWebProperties;
 
 
 /**
@@ -41,14 +41,14 @@ public class SpringDataWebPropertiesProvider {
 	/**
 	 * The Optional spring data web properties.
 	 */
-	private final Optional<SpringDataWebProperties> optionalSpringDataWebProperties;
+	private final Optional<DataWebProperties> optionalSpringDataWebProperties;
 
 	/**
 	 * Instantiates a new Spring data web properties provider.
 	 *
 	 * @param optionalSpringDataWebProperties the optional spring data web properties
 	 */
-	public SpringDataWebPropertiesProvider(Optional<SpringDataWebProperties> optionalSpringDataWebProperties) {
+	public SpringDataWebPropertiesProvider(Optional<DataWebProperties> optionalSpringDataWebProperties) {
 		this.optionalSpringDataWebProperties = optionalSpringDataWebProperties;
 	}
 
@@ -57,7 +57,7 @@ public SpringDataWebPropertiesProvider(Optional<SpringDataWebProperties> optiona
 	 *
 	 * @return the spring data web properties
 	 */
-	public SpringDataWebProperties getSpringDataWebProperties() {
+	public DataWebProperties getSpringDataWebProperties() {
 		return optionalSpringDataWebProperties.orElse(null);
 	}
 

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringRepositoryRestResourceProvider.java

@@ -34,7 +34,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.models.OpenAPI;
 import org.apache.commons.lang3.reflect.MethodUtils;
@@ -45,6 +44,7 @@
 import org.springdoc.core.data.DataRestRouterOperationService;
 import org.springdoc.core.fn.RouterOperation;
 import org.springdoc.core.utils.SpringDocDataRestUtils;
+import tools.jackson.databind.ObjectMapper;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;