PR review

Author: bnasslahsen

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve compatibility of springdoc-openapi-data-rest with Spring Webflux #477
 - Improve support of  Swagger UI to use provided spec.yml #480
 - Delegate primitive type generation to swagger-core
+- spring-boot 1, end of compatibility: https://spring.io/blog/2018/07/30/spring-boot-1-x-eol-aug-1st-2019
 ### Fixed
 - Wrong schema mapping with inheritance. Fixes #489
 

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

@@ -46,8 +46,6 @@ public final class Constants {
 
 	public static final String SPRINGDOC_SWAGGER_UI_URL = "springdoc.swagger-ui.url";
 
-	public static final String SPRINGDOC_QDSLPREDICATE_MODE = "springdoc.qdslpredicate.mode";
-
 	public static final String NULL = ":#{null}";
 
 	public static final String MVC_SERVLET_PATH = "${spring.mvc.servlet.path"+ NULL +"}";

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

@@ -18,8 +18,11 @@
 
 package org.springdoc.core;
 
+import java.util.Optional;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.querydsl.core.types.Predicate;
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.converter.ResolvedSchema;
@@ -31,6 +34,7 @@
 import org.springdoc.core.converters.RepresentationModelLinksOASMixin;
 import org.springdoc.core.customisers.QuerydslPredicateOperationCustomizer;
 import org.springdoc.core.customizers.OpenApiCustomiser;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -42,8 +46,6 @@
 import org.springframework.hateoas.Links;
 import org.springframework.hateoas.RepresentationModel;
 
-import java.util.Optional;
-
 import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
 import static org.springdoc.core.SpringDocUtils.getConfig;
 
@@ -57,13 +59,17 @@ public class SpringDocDataRestConfiguration {
 	}
 
 	@Configuration
-	@ConditionalOnClass(value = {QuerydslBindingsFactory.class})
+	@ConditionalOnClass(value = { QuerydslBindingsFactory.class })
 	class QuerydslProvider {
 
 		@Bean
 		public QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory,
-																								 LocalVariableTableParameterNameDiscoverer localVariableTableParameterNameDiscoverer) {
-			return querydslBindingsFactory.isPresent() ? new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get(), localVariableTableParameterNameDiscoverer) : null;
+				LocalVariableTableParameterNameDiscoverer localVariableTableParameterNameDiscoverer) {
+			if (querydslBindingsFactory.isPresent()) {
+				getConfig().addRequestWrapperToIgnore(Predicate.class);
+				return new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get(), localVariableTableParameterNameDiscoverer);
+			}
+			return null;
 		}
 	}
 
@@ -85,7 +91,8 @@ public HalProvider halProvider(Optional<RepositoryRestConfiguration> repositoryR
 		@Bean
 		public OpenApiCustomiser linksSchemaCustomiser(Optional<RepositoryRestConfiguration> repositoryRestConfiguration) {
 			if (!repositoryRestConfiguration.isPresent() || !repositoryRestConfiguration.get().useHalAsDefaultJsonMediaType()) {
-				return openApi -> {};
+				return openApi -> {
+				};
 			}
 			Json.mapper().addMixIn(RepresentationModel.class, RepresentationModelLinksOASMixin.class);