Revert "Scopes and collections for repositories (#1149)"

This reverts commit 1581712.

Author: mikereiche

src/main/java/org/springframework/data/couchbase/SimpleCouchbaseClientFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors
+ * Copyright 2012-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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.data.couchbase;
 
 import java.util.function.Supplier;
@@ -32,9 +33,6 @@
 
 /**
  * The default implementation of a {@link CouchbaseClientFactory}.
- *
- * @author Michael Nitschinger
- * @author Michael Reiche
  */
 public class SimpleCouchbaseClientFactory implements CouchbaseClientFactory {
 
@@ -76,7 +74,7 @@ private SimpleCouchbaseClientFactory(final Supplier<Cluster> cluster, final Stri
 
 	@Override
 	public CouchbaseClientFactory withScope(final String scopeName) {
-		return new SimpleCouchbaseClientFactory(cluster, bucket.name(), scopeName != null ? scopeName : getScope().name());
+		return new SimpleCouchbaseClientFactory(cluster, bucket.name(), scopeName);
 	}
 
 	@Override

src/main/java/org/springframework/data/couchbase/config/AbstractCouchbaseConfiguration.java

@@ -22,6 +22,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;

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

@@ -28,6 +28,7 @@
 import org.springframework.data.couchbase.core.mapping.CouchbaseMappingContext;
 import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
 import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
+import org.springframework.data.couchbase.core.support.PseudoArgs;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.lang.Nullable;
 
@@ -106,25 +107,13 @@ public <T> ExecutableFindByAnalytics<T> findByAnalytics(Class<T> domainType) {
 	}
 
 	@Override
-	@Deprecated
 	public ExecutableRemoveById removeById() {
-		return removeById(null);
+		return new ExecutableRemoveByIdOperationSupport(this).removeById();
 	}
 
 	@Override
-	public ExecutableRemoveById removeById(Class<?> domainType) {
-		return new ExecutableRemoveByIdOperationSupport(this).removeById(domainType);
-	}
-
-	@Override
-	@Deprecated
 	public ExecutableExistsById existsById() {
-		return existsById(null);
-	}
-
-	@Override
-	public ExecutableExistsById existsById(Class<?> domainType) {
-		return new ExecutableExistsByIdOperationSupport(this).existsById(domainType);
+		return new ExecutableExistsByIdOperationSupport(this).existsById();
 	}
 
 	@Override

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

@@ -17,8 +17,6 @@
 
 package org.springframework.data.couchbase.core;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -40,6 +38,9 @@
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
 import org.springframework.util.Assert;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Internal encode/decode support for CouchbaseTemplate.
  *

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

@@ -36,14 +36,8 @@ public interface ExecutableExistsByIdOperation {
 	/**
 	 * Checks if the document exists in the bucket.
 	 */
-	@Deprecated
 	ExecutableExistsById existsById();
 
-	/**
-	 * Checks if the document exists in the bucket.
-	 */
-	ExecutableExistsById existsById(Class<?> domainType);
-
 	/**
 	 * Terminating operations invoking the actual execution.
 	 */
@@ -84,6 +78,7 @@ interface ExistsByIdWithOptions<T> extends TerminatingExistsById, WithExistsOpti
 	}
 
 	/**
+	 *
 	 * Fluent method to specify the collection.
 	 *
 	 * @param <T> the entity type to use for the results.

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

@@ -32,34 +32,26 @@ public class ExecutableExistsByIdOperationSupport implements ExecutableExistsByI
 	}
 
 	@Override
-	@Deprecated
 	public ExecutableExistsById existsById() {
-		return existsById(null);
-	}
-
-	@Override
-	public ExecutableExistsById existsById(Class<?> domainType) {
-		return new ExecutableExistsByIdSupport(template, domainType, null, null, null);
+		return new ExecutableExistsByIdSupport(template, null, null, null);
 	}
 
 	static class ExecutableExistsByIdSupport implements ExecutableExistsById {
 
 		private final CouchbaseTemplate template;
-		private final Class<?> domainType;
 		private final String scope;
 		private final String collection;
 		private final ExistsOptions options;
 
 		private final ReactiveExistsByIdSupport reactiveSupport;
 
-		ExecutableExistsByIdSupport(final CouchbaseTemplate template, final Class<?> domainType, final String scope,
-				final String collection, final ExistsOptions options) {
+		ExecutableExistsByIdSupport(final CouchbaseTemplate template, final String scope, final String collection,
+				final ExistsOptions options) {
 			this.template = template;
-			this.domainType = domainType;
 			this.scope = scope;
 			this.collection = collection;
 			this.options = options;
-			this.reactiveSupport = new ReactiveExistsByIdSupport(template.reactive(), domainType, scope, collection, options);
+			this.reactiveSupport = new ReactiveExistsByIdSupport(template.reactive(), scope, collection, options);
 		}
 
 		@Override
@@ -74,18 +66,20 @@ public Map<String, Boolean> all(final Collection<String> ids) {
 
 		@Override
 		public ExistsByIdWithOptions inCollection(final String collection) {
-			return new ExecutableExistsByIdSupport(template, domainType, scope, collection, options);
+			Assert.hasText(collection, "Collection must not be null nor empty.");
+			return new ExecutableExistsByIdSupport(template, scope, collection, options);
 		}
 
 		@Override
 		public TerminatingExistsById withOptions(final ExistsOptions options) {
 			Assert.notNull(options, "Options must not be null.");
-			return new ExecutableExistsByIdSupport(template, domainType, scope, collection, options);
+			return new ExecutableExistsByIdSupport(template, scope, collection, options);
 		}
 
 		@Override
 		public ExistsByIdInCollection inScope(final String scope) {
-			return new ExecutableExistsByIdSupport(template, domainType, scope, collection, options);
+			Assert.hasText(scope, "Scope must not be null nor empty.");
+			return new ExecutableExistsByIdSupport(template, scope, collection, options);
 		}
 	}
 

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

@@ -97,12 +97,14 @@ public FindByAnalyticsWithQuery<T> withOptions(final AnalyticsOptions options) {
 
 		@Override
 		public FindByAnalyticsInCollection<T> inScope(final String scope) {
+			Assert.hasText(scope, "Scope must not be null nor empty.");
 			return new ExecutableFindByAnalyticsSupport<>(template, domainType, returnType, query, scanConsistency, scope,
 					collection, options);
 		}
 
 		@Override
 		public FindByAnalyticsWithConsistency<T> inCollection(final String collection) {
+			Assert.hasText(collection, "Collection must not be null nor empty.");
 			return new ExecutableFindByAnalyticsSupport<>(template, domainType, returnType, query, scanConsistency, scope,
 					collection, options);
 		}

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

@@ -77,17 +77,19 @@ public TerminatingFindById<T> withOptions(final GetOptions options) {
 
 		@Override
 		public FindByIdWithOptions<T> inCollection(final String collection) {
+			Assert.hasText(collection, "Collection must not be null nor empty.");
 			return new ExecutableFindByIdSupport<>(template, domainType, scope, collection, options, fields);
 		}
 
 		@Override
 		public FindByIdInCollection<T> inScope(final String scope) {
+			Assert.hasText(scope, "Scope must not be null nor empty.");
 			return new ExecutableFindByIdSupport<>(template, domainType, scope, collection, options, fields);
 		}
 
 		@Override
 		public FindByIdInScope<T> project(String... fields) {
-			Assert.notEmpty(fields, "Fields must not be null.");
+			Assert.notEmpty(fields, "Fields must not be null nor empty.");
 			return new ExecutableFindByIdSupport<>(template, domainType, scope, collection, options, Arrays.asList(fields));
 		}
 

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

@@ -68,8 +68,7 @@ static class ExecutableFindByQuerySupport<T> implements ExecutableFindByQuery<T>
 			this.returnType = returnType;
 			this.query = query;
 			this.reactiveSupport = new ReactiveFindByQuerySupport<T>(template.reactive(), domainType, returnType, query,
-					scanConsistency, scope, collection, options, distinctFields,
-					new NonReactiveSupportWrapper(template.support()));
+					scanConsistency, scope, collection, options, distinctFields, new NonReactiveSupportWrapper(template.support()));
 			this.scanConsistency = scanConsistency;
 			this.scope = scope;
 			this.collection = collection;
@@ -127,12 +126,8 @@ public <R> FindByQueryWithConsistency<R> as(final Class<R> returnType) {
 		@Override
 		public FindByQueryWithProjection<T> distinct(final String[] distinctFields) {
 			Assert.notNull(distinctFields, "distinctFields must not be null!");
-			// Coming from an annotation, this cannot be null.
-			// But a non-null but empty distinctFields means distinct on all fields
-			// So to indicate do not use distinct, we use {"-"} from the annotation, and here we change it to null.
-			String[] dFields = distinctFields.length == 1 && "-".equals(distinctFields[0]) ? null : distinctFields;
 			return new ExecutableFindByQuerySupport<>(template, domainType, returnType, query, scanConsistency, scope,
-					collection, options, dFields);
+					collection, options, distinctFields);
 		}
 
 		@Override
@@ -159,12 +154,14 @@ public TerminatingFindByQuery<T> withOptions(final QueryOptions options) {
 
 		@Override
 		public FindByQueryInCollection<T> inScope(final String scope) {
+			Assert.hasText(scope, "Scope must not be null nor empty.");
 			return new ExecutableFindByQuerySupport<>(template, domainType, returnType, query, scanConsistency, scope,
 					collection, options, distinctFields);
 		}
 
 		@Override
 		public FindByQueryWithConsistency<T> inCollection(final String collection) {
+			Assert.hasText(collection, "Collection must not be null nor empty.");
 			return new ExecutableFindByQuerySupport<>(template, domainType, returnType, query, scanConsistency, scope,
 					collection, options, distinctFields);
 		}

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

@@ -18,9 +18,9 @@
 import java.util.Collection;
 
 import org.springframework.data.couchbase.core.ReactiveFindFromReplicasByIdOperationSupport.ReactiveFindFromReplicasByIdSupport;
-import org.springframework.util.Assert;
 
 import com.couchbase.client.java.kv.GetAnyReplicaOptions;
+import org.springframework.util.Assert;
 
 public class ExecutableFindFromReplicasByIdOperationSupport implements ExecutableFindFromReplicasByIdOperation {
 
@@ -54,7 +54,7 @@ static class ExecutableFindFromReplicasByIdSupport<T> implements ExecutableFindF
 			this.options = options;
 			this.returnType = returnType;
 			this.reactiveSupport = new ReactiveFindFromReplicasByIdSupport<>(template.reactive(), domainType, returnType,
-					scope, collection, options, new NonReactiveSupportWrapper(template.support()));
+					scope, collection, options,  new NonReactiveSupportWrapper(template.support()));
 		}
 
 		@Override
@@ -75,11 +75,13 @@ public TerminatingFindFromReplicasById<T> withOptions(final GetAnyReplicaOptions
 
 		@Override
 		public FindFromReplicasByIdWithOptions<T> inCollection(final String collection) {
+			Assert.hasText(collection, "Collection must not be null nor empty.");
 			return new ExecutableFindFromReplicasByIdSupport<>(template, domainType, returnType, scope, collection, options);
 		}
 
 		@Override
 		public FindFromReplicasByIdInCollection<T> inScope(final String scope) {
+			Assert.hasText(scope, "Scope must not be null nor empty.");
 			return new ExecutableFindFromReplicasByIdSupport<>(template, domainType, returnType, scope, collection, options);
 		}