Skip to content

Commit b2c1f7a

Browse files
committed
Upgrade Couchbase Java SDK to 3.1.3.
Closes #1079. Original pull request #1098.
1 parent fdbb839 commit b2c1f7a

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</parent>
1919

2020
<properties>
21-
<couchbase>3.0.10</couchbase>
22-
<couchbase.osgi>3.0.10</couchbase.osgi>
21+
<couchbase>3.1.3</couchbase>
22+
<couchbase.osgi>3.1.3</couchbase.osgi>
2323
<springdata.commons>2.4.6-SNAPSHOT</springdata.commons>
2424
<java-module-name>spring.data.couchbase</java-module-name>
2525
</properties>

src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.concurrent.Future;
3535
import java.util.stream.Collectors;
3636

37+
import com.couchbase.client.java.query.QueryScanConsistency;
3738
import org.junit.jupiter.api.BeforeEach;
3839
import org.junit.jupiter.api.Test;
3940

@@ -43,6 +44,7 @@
4344
import org.springframework.data.couchbase.CouchbaseClientFactory;
4445
import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
4546
import org.springframework.data.couchbase.core.CouchbaseTemplate;
47+
import org.springframework.data.couchbase.core.query.QueryCriteria;
4648
import org.springframework.data.couchbase.domain.Address;
4749
import org.springframework.data.couchbase.domain.Airport;
4850
import org.springframework.data.couchbase.domain.AirportRepository;
@@ -295,28 +297,12 @@ void threadSafeStringParametersTest() throws Exception {
295297
}
296298
}
297299

298-
@Test // DATACOUCH-650
299-
void deleteAllById() {
300-
301-
Airport vienna = new Airport("airports::vie", "vie", "LOWW");
302-
Airport frankfurt = new Airport("airports::fra", "fra", "EDDF");
303-
Airport losAngeles = new Airport("airports::lax", "lax", "KLAX");
304-
305-
try {
306-
airportRepository.saveAll(asList(vienna, frankfurt, losAngeles));
307-
308-
airportRepository.deleteAllById(asList(vienna.getId(), losAngeles.getId()));
309-
310-
assertThat(airportRepository.findAll()).containsExactly(frankfurt);
311-
} finally {
312-
airportRepository.deleteAll();
313-
}
314-
}
315-
316300
@Test
317301
void couchbaseRepositoryQuery() throws Exception {
318302
User user = new User("1", "Dave", "Wilson");
319303
userRepository.save(user);
304+
couchbaseTemplate.findByQuery(User.class).withConsistency(QueryScanConsistency.REQUEST_PLUS).matching(
305+
QueryCriteria.where("firstname").is("Dave").and("`1`").is("`1`")).all();
320306
String input = "findByFirstname";
321307
Method method = UserRepository.class.getMethod(input, String.class);
322308
CouchbaseQueryMethod queryMethod = new CouchbaseQueryMethod(method,

0 commit comments

Comments
 (0)