DATACOUCH-588 - Part 2 of framework changes. Add support for projection and distinct.

Support for projection is only for properties of the top-level entity. For instance, in UserSubmission, only the properties below can be specified in the projection. Projection support does not provide means of specifying something like address.street - you can only project (or not project) the whole address property. However, the address type in your resultType could have a subset of the properties in Address.

If the corresponding submissions in the resultType contained only the userId property

public class UserSubmission extends ComparableEntity {
	private String id;
	private String username;
	private List<String> roles;
	private Address address;
	private List<Submission> submissions;

Support for Distinct - I have appropriated the MongoDB model for Distinct.  It defines a separate DistinctOperationSupport class (within ExecutableFindByQuerySupport) which supports the distinct( distinctFields ) api and execution. The DistinctOperationSupport class has only a distinctFields member, and a 'delegate' member, which is an ExecutableFindByQuerySupport object. TBH, I don't see the advantage over simply adding a distinctFields member to ExecutableFindByQuerySupport

Amend #1 - changes as discussed in Pull Request
         - clean up test entity types

Amend #2
- Eliminate DistinctOperationSupport class. In MongoDB, only distinct on a single field is supported, so the returnType from distinct was very different from the returnType of other query operations (all(), one() etc. (but so is count(), and it doesn't need it's own class)). In Couchbase, distinct on any fields in the entity is allowed - so the returned type could be the domainType or resultType. And as(resultType) still allows any resultType to be specified. This makes it unnecessary to have combinations of interfaces such as DistinctWithProjection and DistinctWithQuery.

- Clean up the interfaces in ExecutableFindByQuery. There are two types of interfaces (a) the TerminatingFindByQuery which has the one(), oneValue() first(), firstValue(), all(), count(), exists() and stream(); and (b) the option interfaces (FindByQueryWithConsistency etc), which are essentially with-er interfaces. The changes are:
1) make all the with-er interfaces base interfaces instead of chaining them together. (I don't know why there isn't simply one interface with all the with-er methods).
2) make the ExecutableFindByQuery interface extend the Terminating interface and all the with-er interfaces.

Amend #3
- Add execution support for collections

Amend #4
- Add tests for collections. This includes a new CollectionAwareIntegrationTests class which extends a new JavaIntegratationTests class which extends the existing ClusterAwareIntegrationTests.
- Fixed up several issues collections issues that were uncovered by the tests.
- Did further cleanup of OperationSupport interfaces.

Author: mikereiche

pom.xml

@@ -197,6 +197,14 @@
             <version>${kotlin}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.0.3</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <repositories>

src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperation.java

@@ -46,28 +46,29 @@ interface TerminatingFindById<T> {
 
 	}
 
