DATACOUCH-588 - Refactoring part 1 of n.

Author: mikereiche

pom.xml

@@ -85,6 +85,13 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-test</artifactId>
+            <version>3.1.0.RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

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

@@ -41,7 +41,8 @@ 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<>(template, domainType, ALL_QUERY, QueryScanConsistency.NOT_BOUNDED,
+				"_default._default");
 	}
 
 	static class ExecutableFindByQuerySupport<T> implements ExecutableFindByQuery<T> {
@@ -58,7 +59,8 @@ static class ExecutableFindByQuerySupport<T> implements ExecutableFindByQuery<T>
 			this.template = template;
 			this.domainType = domainType;
 			this.query = query;
-			this.reactiveSupport = new ReactiveFindByQuerySupport<T>(template.reactive(), domainType, query, scanConsistency, collection);
+			this.reactiveSupport = new ReactiveFindByQuerySupport<T>(template.reactive(), domainType, query, scanConsistency,
+					collection);
 			this.scanConsistency = scanConsistency;
 			this.collection = collection;
 		}

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

@@ -34,7 +34,8 @@ 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");
+		return new ExecutableRemoveByQuerySupport<>(template, domainType, ALL_QUERY, QueryScanConsistency.NOT_BOUNDED,
+				"_default._default");
 	}
 
 	static class ExecutableRemoveByQuerySupport<T> implements ExecutableRemoveByQuery<T> {
@@ -51,8 +52,8 @@ static class ExecutableRemoveByQuerySupport<T> implements ExecutableRemoveByQuer
 			this.template = template;
 			this.domainType = domainType;
 			this.query = query;
-			this.reactiveSupport = new ReactiveRemoveByQuerySupport<>(template.reactive(), domainType, query,
-					scanConsistency);
+			this.reactiveSupport = new ReactiveRemoveByQuerySupport<>(template.reactive(), domainType, query, scanConsistency,
+					collection);
 			this.scanConsistency = scanConsistency;
 			this.collection = collection;
 		}
