Merge branch 'datacouch_1288_querydsl_support' of github.com:spring-projects/spring-data-couchbase into datacouch_1288_querydsl_support

Author: mikereiche

pom.xml

@@ -22,9 +22,6 @@
         <couchbase.osgi>3.2.5</couchbase.osgi>
         <springdata.commons>2.7.0-SNAPSHOT</springdata.commons>
         <java-module-name>spring.data.couchbase</java-module-name>
-        <apt>1.1.3</apt>
-        <querydsl>5.0.0</querydsl>
-        <mysema.querydsl>3.7.4</mysema.querydsl>
     </properties>
 
     <dependencyManagement>
@@ -45,6 +42,7 @@
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-apt</artifactId>
             <version>${querydsl}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -170,10 +168,9 @@
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
             <version>${javax-annotation-api}</version>
+            <scope>test</scope>
         </dependency>
 
-        <!-- -addmods java.annotations.common -->
-
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-se</artifactId>
@@ -223,6 +220,12 @@
             <version>4.0.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.10</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
@@ -333,24 +336,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/generated-test-sources</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQueryDSL.java renamed to src/main/java/com/querydsl/couchbase/document/AbstractCouchbaseQuery.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.querydsl.core.types.dsl.CollectionPathBase;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.data.couchbase.core.mapping.CouchbaseDocument;
 import org.springframework.data.couchbase.core.query.QueryCriteriaDefinition;
@@ -47,43 +48,38 @@
  * @author Michael Reiche
  */
 
