Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After 1490, changes needed so integration tests pass.

Browse Source 
Closes #1498.
This commit is contained in:
Michael Reiche
2022-07-12 16:30:56 -07:00
parent 7d57523432
commit 4f5cb6eb74
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java
View File

@@ -18,7 +18,6 @@ package org.springframework.data.couchbase.repository.query;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.reactivestreams.Publisher;
import org.springframework.data.couchbase.core.CouchbaseOperations;
import org.springframework.data.couchbase.core.ExecutableFindByQueryOperation.ExecutableFindByQuery;
import org.springframework.data.couchbase.core.query.Query;
@@ -112,14 +111,12 @@ public abstract class AbstractCouchbaseQueryBase<CouchbaseOperationsType> implem
ReactiveCouchbaseParameterAccessor accessor = new ReactiveCouchbaseParameterAccessor(getQueryMethod(), parameters);
return accessor.resolveParameters().flatMapMany(this::executeDeferred);
Object result = accessor.resolveParameters().map(this::executeDeferred);
return ((Mono<Object>) result).block() ;
}
private Publisher<Object> executeDeferred(ReactiveCouchbaseParameterAccessor parameterAccessor) {
if (getQueryMethod().isCollectionQuery()) {
return Flux.defer(() -> (Publisher<Object>) execute(parameterAccessor));
}
return Mono.defer(() -> (Mono<Object>) execute(parameterAccessor));
private Object executeDeferred(ReactiveCouchbaseParameterAccessor parameterAccessor) {
return execute(parameterAccessor);
}
private Object execute(ParametersParameterAccessor parameterAccessor) {