@@ -71,6 +72,7 @@ public TerminatingRemoveByQuery<T> matching(final Query query) {
 		public RemoveByQueryWithQuery<T> consistentWith(final QueryScanConsistency scanConsistency) {
 			return new ExecutableRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
+
 		@Override
 		public RemoveByQueryInCollection<T> inCollection(final String collection) {
 			return new ExecutableRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);

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

@@ -113,7 +113,7 @@ interface FindByQueryConsistentWith<T> extends FindByQueryWithQuery<T> {
 	/**
 	 * Collection override (optional).
 	 */
-	interface FindInCollection<T> extends FindByQueryWithQuery<T> {
+	interface FindByQueryInCollection<T> extends FindByQueryWithQuery<T> {
 
 		/**
 		 * Explicitly set the name of the collection to perform the query on. <br />
@@ -123,13 +123,13 @@ interface FindInCollection<T> extends FindByQueryWithQuery<T> {
 		 * @return new instance of {@link FindWithProjection}.
 		 * @throws IllegalArgumentException if collection is {@literal null}.
 		 */
-		FindInCollection<T> inCollection(String collection);
+		FindByQueryInCollection<T> inCollection(String collection);
 	}
 
 	/**
 	 * Result type override (optional).
 	 */
-	interface FindWithProjection<T> extends FindInCollection<T>, FindDistinct {
+	interface FindWithProjection<T> extends FindByQueryInCollection<T>, FindDistinct {
 
 		/**
 		 * Define the target type fields should be mapped to. <br />
@@ -233,6 +233,6 @@ interface TerminatingDistinct<T> extends DistinctWithQuery<T> {
 		Flux<T> all();
 	}
 
-	interface ReactiveFindByQuery<T> extends FindByQueryConsistentWith<T>, FindInCollection<T>, FindDistinct {}
+	interface ReactiveFindByQuery<T> extends FindByQueryConsistentWith<T>, FindByQueryInCollection<T>, FindDistinct {}
 
 }

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

@@ -80,7 +80,7 @@ public FindByQueryConsistentWith<T> consistentWith(QueryScanConsistency scanCons
 		}
 
 		@Override
-		public FindInCollection<T> inCollection(String collection) {
+		public FindByQueryInCollection<T> inCollection(String collection) {
 			return new ReactiveFindByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
 

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

@@ -49,7 +49,6 @@ interface RemoveByIdWithDurability extends RemoveByIdWithCollection, WithDurabil
 
 	}
 
-
 	interface ReactiveRemoveById extends RemoveByIdWithDurability {}
 
 }

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

@@ -38,7 +38,8 @@ public ReactiveRemoveByQueryOperationSupport(final ReactiveCouchbaseTemplate tem
 
 	@Override
 	public <T> ReactiveRemoveByQuery<T> removeByQuery(Class<T> domainType) {
-		return new ReactiveRemoveByQuerySupport<>(template, domainType, ALL_QUERY, QueryScanConsistency.NOT_BOUNDED);
+		return new ReactiveRemoveByQuerySupport<>(template, domainType, ALL_QUERY, QueryScanConsistency.NOT_BOUNDED,
+				"_default._default");
 	}
 
 	static class ReactiveRemoveByQuerySupport<T> implements ReactiveRemoveByQuery<T> {
@@ -47,13 +48,15 @@ static class ReactiveRemoveByQuerySupport<T> implements ReactiveRemoveByQuery<T>
 		private final Class<T> domainType;
 		private final Query query;
 		private final QueryScanConsistency scanConsistency;
+		private final String collection;
 
 		ReactiveRemoveByQuerySupport(final ReactiveCouchbaseTemplate template, final Class<T> domainType, final Query query,
-				final QueryScanConsistency scanConsistency) {
+				final QueryScanConsistency scanConsistency, String collection) {
 			this.template = template;
 			this.domainType = domainType;
 			this.query = query;
 			this.scanConsistency = scanConsistency;
+			this.collection = collection;
 		}
 
 		@Override
@@ -69,7 +72,8 @@ public Flux<RemoveResult> all() {
 								return throwable;
 							}
 						}).flatMapMany(ReactiveQueryResult::rowsAsObject)
-						.map(row -> new RemoveResult(row.getString(TemplateUtils.SELECT_ID), row.getLong(TemplateUtils.SELECT_CAS), Optional.empty()));
+						.map(row -> new RemoveResult(row.getString(TemplateUtils.SELECT_ID), row.getLong(TemplateUtils.SELECT_CAS),
+								Optional.empty()));
 			});
 		}
 
@@ -83,18 +87,19 @@ private QueryOptions buildQueryOptions() {
 
 		@Override
 		public TerminatingRemoveByQuery<T> matching(final Query query) {
-			return new ReactiveRemoveByQuerySupport<>(template, domainType, query, scanConsistency);
+			return new ReactiveRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
 
 		@Override
 		public RemoveByQueryWithQuery<T> consistentWith(final QueryScanConsistency scanConsistency) {
-			return new ReactiveRemoveByQuerySupport<>(template, domainType, query, scanConsistency);
+			return new ReactiveRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
 
 		@Override
-		public RemoveByQueryConsistentWith<T> inCollection(final String collection) {
-			return new ReactiveRemoveByQuerySupport<>(template, domainType, query, scanConsistency);
+		public RemoveByQueryInCollection<T> inCollection(final String collection) {
+			return new ReactiveRemoveByQuerySupport<>(template, domainType, query, scanConsistency, collection);
 		}
+
 		private String assembleDeleteQuery() {
 			return query.toN1qlRemoveString(template, this.domainType);
 		}

src/main/java/org/springframework/data/couchbase/core/convert/MappingCouchbaseConverter.java

@@ -267,7 +267,7 @@ public void doWithPersistentProperty(final CouchbasePersistentProperty prop) {
 						|| prop.isAnnotationPresent(N1qlJoin.class)) {
 					return;
 				}
-				Object obj = prop.isIdProperty() ? source.getId() : getValueInternal(prop, source, instance);
+				Object obj = prop.isIdProperty() && parent == null ? source.getId() : getValueInternal(prop, source, instance);
 				accessor.setProperty(prop, obj);
 			}
 

src/main/java/org/springframework/data/couchbase/core/query/Meta.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright 2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.couchbase.core.query;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Meta-data for {@link Query} instances.
+ *
+ * @author Michael Reiche
+ */
+public class Meta {
+
+	private enum MetaKey {
+		EXAMPLE("$example");
+
+		private String key;
+
+		MetaKey(String key) {
+			this.key = key;
+		}
+	}
+
+	private final Map<String, Object> values = new LinkedHashMap<>(2);
+
+	public Meta() {}
+
+	/**
+	 * Copy a {@link Meta} object.
+	 *
+	 * @since 2.2
+	 * @param source
+	 */
+	Meta(Meta source) {
+		this.values.putAll(source.values);
+	}
+
+	/**
+	 * @return
+	 */
+	public boolean hasValues() {
+		return !this.values.isEmpty();
+	}
+
+	/**
+	 * Get {@link Iterable} of set meta values.
+	 *
+	 * @return
+	 */
+	public Iterable<Entry<String, Object>> values() {
+		return Collections.unmodifiableSet(this.values.entrySet());
+	}
+
+	/**
+	 * Sets or removes the value in case of {@literal null} or empty {@link String}.
+	 *
+	 * @param key must not be {@literal null} or empty.
+	 * @param value
+	 */
+	void setValue(String key, @Nullable Object value) {
+
+		Assert.hasText(key, "Meta key must not be 'null' or blank.");
+
+		if (value == null || (value instanceof String && !StringUtils.hasText((String) value))) {
+			this.values.remove(key);
+		}
+		this.values.put(key, value);
+	}
+
+	@Nullable
+	@SuppressWarnings("unchecked")
+	private <T> T getValue(String key) {
+		return (T) this.values.get(key);
+	}
+
+	private <T> T getValue(String key, T defaultValue) {
+
+		T value = getValue(key);
+		return value != null ? value : defaultValue;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+
+		int hash = ObjectUtils.nullSafeHashCode(this.values);
+		return hash;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (!(obj instanceof Meta)) {
+			return false;
+		}
+
+		Meta other = (Meta) obj;
+		return ObjectUtils.nullSafeEquals(this.values, other.values);
+	}
+
+}

src/main/java/org/springframework/data/couchbase/core/query/Query.java

@@ -39,8 +39,6 @@
 import com.couchbase.client.java.query.QueryScanConsistency;
 
 /**
- * Couchbase Query
- *
  * @author Michael Nitschinger
  * @author Michael Reiche
  */
@@ -109,22 +107,13 @@ public Query skip(long skip) {
 	 * Limit the number of returned documents to {@code limit}.
 	 *
 	 * @param limit
-	 * @return this
+	 * @return
 	 */
 	public Query limit(int limit) {
 		this.limit = limit;
 		return this;
 	}
 
-	/**
-	 * limit
-	 *
-	 * @return limit
-	 */
-	public int getLimit() {
-		return limit;
-	}
-
 	/**
 	 * Sets the given pagination information on the {@link Query} instance. Will transparently set {@code skip} and
 	 * {@code limit} as well as applying the {@link Sort} instance defined with the {@link Pageable}.
@@ -330,4 +319,7 @@ public QueryOptions buildQueryOptions(QueryScanConsistency scanConsistency) {
 		return options;
 	}
 
+	public void setMeta(Meta metaAnnotation) {
+		Meta meta = metaAnnotation;
+	}
 }