-public abstract class AbstractCouchbaseQueryDSL<Q extends AbstractCouchbaseQueryDSL<Q>> implements SimpleQuery<Q> {
+public abstract class AbstractCouchbaseQuery<Q extends AbstractCouchbaseQuery<Q>> implements SimpleQuery<Q> {
 	private final CouchbaseDocumentSerializer serializer;
 	private final QueryMixin<Q> queryMixin;// = new QueryMixin(this, new DefaultQueryMetadata(), false);
-	// TODO private ReadPreference readPreference;
 
-	public AbstractCouchbaseQueryDSL(CouchbaseDocumentSerializer serializer) {
+	public AbstractCouchbaseQuery(CouchbaseDocumentSerializer serializer) {
 		this.serializer = serializer;
 		@SuppressWarnings("unchecked") // Q is this plus subclass
 		Q query = (Q) this;
 		this.queryMixin = new QueryMixin<Q>(query, new DefaultQueryMetadata(), false);
 	}
 
 	/**
-	 * mongodb uses createQuery(Predicate filter) where the serializer creates the 'query' <br>
-	 * and then uses the result to create a BasicQuery with queryObject = result <br>
 	 * Couchbase Query has a 'criteria' which is a <br>
 	 * List<QueryCriteriaDefinition> criteria <br>
 	 * so we could create a List&lt;QueryCriteriaDefinition&gt; or an uber QueryCriteria that combines <br>
 	 * all the sub QueryDefinitions in the filter.
 	 */
 	protected QueryCriteriaDefinition createCriteria(Predicate predicate) {
-		// mongodb uses createQuery(Predicate filter) where the serializer creates the 'queryObject' of the BasicQuery
 		return predicate != null ? (QueryCriteriaDefinition) this.serializer.handle(predicate) : null;
 	}
 
-	// TODO - need later
-	// public <T> JoinBuilder<Q, T> join(Path<T> ref, Path<T> target) {
-	// return new JoinBuilder(this.queryMixin, ref, target);
-	// }
+	public <T> JoinBuilder<Q, T> join(Path<T> ref, Path<T> target) {
+		return new JoinBuilder(this.queryMixin, ref, target);
+	}
 
-	// public <T> JoinBuilder<Q, T> join(CollectionPathBase<?, T, ?> ref, Path<T> target) {
-	// return new JoinBuilder(this.queryMixin, ref, target);
-	// }
+	public <T> JoinBuilder<Q, T> join(CollectionPathBase<?, T, ?> ref, Path<T> target) {
+		return new JoinBuilder(this.queryMixin, ref, target);
+	}
 
-	// public <T> AnyEmbeddedBuilder<Q> anyEmbedded(Path<? extends Collection<T>> collection, Path<T> target) {
-	// return new AnyEmbeddedBuilder(this.queryMixin, collection);
-	// }
+	 public <T> AnyEmbeddedBuilder<Q> anyEmbedded(Path<? extends Collection<T>> collection, Path<T> target) {
+	 return new AnyEmbeddedBuilder(this.queryMixin, collection);
+	 }
 
 	@Nullable
 	protected Predicate createFilter(QueryMetadata metadata) {
@@ -107,12 +103,13 @@ protected Predicate createJoinFilter(QueryMetadata metadata) {
 			Path<?> target = (Path) ((Operation) join.getTarget()).getArg(1);
 			Predicate extraFilters = (Predicate) predicates.get(target.getRoot());
 			Predicate filter = ExpressionUtils.allOf(new Predicate[] { join.getCondition(), extraFilters });
-			List<? extends Object> ids = this.getIds(target.getType(), filter);
+			List<? extends Object> ids = this.getIds(source, target, filter);
 			if (ids.isEmpty()) {
-				throw new AbstractCouchbaseQueryDSL.NoResults();
+				throw new AbstractCouchbaseQuery.NoResults();
 			}
 
-			Path<?> path = ExpressionUtils.path(String.class, source, "$id");
+			Path<?> path = ExpressionUtils.path(String.class, source, "id");
+			path = ExpressionUtils.path(String.class, "meta().id");
 			predicates.merge(source.getRoot(),
 					ExpressionUtils.in(path, (Collection) ids/* TODO was just ids without casting to Collection */),
 					ExpressionUtils::and);
@@ -126,7 +123,10 @@ private Predicate allOf(Collection<Predicate> predicates) {
 		return predicates != null ? ExpressionUtils.allOf(predicates) : null;
 	}
 
-	protected abstract List<Object> getIds(Class<?> var1, Predicate var2);
+	//protected abstract List<Object> getIds(Class<?> var1, Predicate var2);
+
+	protected abstract List<Object> getIds(Path<?> source, Path<?> target, Predicate var2);
+
 
 	public Q distinct() {
 		return this.queryMixin.distinct();
@@ -182,13 +182,9 @@ protected Map<String, String> createProjection(Expression<?> projection) {
 	}
 
 	protected CouchbaseDocument createQuery(@Nullable Predicate predicate) {
-		return predicate != null ? (CouchbaseDocument) this.serializer.handle(predicate) : new CouchbaseDocument();
+		return predicate != null ? new CouchbaseDocument(this.serializer.handle(predicate).toString()) : new CouchbaseDocument();
 	}
 
-	// public void setReadPreference(ReadPreference readPreference) {
-	// this.readPreference = readPreference;
-	// }
-
 	protected QueryMixin<Q> getQueryMixin() {
 		return this.queryMixin;
 	}
@@ -197,10 +193,6 @@ protected CouchbaseDocumentSerializer getSerializer() {
 		return this.serializer;
 	}
 
-	// protected ReadPreference getReadPreference() {
-	// return this.readPreference;
-	// }
-
 	public CouchbaseDocument asDocument() {
 		return this.createQuery(this.queryMixin.getMetadata().getWhere());
 	}

src/main/java/com/querydsl/couchbase/document/AnyEmbeddedBuilder.java

@@ -0,0 +1,27 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+package com.querydsl.couchbase.document;
+
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.ExpressionUtils;
+import com.querydsl.core.types.Path;
+import com.querydsl.core.types.Predicate;
+import java.util.Collection;
+
+public class AnyEmbeddedBuilder<Q extends AbstractCouchbaseQuery<Q>> {
+  private final QueryMixin<Q> queryMixin;
+  private final Path<? extends Collection<?>> collection;
+
+  public AnyEmbeddedBuilder(QueryMixin<Q> queryMixin, Path<? extends Collection<?>> collection) {
+    this.queryMixin = queryMixin;
+    this.collection = collection;
+  }
+
+  public Q on(Predicate... conditions) {
+    return this.queryMixin.where(ExpressionUtils.predicate(CouchbaseOps.ELEM_MATCH, new Expression[]{this.collection, ExpressionUtils.allOf(conditions)}));
+  }
+}