Skip to content

After 1490, changes needed so integration tests pass. #1499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2022
Merged

After 1490, changes needed so integration tests pass. #1499

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .../java/org/springframework/data/couchbase/repository/query/AbstractCouchbaseQueryBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
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;
Expand Down Expand Up @@ -112,14 +111,12 @@ public Object execute(Object[] parameters) {

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) {
Expand Down