replaced dummy entities with actual entities and prevented code from generating duplicate params

Author: gibahjoe

springdoc-openapi-data-rest/pom.xml

@@ -24,6 +24,11 @@
 			<artifactId>hibernate-validator</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-core</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-webmvc-core</artifactId>
@@ -56,4 +61,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
+</project>

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

@@ -18,8 +18,6 @@
 
 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;
@@ -33,19 +31,20 @@
 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.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
+import org.springframework.data.querydsl.binding.QuerydslBindingsFactory;
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.hateoas.Link;
 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.Constants.SPRINGDOC_QDSLPREDICATE_MODE;
 import static org.springdoc.core.SpringDocUtils.getConfig;
 
 @Configuration
@@ -57,6 +56,17 @@ public class SpringDocDataRestConfiguration {
 				.replaceWithClass(org.springframework.data.domain.PageRequest.class, Pageable.class);
 	}
 
+	@Configuration
+	@ConditionalOnClass(value = {QuerydslBindingsFactory.class})
+	class QuerydslProvider {
+
+		@Bean
+		public QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomizer(Optional<QuerydslBindingsFactory> querydslBindingsFactory,
+																								 LocalVariableTableParameterNameDiscoverer localVariableTableParameterNameDiscoverer) {
+			return querydslBindingsFactory.isPresent() ? new QuerydslPredicateOperationCustomizer(querydslBindingsFactory.get(), localVariableTableParameterNameDiscoverer) : null;
+		}
+	}
+
 	@Configuration
 	@ConditionalOnClass(RepositoryRestConfiguration.class)
 	class HalProviderConfiguration {

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

@@ -88,6 +88,11 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) {
             fieldsToAdd.addAll(aliases);
             fieldsToAdd.addAll(whiteList);
             for (String fieldName : fieldsToAdd) {
+                //dont generate parameters with duplicate names
+                Parameter existingParamWithSameName = getParameterFromOperationByName(operationParameters, fieldName);
+                if (existingParamWithSameName != null) {
+                    continue;
+                }
                 Type type = getFieldType(fieldName, pathSpecMap, predicate.root());
                 io.swagger.v3.oas.models.parameters.Parameter newParameter = buildParam(type, fieldName);
 

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app100/ChildEntity.java

@@ -0,0 +1,83 @@
+package test.org.springdoc.api.app100;
+
+import javax.persistence.*;
+
+/**
+ * @author gibah
+ */
+
+@Entity
+public class Country {
+
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @Basic
+    @Column(nullable = false)
+    private String name;
+
+    @Basic
+    private String shortName;
+
+    @Basic
+    private String dialingCode;
+
+    @Basic
+    @Column(unique = true, nullable = false)
+    private String codeISO3166;
+
+    @Basic
+    @Column(nullable = false)
+    @Enumerated(EnumType.STRING)
+    private SpringDocApp100Test.Status status;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public String getDialingCode() {
+        return dialingCode;
+    }
+
+    public void setDialingCode(String dialingCode) {
+        this.dialingCode = dialingCode;
+    }
+
+    public String getCodeISO3166() {
+        return codeISO3166;
+    }
+
+    public void setCodeISO3166(String codeISO3166) {
+        this.codeISO3166 = codeISO3166;
+    }
+
+    public SpringDocApp100Test.Status getStatus() {
+        return status;
+    }
+
+    public Country setStatus(SpringDocApp100Test.Status status) {
+        this.status = status;
+        return this;
+    }
+}

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app100/Country.java

@@ -0,0 +1,48 @@
+package test.org.springdoc.api.app100;
+
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.PathMetadata;
+import com.querydsl.core.types.dsl.EntityPathBase;
+import com.querydsl.core.types.dsl.EnumPath;
+import com.querydsl.core.types.dsl.NumberPath;
+import com.querydsl.core.types.dsl.StringPath;
+
+import javax.annotation.Generated;
+
+import static com.querydsl.core.types.PathMetadataFactory.forVariable;
+
+
+/**
+ * QCountry is a Querydsl query type for Country
+ */
+@Generated("com.querydsl.codegen.EntitySerializer")
+public class QCountry extends EntityPathBase<Country> {
+
+    public static final QCountry country = new QCountry("country");
+    private static final long serialVersionUID = -1184258693L;
+    public final StringPath codeISO3166 = createString("codeISO3166");
+
+    public final StringPath dialingCode = createString("dialingCode");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final StringPath shortName = createString("shortName");
+
+    public final EnumPath<SpringDocApp100Test.Status> status = createEnum("status", SpringDocApp100Test.Status.class);
+
+    public QCountry(String variable) {
+        super(Country.class, forVariable(variable));
+    }
+
+    public QCountry(Path<? extends Country> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QCountry(PathMetadata metadata) {
+        super(Country.class, metadata);
+    }
+
+}
+

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app100/DummyEntity.java

@@ -56,17 +56,18 @@ public GreetingController greetingController() {
     public static class GreetingController {
 
         @GetMapping("/test")
-        public ResponseEntity<?> sayHello2(@QuerydslPredicate(bindings = DummyEntityPredicate.class, root = DummyEntity.class) Predicate predicate,
+        public ResponseEntity<?> sayHello2(@QuerydslPredicate(bindings = CountryPredicate.class, root = Country.class) Predicate predicate,
                                            @RequestParam List<Status> statuses) {
             return ResponseEntity.ok().build();
         }
     }
 
-    public static class DummyEntityPredicate implements QuerydslBinderCustomizer<QDummyEntity> {
+    public static class CountryPredicate implements QuerydslBinderCustomizer<QCountry> {
 
         @Override
-        public void customize(QuerydslBindings querydslBindings, QDummyEntity qDummyEntity) {
-            querydslBindings.bind(qDummyEntity.code).as("notCode").first((path, value) -> path.containsIgnoreCase(value));
+        public void customize(QuerydslBindings querydslBindings, QCountry qCountry) {
+            querydslBindings.bind(qCountry.codeISO3166).as("code").first((path, value) -> path.containsIgnoreCase(value));
+            querydslBindings.bind(qCountry.dialingCode).as("postCode").first((path, value) -> path.containsIgnoreCase(value));
         }
     }
 }