Consider scope and collection from repository annotations.

mikereiche · mikereiche · commit cb073e7886aa · 2022-06-16T18:21:59.000-07:00
The scope and collection from the repository annotation are associated with the method call by CrudMethodMetadataProcessor. This will also need #1445 to work. Closes #1441.
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveExistsByIdOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors
+ * Copyright 2012-2022 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.
@@ -72,7 +72,7 @@ static class ReactiveExistsByIdSupport implements ReactiveExistsById {
 		@Override
 		public Mono<Boolean> one(final String id) {
 			PseudoArgs<ExistsOptions> pArgs = new PseudoArgs<>(template, scope, collection, options, domainType);
-			LOG.trace("existsById {}", pArgs);
+			LOG.trace("existsById key={} {}", id, pArgs);
 			return Mono.just(id)
 					.flatMap(docId -> template.getCouchbaseClientFactory().withScope(pArgs.getScope())
 							.getCollection(pArgs.getCollection()).reactive().exists(id, buildOptions(pArgs.getOptions()))
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindByIdOperationSupport.java
@@ -80,7 +80,7 @@ public Mono<T> one(final String id) {
 
 			CommonOptions<?> gOptions = initGetOptions();
 			PseudoArgs<?> pArgs = new PseudoArgs(template, scope, collection, gOptions, domainType);
-			LOG.trace("findById {}", pArgs);
+			LOG.trace("findById key={} {}", id, pArgs);
 
 			return Mono.just(id).flatMap(docId -> {
 				ReactiveCollection reactive = template.getCouchbaseClientFactory().withScope(pArgs.getScope())
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveFindFromReplicasByIdOperationSupport.java
@@ -73,7 +73,7 @@ public Mono<T> any(final String id) {
 				garOptions.transcoder(RawJsonTranscoder.INSTANCE);
 			}
 			PseudoArgs<GetAnyReplicaOptions> pArgs = new PseudoArgs<>(template, scope, collection, garOptions, domainType);
-			LOG.trace("getAnyReplica {}", pArgs);
+			LOG.trace("getAnyReplica key={} {}", id, pArgs);
 			return Mono.just(id)
 					.flatMap(docId -> template.getCouchbaseClientFactory().withScope(pArgs.getScope())
 							.getCollection(pArgs.getCollection()).reactive().getAnyReplica(docId, pArgs.getOptions()))
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveInsertByIdOperationSupport.java
@@ -80,7 +80,7 @@ static class ReactiveInsertByIdSupport<T> implements ReactiveInsertById<T> {
 		@Override
 		public Mono<T> one(T object) {
 			PseudoArgs<InsertOptions> pArgs = new PseudoArgs(template, scope, collection, options, domainType);
-			LOG.trace("insertById {}", pArgs);
+			LOG.trace("insertById object={} {}", object, pArgs);
 			return Mono.just(object).flatMap(support::encodeEntity)
 					.flatMap(converted -> template.getCouchbaseClientFactory().withScope(pArgs.getScope())
 							.getCollection(pArgs.getCollection()).reactive()
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveRemoveByIdOperationSupport.java
@@ -81,7 +81,7 @@ static class ReactiveRemoveByIdSupport implements ReactiveRemoveById {
 		@Override
 		public Mono<RemoveResult> one(final String id) {
 			PseudoArgs<RemoveOptions> pArgs = new PseudoArgs<>(template, scope, collection, options, domainType);
-			LOG.trace("removeById {}", pArgs);
+			LOG.trace("removeById key={} {}", id, pArgs);
 			return Mono.just(id)
 					.flatMap(docId -> template.getCouchbaseClientFactory().withScope(pArgs.getScope())
 							.getCollection(pArgs.getCollection()).reactive().remove(id, buildRemoveOptions(pArgs.getOptions()))
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveReplaceByIdOperationSupport.java
@@ -80,7 +80,7 @@ static class ReactiveReplaceByIdSupport<T> implements ReactiveReplaceById<T> {
 		@Override
 		public Mono<T> one(T object) {
 			PseudoArgs<ReplaceOptions> pArgs = new PseudoArgs<>(template, scope, collection, options, domainType);
-			LOG.trace("replaceById {}", pArgs);
+			LOG.trace("replaceById object={} {}", object, pArgs);
 			return Mono.just(object).flatMap(support::encodeEntity)
 					.flatMap(converted -> template.getCouchbaseClientFactory().withScope(pArgs.getScope())
 							.getCollection(pArgs.getCollection()).reactive()
diff --git a/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java b/src/main/java/org/springframework/data/couchbase/core/ReactiveUpsertByIdOperationSupport.java
@@ -80,7 +80,7 @@ static class ReactiveUpsertByIdSupport<T> implements ReactiveUpsertById<T> {
 		@Override
 		public Mono<T> one(T object) {
 			PseudoArgs<UpsertOptions> pArgs = new PseudoArgs(template, scope, collection, options, domainType);
-			LOG.trace("upsertById {}", pArgs);
+			LOG.trace("upsertById object={} {}", object, pArgs);
 			return Mono.just(object).flatMap(support::encodeEntity)
 					.flatMap(converted -> template.getCouchbaseClientFactory().withScope(pArgs.getScope())
 							.getCollection(pArgs.getCollection()).reactive()
diff --git a/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java b/src/main/java/org/springframework/data/couchbase/core/query/OptionsBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2021-2022 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.
@@ -177,7 +177,7 @@ public static RemoveOptions buildRemoveOptions(RemoveOptions options, PersistTo
 			options.cas(cas);
 		}
 		if (LOG.isTraceEnabled()) {
-			LOG.trace("remove options: {}" + toString(options));
+			LOG.trace("remove options: {}", toString(options));
 		}
 		return options;
 	}
diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java
@@ -142,6 +142,8 @@ public void beforeEach() {
 		super.beforeEach();
 		couchbaseTemplate.removeByQuery(User.class).withConsistency(REQUEST_PLUS).all();
 		couchbaseTemplate.findByQuery(User.class).withConsistency(REQUEST_PLUS).all();
+		couchbaseTemplate.removeByQuery(Airport.class).withConsistency(REQUEST_PLUS).all();
+		couchbaseTemplate.findByQuery(Airport.class).withConsistency(REQUEST_PLUS).all();
 	}
 
 	@Test
diff --git a/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/query/CouchbaseRepositoryQueryCollectionIntegrationTests.java
@@ -359,4 +359,28 @@ void findPlusN1qlJoinUnannotated() throws Exception {
 		}
 	}
 
+	@Test
+	void stringDeleteCollectionTest() {
+		String key0 = loc();
+		String key1 = loc();
+		Airport airport = new Airport(loc(), "vie", "abc");
+		Airport otherAirport = new Airport(loc(), "xxx", "xyz");
+		try {
+			airportRepository.withScope(scopeName).withCollection(collectionName).deleteById(airport.getId());
+		} catch (DataRetrievalFailureException drfe) {}
+		try {
+			airportRepository.withScope(scopeName).withCollection(collectionName).deleteById(otherAirport.getId());
+		} catch (DataRetrievalFailureException drfe) {}
+		try {
+			airportRepository.withScope(scopeName).withCollection(collectionName).save(airport);
+			airportRepository.withScope(scopeName).withCollection(collectionName).save(otherAirport);
+			assertEquals(1, airportRepository.withScope(scopeName).withCollection(collectionName).deleteByIata(airport.getIata()).size());
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw e;
+		} finally {
+			airportRepository.withScope(scopeName).withCollection(collectionName).deleteById(otherAirport.getId());
+		}
+	}
+
 }
diff --git a/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/ClusterAwareIntegrationTests.java
@@ -215,4 +215,12 @@ private static void callSuper(Object createdHere, Class annotationClass) {
 		}
 	}
 
+	/**
+	 * @return unique identifier for line - to use as key for documents to identify where they were created
+	 */
+	public static String loc() {
+		StackTraceElement ste = Thread.currentThread().getStackTrace()[2];
+		return ste.getClassName() + ":" + ste.getMethodName() + ":" + ste.getLineNumber();
+	}
+
 }
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
@@ -22,7 +22,7 @@
      - log additional debug info during automatic index creation
     -->
 
-    <logger name="org.springframework.data.couchbase.core" level="debug"/>"
+    <logger name="org.springframework.data.couchbase.core" level="trace"/>"
     <logger name="org.springframework.data.couchbase.repository.query" level="debug"/>
     <logger name="org.springframework.data.couchbase.repository.query.SpatialViewQueryCreator" level="trace"/>
     <logger name="org.springframework.data.couchbase.repository.query.StringN1qlBasedQuery" level="trace"/>

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public Mono<T> any(final String id) {`
`73`	`73`	`garOptions.transcoder(RawJsonTranscoder.INSTANCE);`
`74`	`74`	`}`
`75`	`75`	`PseudoArgs<GetAnyReplicaOptions> pArgs = new PseudoArgs<>(template, scope, collection, garOptions, domainType);`
`76`		`- LOG.trace("getAnyReplica {}", pArgs);`
	`76`	`+ LOG.trace("getAnyReplica key={} {}", id, pArgs);`
`77`	`77`	`return Mono.just(id)`
`78`	`78`	`.flatMap(docId -> template.getCouchbaseClientFactory().withScope(pArgs.getScope())`
`79`	`79`	`.getCollection(pArgs.getCollection()).reactive().getAnyReplica(docId, pArgs.getOptions()))`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2021 the original author or authors.`
	`2`	`+ * Copyright 2021-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -177,7 +177,7 @@ public static RemoveOptions buildRemoveOptions(RemoveOptions options, PersistTo`
`177`	`177`	`options.cas(cas);`
`178`	`178`	`}`
`179`	`179`	`if (LOG.isTraceEnabled()) {`
`180`		`- LOG.trace("remove options: {}" + toString(options));`
	`180`	`+ LOG.trace("remove options: {}", toString(options));`
`181`	`181`	`}`
`182`	`182`	`return options;`
`183`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,8 @@ public void beforeEach() {`
`142`	`142`	`super.beforeEach();`
`143`	`143`	`couchbaseTemplate.removeByQuery(User.class).withConsistency(REQUEST_PLUS).all();`
`144`	`144`	`couchbaseTemplate.findByQuery(User.class).withConsistency(REQUEST_PLUS).all();`
	`145`	`+ couchbaseTemplate.removeByQuery(Airport.class).withConsistency(REQUEST_PLUS).all();`
	`146`	`+ couchbaseTemplate.findByQuery(Airport.class).withConsistency(REQUEST_PLUS).all();`
`145`	`147`	`}`
`146`	`148`
`147`	`149`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -215,4 +215,12 @@ private static void callSuper(Object createdHere, Class annotationClass) {`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
	`218`	`+ /**`
	`219`	`+ * @return unique identifier for line - to use as key for documents to identify where they were created`
	`220`	`+ */`
	`221`	`+ public static String loc() {`
	`222`	`+ StackTraceElement ste = Thread.currentThread().getStackTrace()[2];`
	`223`	`+ return ste.getClassName() + ":" + ste.getMethodName() + ":" + ste.getLineNumber();`
	`224`	`+ }`
	`225`	`+`
`218`	`226`	`}`