Skip to content

Eliminate split packages. #1912

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
Feb 28, 2024
Merged

Eliminate split packages. #1912

Show file tree
Hide file tree
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
34 changes: 0 additions & 34 deletions src/main/java/com/couchbase/client/java/transactions/AttemptContextReactiveAccessor.java
View file
Open in desktop

This file was deleted.

32 changes: 21 additions & 11 deletions ...ain/java/org/springframework/data/couchbase/core/ReactiveFindByQueryOperationSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.springframework.data.couchbase.core;

import com.couchbase.client.core.api.query.CoreQueryContext;
import com.couchbase.client.core.api.query.CoreQueryOptions;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand All @@ -28,13 +29,11 @@
import org.springframework.data.couchbase.core.support.TemplateUtils;
import org.springframework.util.Assert;

import com.couchbase.client.core.io.CollectionIdentifier;
import com.couchbase.client.java.ReactiveScope;
import com.couchbase.client.java.codec.JsonSerializer;
import com.couchbase.client.java.query.QueryOptions;
import com.couchbase.client.java.query.QueryScanConsistency;
import com.couchbase.client.java.query.ReactiveQueryResult;
import com.couchbase.client.java.transactions.AttemptContextReactiveAccessor;
import com.couchbase.client.java.transactions.TransactionQueryOptions;
import com.couchbase.client.java.transactions.TransactionQueryResult;

Expand Down Expand Up @@ -77,9 +76,9 @@ static class ReactiveFindByQuerySupport<T> implements ReactiveFindByQuery<T> {
private final ReactiveTemplateSupport support;

ReactiveFindByQuerySupport(final ReactiveCouchbaseTemplate template, final Class<?> domainType,
final Class<T> returnType, final Query query, final QueryScanConsistency scanConsistency, final String scope,
final String collection, final QueryOptions options, final String[] distinctFields, final String[] fields,
final ReactiveTemplateSupport support) {
final Class<T> returnType, final Query query, final QueryScanConsistency scanConsistency,
final String scope, final String collection, final QueryOptions options, final String[] distinctFields,
final String[] fields, final ReactiveTemplateSupport support) {
Assert.notNull(domainType, "domainType must not be null!");
Assert.notNull(returnType, "returnType must not be null!");
this.template = template;
Expand Down Expand Up @@ -192,10 +191,16 @@ public Flux<T> all() {
return pArgs.getScope() == null ? clientFactory.getCluster().reactive().query(statement, opts)
: rs.query(statement, opts);
} else {
TransactionQueryOptions opts = buildTransactionOptions(pArgs.getOptions());
TransactionQueryOptions options = buildTransactionOptions(pArgs.getOptions());
JsonSerializer jSer = clientFactory.getCluster().environment().jsonSerializer();
return AttemptContextReactiveAccessor.createReactiveTransactionAttemptContext(s.get().getCore(), jSer)
.query(OptionsBuilder.queryContext(pArgs.getScope(), pArgs.getCollection(), rs.bucketName()) == null ? null : rs, statement, opts);
CoreQueryOptions opts = options != null ? options.builder().build() : null;
return s.get().getCore()
.queryBlocking(statement,
pArgs.getScope() == null ? null
: CoreQueryContext.of(rs.bucketName(), pArgs.getScope()),
opts, false)
.map(response -> new TransactionQueryResult(response, jSer));

}
});

Expand Down Expand Up @@ -255,10 +260,15 @@ public Mono<Long> count() {
return pArgs.getScope() == null ? clientFactory.getCluster().reactive().query(statement, opts)
: rs.query(statement, opts);
} else {
TransactionQueryOptions opts = buildTransactionOptions(pArgs.getOptions());
TransactionQueryOptions options = buildTransactionOptions(pArgs.getOptions());
JsonSerializer jSer = clientFactory.getCluster().environment().jsonSerializer();
return AttemptContextReactiveAccessor.createReactiveTransactionAttemptContext(s.get().getCore(), jSer)
.query(OptionsBuilder.queryContext(pArgs.getScope(), pArgs.getCollection(), rs.bucketName()) == null ? null : rs, statement, opts);
CoreQueryOptions opts = options != null ? options.builder().build() : null;
return s.get().getCore()
.queryBlocking(statement,
pArgs.getScope() == null ? null
: CoreQueryContext.of(rs.bucketName(), pArgs.getScope()),
opts, false)
.map(response -> new TransactionQueryResult(response, jSer));
}
});

Expand Down
2 changes: 1 addition & 1 deletion ...e/document/AbstractCouchbaseQueryDSL.java → ...l/document/AbstractCouchbaseQueryDSL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.querydsl.couchbase.document;
package org.springframework.data.couchbase.querydsl.document;

import java.util.Collection;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...document/CouchbaseDocumentSerializer.java → ...document/CouchbaseDocumentSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.querydsl.couchbase.document;
package org.springframework.data.couchbase.querydsl.document;

import java.util.Collection;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...rg/springframework/data/couchbase/repository/support/SpringDataCouchbaseQuerySupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

import com.querydsl.core.support.QueryMixin;
import com.querydsl.core.types.OrderSpecifier;
import com.querydsl.couchbase.document.AbstractCouchbaseQueryDSL;
import com.querydsl.couchbase.document.CouchbaseDocumentSerializer;
import org.springframework.data.couchbase.querydsl.document.AbstractCouchbaseQueryDSL;
import org.springframework.data.couchbase.querydsl.document.CouchbaseDocumentSerializer;

/**
* @author Michael Reiche
Expand Down
2 changes: 1 addition & 1 deletion .../org/springframework/data/couchbase/repository/support/SpringDataCouchbaseSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.Set;
import java.util.regex.Pattern;

import com.querydsl.couchbase.document.CouchbaseDocumentSerializer;
import org.springframework.data.couchbase.querydsl.document.CouchbaseDocumentSerializer;
import org.springframework.data.couchbase.core.convert.CouchbaseConverter;
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentEntity;
import org.springframework.data.couchbase.core.mapping.CouchbasePersistentProperty;
Expand Down