@QuerydslPredicate(root = X.class) annotation at Controller Method le…

…vel not getting documented in Spring Boot 3. Fixes #2326
springdoc · Aug 6, 2023 · f1ac0b4 · f1ac0b4
1 parent cdde2ac
commit f1ac0b4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 25 deletions.
diff --git a/...starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java b/...starter-common/src/main/java/org/springdoc/core/configuration/SpringDocConfiguration.java
@@ -33,6 +33,7 @@
 import java.util.Optional;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.querydsl.core.types.Predicate;
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.models.Components;
@@ -63,6 +64,7 @@
 import org.springdoc.core.customizers.OpenApiCustomizer;
 import org.springdoc.core.customizers.OperationCustomizer;
 import org.springdoc.core.customizers.PropertyCustomizer;
+import org.springdoc.core.customizers.QuerydslPredicateOperationCustomizer;
 import org.springdoc.core.customizers.RouterOperationCustomizer;
 import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
 import org.springdoc.core.customizers.SpringDocCustomizers;
@@ -110,6 +112,7 @@
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.data.querydsl.binding.QuerydslBindingsFactory;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -617,4 +620,29 @@ public SpringDocCustomizers springDocCustomizers(Optional<List<OpenApiCustomizer
 				 dataRestRouterOperationCustomizers,
 				 methodFilters, globalOpenApiCustomizers, globalOperationCustomizers, globalOpenApiMethodFilters);
 	}
+
+	/**
+	 * The type Querydsl provider.
+	 * @author bnasslashen
+	 */
+	@ConditionalOnClass(value = QuerydslBindingsFactory.class)
+	static class QuerydslProvider {
+
+		/**
+		 * Query dsl querydsl predicate operation customizer querydsl predicate operation customizer.
+		 *
+		 * @param querydslBindingsFactory the querydsl bindings factory
+		 * @return the querydsl predicate operation customizer
+		 */
+		@Bean
+		@ConditionalOnMissingBean
+		@Lazy(false)
+		QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
+			if (querydslBindingsFactory.isPresent()) {
+				getConfig().addRequestWrapperToIgnore(Predicate.class);
+				return new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get());
+			}
+			return null;
+		}
+	}
 }
diff --git a/...common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java b/...common/src/main/java/org/springdoc/core/configuration/SpringDocDataRestConfiguration.java
@@ -240,29 +240,4 @@ SpringDocDataRestUtils springDocDataRestUtils(LinkRelationProvider linkRelationP
 		}
 	}
 
-	/**
-	 * The type Querydsl provider.
-	 * @author bnasslashen
-	 */
-	@ConditionalOnClass(value = { QuerydslBindingsFactory.class })
-	class QuerydslProvider {
-
-		/**
-		 * Query dsl querydsl predicate operation customizer querydsl predicate operation customizer.
-		 *
-		 * @param querydslBindingsFactory the querydsl bindings factory
-		 * @return the querydsl predicate operation customizer
-		 */
-		@Bean
-		@ConditionalOnMissingBean
-		@Lazy(false)
-		QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory) {
-			if (querydslBindingsFactory.isPresent()) {
-				getConfig().addRequestWrapperToIgnore(Predicate.class);
-				return new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get());
-			}
-			return null;
-		}
-	}
-
 }