Skip to content
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

Bump Couchbase Java SDK to 3.5.2 in 5.3.0. #1897

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Bump Couchbase Java SDK to 3.5.2 in 5.3.0. #1897

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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</parent>

<properties>
<couchbase>3.4.11</couchbase>
<couchbase.osgi>3.4.11</couchbase.osgi>
<couchbase>3.5.2</couchbase>
<couchbase.osgi>3.5.2</couchbase.osgi>
<springdata.commons>3.3.0-SNAPSHOT</springdata.commons>
<java-module-name>spring.data.couchbase</java-module-name>
<hibernate.validator>7.0.1.Final</hibernate.validator>
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public static void setupScopeCollection(Cluster cluster, String scopeName, Strin
() -> collectionReady(cluster.bucket(config().bucketname()).scope(scopeName).collection(collectionName)));

assertNotEquals(scopeSpec, collectionManager.getScope(scopeName));
assertTrue(collectionManager.getScope(scopeName).collections().contains(collSpec));
assertTrue(collectionManager.getScope(scopeName).collections().stream().anyMatch( (c) -> c.name().equals(collSpec.name()) && c.scopeName().equals(collSpec.scopeName())));

waitForQueryIndexerToHaveBucket(cluster, collectionName);

Expand Down Expand Up @@ -229,7 +229,7 @@ protected static void waitForService(final Bucket bucket, final ServiceType serv
public static boolean collectionExists(CollectionManager mgr, CollectionSpec spec) {
try {
ScopeSpec scope = mgr.getScope(spec.scopeName());
return scope.collections().contains(spec);
return scope.collections().stream().anyMatch( (c) -> c.name().equals(spec.name()) && c.scopeName().equals(spec.scopeName()));
} catch (CollectionNotFoundException e) {
return false;
}
Expand Down