-	interface FindByIdWithCollection<T> extends TerminatingFindById<T> {
+	interface FindByIdWithCollection<T> {
 
 		/**
 		 * Allows to specify a different collection than the default one configured.
 		 *
 		 * @param collection the collection to use in this scope.
 		 */
-		TerminatingFindById<T> inCollection(String collection);
+		ExecutableFindById<T> inCollection(String collection);
 
 	}
 
-	interface FindByIdWithProjection<T> extends FindByIdWithCollection<T> {
+	interface FindByIdWithProjection<T> {
 
 		/**
 		 * Load only certain fields for the document.
 		 *
 		 * @param fields the projected fields to load.
 		 */
-		FindByIdWithCollection<T> project(String... fields);
+		ExecutableFindById<T> project(String... fields);
 
 	}
 
-	interface ExecutableFindById<T> extends FindByIdWithProjection<T> {}
+	interface ExecutableFindById<T>
+			extends TerminatingFindById<T>, FindByIdWithCollection<T>, FindByIdWithProjection<T> {}
 
 }

src/main/java/org/springframework/data/couchbase/core/ExecutableFindByIdOperationSupport.java

@@ -15,12 +15,11 @@
  */
 package org.springframework.data.couchbase.core;
 
-import org.springframework.data.couchbase.core.ReactiveFindByIdOperationSupport.ReactiveFindByIdSupport;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
+import org.springframework.data.couchbase.core.ReactiveFindByIdOperationSupport.ReactiveFindByIdSupport;
 import org.springframework.util.Assert;
 
 public class ExecutableFindByIdOperationSupport implements ExecutableFindByIdOperation {
@@ -63,13 +62,13 @@ public Collection<? extends T> all(final Collection<String> ids) {
 		}
 
 		@Override
-		public TerminatingFindById<T> inCollection(final String collection) {
+		public ExecutableFindById<T> inCollection(final String collection) {
 			Assert.hasText(collection, "Collection must not be null nor empty.");
 			return new ExecutableFindByIdSupport<>(template, domainType, collection, fields);
 		}
 
 		@Override
-		public FindByIdWithCollection<T> project(String... fields) {
+		public ExecutableFindById<T> project(String... fields) {
 			Assert.notEmpty(fields, "Fields must not be null nor empty.");
 			return new ExecutableFindByIdSupport<>(template, domainType, collection, Arrays.asList(fields));
 		}

src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperation.java

@@ -21,6 +21,7 @@
 
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.couchbase.core.query.Query;
+import org.springframework.data.couchbase.core.query.QueryCriteriaDefinition;
 import org.springframework.lang.Nullable;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
@@ -107,40 +108,90 @@ default Optional<T> first() {
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	interface FindByQueryWithQuery<T> extends TerminatingFindByQuery<T> {
+	interface FindByQueryWithQuery<T> {
 
 		/**
 		 * Set the filter for the query to be used.
 		 *
 		 * @param query must not be {@literal null}.
 		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
-		TerminatingFindByQuery<T> matching(Query query);
+		ExecutableFindByQuery<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link QueryCriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link ExecutableFindByQuery}.
+		 * @throws IllegalArgumentException if criteria is {@literal null}.
+		 */
+		default ExecutableFindByQuery<T> matching(QueryCriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 
 	}
 
-	interface FindByQueryConsistentWith<T> extends FindByQueryWithQuery<T> {
+	interface FindByQueryConsistentWith<T> {
 
 		/**
 		 * Allows to override the default scan consistency.
 		 *
 		 * @param scanConsistency the custom scan consistency to use for this query.
 		 */
-		FindByQueryConsistentWith<T> consistentWith(QueryScanConsistency scanConsistency);
+		ExecutableFindByQuery<T> consistentWith(QueryScanConsistency scanConsistency);
 
 	}
 
-	interface FindByQueryInCollection<T> extends FindByQueryConsistentWith<T> {
+	interface FindByQueryInCollection<T> {
 
 		/**
 		 * Allows to override the default scan consistency.
 		 *
 		 * @param collection the collection to use for this query.
 		 */
-		FindByQueryInCollection<T> inCollection(String collection);
+		ExecutableFindByQuery<T> inCollection(String collection);
+
+	}
+
+	/**
+	 * Result type override (Optional).
+	 */
+	interface FindByQueryWithProjection<T> {
+
+		/**
+		 * Define the target type fields should be mapped to. <br />
+		 * Skip this step if you are anyway only interested in the original domain type.
+		 *
+		 * @param resultType must not be {@literal null}.
+		 * @param <R> result type.
+		 * @return new instance of {@link FindByQueryWithProjection}.
+		 * @throws IllegalArgumentException if resultType is {@literal null}.
+		 */
+		<R> ExecutableFindByQuery<R> as(Class<R> resultType);
 
 	}
 
-	interface ExecutableFindByQuery<T> extends FindByQueryInCollection<T> {}
+	/**
+	 * Distinct Find support.
+	 */
+	interface FindByQueryDistinct<T> {
+
+		/**
+		 * Finds the distinct values for a specified {@literal field} across a single collection
+		 *
+		 * @param distinctFields name of the field. Must not be {@literal null}.
+		 * @return new instance of {@link ExecutableFindByQuery}.
+		 * @throws IllegalArgumentException if field is {@literal null}.
+		 */
+		ExecutableFindByQuery<T> distinct(String[] distinctFields);
+
+	}
+
+	/**
+	 * {@link ExecutableFindByQuery} provides methods for constructing lookup operations in a fluent way.
+	 */
+
+	interface ExecutableFindByQuery<T> extends TerminatingFindByQuery<T>, FindByQueryWithQuery<T>,
+			FindByQueryConsistentWith<T>, FindByQueryInCollection<T>, FindByQueryWithProjection<T>, FindByQueryDistinct<T> {}
 
 }

src/main/java/org/springframework/data/couchbase/core/ExecutableFindByQueryOperationSupport.java

@@ -20,6 +20,7 @@
 
 import org.springframework.data.couchbase.core.ReactiveFindByQueryOperationSupport.ReactiveFindByQuerySupport;
 import org.springframework.data.couchbase.core.query.Query;
+import org.springframework.util.Assert;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
 
@@ -41,28 +42,33 @@ public ExecutableFindByQueryOperationSupport(final CouchbaseTemplate template) {
 
 	@Override
 	public <T> ExecutableFindByQuery<T> findByQuery(final Class<T> domainType) {
-		return new ExecutableFindByQuerySupport<>(template, domainType, ALL_QUERY, QueryScanConsistency.NOT_BOUNDED,
-				"_default._default");
+		return new ExecutableFindByQuerySupport<T>(template, domainType, domainType, ALL_QUERY,
+				QueryScanConsistency.NOT_BOUNDED, null, null);
 	}
 
 	static class ExecutableFindByQuerySupport<T> implements ExecutableFindByQuery<T> {
 
 		private final CouchbaseTemplate template;
-		private final Class<T> domainType;
+		private final Class<?> domainType;
+		private final Class<T> returnType;
 		private final Query query;
 		private final ReactiveFindByQuerySupport<T> reactiveSupport;
 		private final QueryScanConsistency scanConsistency;
 		private final String collection;
+		private final String[] distinctFields;
 
-		ExecutableFindByQuerySupport(final CouchbaseTemplate template, final Class<T> domainType, final Query query,
-				final QueryScanConsistency scanConsistency, final String collection) {
+		ExecutableFindByQuerySupport(final CouchbaseTemplate template, final Class<?> domainType, final Class<T> returnType,
+				final Query query, final QueryScanConsistency scanConsistency, final String collection,
+				final String[] distinctFields) {
 			this.template = template;
 			this.domainType = domainType;
+			this.returnType = returnType;
 			this.query = query;
-			this.reactiveSupport = new ReactiveFindByQuerySupport<T>(template.reactive(), domainType, query, scanConsistency,
-					collection);
+			this.reactiveSupport = new ReactiveFindByQuerySupport<T>(template.reactive(), domainType, returnType, query,
+					scanConsistency, collection, distinctFields);
 			this.scanConsistency = scanConsistency;
 			this.collection = collection;
+			this.distinctFields = distinctFields;
 		}
 
 		@Override
@@ -81,24 +87,43 @@ public List<T> all() {
 		}
 
 		@Override
-		public TerminatingFindByQuery<T> matching(final Query query) {
+		public ExecutableFindByQuery<T> matching(final Query query) {
 			QueryScanConsistency scanCons;
 			if (query.getScanConsistency() != null) {
 				scanCons = query.getScanConsistency();
 			} else {
 				scanCons = scanConsistency;
 			}
-			return new ExecutableFindByQuerySupport<>(template, domainType, query, scanCons, collection);
+			return new ExecutableFindByQuerySupport<>(template, domainType, returnType, query, scanCons, collection,
+					distinctFields);
 		}
 
 		@Override
-		public FindByQueryConsistentWith<T> consistentWith(final QueryScanConsistency scanConsistency) {
-			return new ExecutableFindByQuerySupport<>(template, domainType, query, scanConsistency, collection);
+		public ExecutableFindByQuery<T> consistentWith(final QueryScanConsistency scanConsistency) {
+			return new ExecutableFindByQuerySupport<>(template, domainType, returnType, query, scanConsistency, collection,
+					distinctFields);
 		}
 
 		@Override
-		public FindByQueryInCollection<T> inCollection(final String collection) {
-			return new ExecutableFindByQuerySupport<>(template, domainType, query, scanConsistency, collection);
+		public ExecutableFindByQuery<T> inCollection(final String collection) {
+			Assert.hasText(collection, "Collection must not be null nor empty.");
+			return new ExecutableFindByQuerySupport<>(template, domainType, returnType, query, scanConsistency, collection,
+					distinctFields);
+		}
+
+		@Override
+		public <R> ExecutableFindByQuery<R> as(Class<R> returnType) {
+			Assert.notNull(returnType, "returnType must not be null!");
+
+			return new ExecutableFindByQuerySupport<R>(template, domainType, returnType, query, scanConsistency, collection,
+					distinctFields);
+		}
+
+		@Override
+		public ExecutableFindByQuery<T> distinct(String[] distinctFields) {
+			Assert.notNull(distinctFields, "distinctFields must not be null!");
+			return new ExecutableFindByQuerySupport<>(template, domainType, returnType, query, scanConsistency, collection,
+					distinctFields);
 		}
 
 		@Override
@@ -115,7 +140,6 @@ public long count() {
 		public boolean exists() {
 			return count() > 0;
 		}
-
 	}
 
 }

src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperation.java

@@ -31,24 +31,32 @@ interface TerminatingRemoveByQuery<T> {
 
 	}
 
-	interface RemoveByQueryWithQuery<T> extends TerminatingRemoveByQuery<T> {
+	interface RemoveByQueryWithQuery<T> {
 
-		TerminatingRemoveByQuery<T> matching(Query query);
+		ExecutableRemoveByQuery<T> matching(Query query);
 
 	}
 
-	interface RemoveByQueryConsistentWith<T> extends RemoveByQueryWithQuery<T> {
+	interface RemoveByQueryConsistentWith<T> {
 
-		RemoveByQueryWithQuery<T> consistentWith(QueryScanConsistency scanConsistency);
+		@Deprecated
+		ExecutableRemoveByQuery<T> consistentWith(QueryScanConsistency scanConsistency);
+
+	}
+
+	interface RemoveByQueryWithConsistency<T> {
+
+		ExecutableRemoveByQuery<T> withConsistency(QueryScanConsistency scanConsistency);
 
 	}
 
 	interface RemoveByQueryInCollection<T> extends RemoveByQueryConsistentWith<T> {
 
-		RemoveByQueryConsistentWith<T> inCollection(String collection);
+		ExecutableRemoveByQuery<T> inCollection(String collection);
 
 	}
 
-	interface ExecutableRemoveByQuery<T> extends RemoveByQueryInCollection<T> {}
+	interface ExecutableRemoveByQuery<T> extends TerminatingRemoveByQuery<T>, RemoveByQueryWithQuery<T>,
+			RemoveByQueryWithConsistency<T>, RemoveByQueryInCollection<T> {}
 
 }

src/main/java/org/springframework/data/couchbase/core/ExecutableRemoveByQueryOperationSupport.java

@@ -21,6 +21,7 @@
 import org.springframework.data.couchbase.core.query.Query;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
+import org.springframework.util.Assert;
 
 public class ExecutableRemoveByQueryOperationSupport implements ExecutableRemoveByQueryOperation {
 
@@ -35,7 +36,7 @@ public ExecutableRemoveByQueryOperationSupport(final CouchbaseTemplate template)
 	@Override
 	public <T> ExecutableRemoveByQuery<T> removeByQuery(Class<T> domainType) {
 		return new ExecutableRemoveByQuerySupport<>(template, domainType, ALL_QUERY, QueryScanConsistency.NOT_BOUNDED,
-				"_default._default");
+				null);
 	}
 
 	static class ExecutableRemoveByQuerySupport<T> implements ExecutableRemoveByQuery<T> {
@@ -64,17 +65,24 @@ public List<RemoveResult> all() {
 		}
 
 		@Override
-		public TerminatingRemoveByQuery<T> matching(final Query query) {
+		public ExecutableRemoveByQuery<T> matching(final Query query) {
 			return new ExecutableRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
 
 		@Override
-		public RemoveByQueryWithQuery<T> consistentWith(final QueryScanConsistency scanConsistency) {
+		@Deprecated
+		public ExecutableRemoveByQuery<T> consistentWith(final QueryScanConsistency scanConsistency) {
 			return new ExecutableRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
 
 		@Override
-		public RemoveByQueryInCollection<T> inCollection(final String collection) {
+		public ExecutableRemoveByQuery<T> withConsistency(final QueryScanConsistency scanConsistency) {
+			return new ExecutableRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
+		}
+
+		@Override
+		public ExecutableRemoveByQuery<T> inCollection(final String collection) {
+			Assert.hasText(collection, "Collection must not be null nor empty.");
 			return new ExecutableRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
 

src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperation.java

@@ -56,7 +56,7 @@ interface FindByIdWithCollection<T> extends TerminatingFindById<T> {
 		 *
 		 * @param collection the collection to use in this scope.
 		 */
-		TerminatingFindById<T> inCollection(String collection);
+		ReactiveFindById<T> inCollection(String collection);
 	}
 
 	interface FindByIdWithProjection<T> extends FindByIdWithCollection<T> {
@@ -66,10 +66,10 @@ interface FindByIdWithProjection<T> extends FindByIdWithCollection<T> {
 		 *
 		 * @param fields the projected fields to load.
 		 */
-		FindByIdWithCollection<T> project(String... fields);
+		ReactiveFindById<T> project(String... fields);
 
 	}
 
-	interface ReactiveFindById<T> extends FindByIdWithProjection<T> {}
+	interface ReactiveFindById<T> extends TerminatingFindById<T>, FindByIdWithCollection<T>, FindByIdWithProjection<T> {}
 
 }