Improve compatibility of springdoc-openapi-data-rest with Spring Webflux. Fixes #477.

Author: bnasslahsen

springdoc-openapi-data-rest/pom.xml

@@ -16,8 +16,8 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-rest</artifactId>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-rest-core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
@@ -35,6 +35,11 @@
 			<artifactId>spring-boot-starter-hateoas</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-rest</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>

springdoc-openapi-data-rest/src/main/java/org/springdoc/core/SpringDocDataRestConfiguration.java

@@ -18,6 +18,8 @@
 
 package org.springdoc.core;
 
+import java.util.Optional;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import io.swagger.v3.core.converter.AnnotatedType;
@@ -49,16 +51,18 @@ public class SpringDocDataRestConfiguration {
 
 	static {
 		getConfig().replaceWithClass(org.springframework.data.domain.Pageable.class, Pageable.class)
-		.replaceWithClass(org.springframework.data.domain.PageRequest.class,Pageable.class);
+				.replaceWithClass(org.springframework.data.domain.PageRequest.class, Pageable.class);
 	}
 
 	@Configuration
 	@ConditionalOnClass(RepositoryRestConfiguration.class)
 	class HalProviderConfiguration {
 
 		@Bean
-		public HalProvider halProvider(RepositoryRestConfiguration repositoryRestConfiguration) {
-			return new HalProvider(repositoryRestConfiguration);
+		public HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
+			if (repositoryRestConfiguration.isPresent())
+				return new HalProvider(repositoryRestConfiguration.get());
+			return null;
 		}
 
 		/**
@@ -68,8 +72,8 @@ public HalProvider halProvider(RepositoryRestConfiguration repositoryRestConfigu
 		 * @see org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalLinkListSerializer#serialize(Links, JsonGenerator, SerializerProvider)
 		 */
 		@Bean
-		public OpenApiCustomiser linksSchemaCustomiser(RepositoryRestConfiguration repositoryRestConfiguration) {
-			if (!repositoryRestConfiguration.useHalAsDefaultJsonMediaType()) {
+		public OpenApiCustomiser linksSchemaCustomiser(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
+			if (!repositoryRestConfiguration.isPresent() || !repositoryRestConfiguration.get().useHalAsDefaultJsonMediaType()) {
 				return openApi -> {};
 			}
 			Json.mapper().addMixIn(RepresentationModel.class, RepresentationModelLinksOASMixin.class);