From e0a5e1eadd11382a0c82ae195fa449d02e64cf30 Mon Sep 17 00:00:00 2001 From: Michael Reiche <48999328+mikereiche@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:20:16 -0800 Subject: [PATCH] Bump Couchbase Java SDK to 3.5.2 in 5.3.0. (#1897) Closes #1896. --- pom.xml | 4 ++-- .../data/couchbase/util/JavaIntegrationTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a172d5c0..5906c497 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ - 3.4.11 - 3.4.11 + 3.5.2 + 3.5.2 3.3.0-SNAPSHOT spring.data.couchbase 7.0.1.Final diff --git a/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java index 4a5b54fe..fbd43830 100644 --- a/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/util/JavaIntegrationTests.java @@ -153,7 +153,7 @@ public class JavaIntegrationTests extends ClusterAwareIntegrationTests { () -> 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); @@ -229,7 +229,7 @@ public class JavaIntegrationTests extends ClusterAwareIntegrationTests { 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; }