Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACOUCH-164 - Use stable Couchbase SDK

Browse Source 
Make modifications due to name changing in 2.2.0, the latest stable release of the Couchbase SDK.
This commit is contained in:
Simon Baslé
2015-09-21 16:46:51 +02:00
parent f661bad73b
commit 7654af7608
12 changed files with 126 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java
View File

@@ -36,8 +36,8 @@ import java.util.Random;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.document.RawJsonDocument;
import com.couchbase.client.java.error.DocumentDoesNotExistException;
import com.couchbase.client.java.query.Query;
import com.couchbase.client.java.query.QueryResult;
import com.couchbase.client.java.query.N1qlQuery;
import com.couchbase.client.java.query.N1qlQueryResult;
import com.couchbase.client.java.query.dsl.Expression;
import com.couchbase.client.java.view.Stale;
import com.couchbase.client.java.view.ViewQuery;
@@ -226,10 +226,10 @@ public class CouchbaseTemplateTests {
@Test
public void shouldQueryRaw() {
Query query = Query.simple(select("name").from(i(client.name()))
N1qlQuery query = N1qlQuery.simple(select("name").from(i(client.name()))
.where(x("name").isNotMissing()));
QueryResult queryResult = template.queryN1QL(query);
N1qlQueryResult queryResult = template.queryN1QL(query);
assertNotNull(queryResult);
assertTrue(queryResult.errors().toString(), queryResult.finalSuccess());
assertFalse(queryResult.allRows().isEmpty());
@@ -241,7 +241,7 @@ public class CouchbaseTemplateTests {
FullFragment ff2 = new FullFragment("fullFragment2", 2, "fullFragment", "test2");
template.save(Arrays.asList(ff1, ff2));
Query query = Query.simple(select(i("value")) //"value" is a n1ql keyword apparently
N1qlQuery query = N1qlQuery.simple(select(i("value")) //"value" is a n1ql keyword apparently
.from(i(client.name()))
.where(x("type").eq(s("fullFragment"))
.and(x("criteria").gt(1))));

4
src/integration/java/org/springframework/data/couchbase/repository/feature/FeatureDetectionRepositoryTests.java
View File

@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import com.couchbase.client.java.cluster.ClusterInfo;
import com.couchbase.client.java.query.Query;
import com.couchbase.client.java.query.N1qlQuery;
import com.couchbase.client.java.util.features.CouchbaseFeature;
import com.couchbase.client.java.util.features.Version;
import org.junit.Assume;
@@ -79,7 +79,7 @@ public class FeatureDetectionRepositoryTests {
@Test
public void testN1qlIncompatibleClusterTemplateFails() {
Query query = Query.simple("SELECT * FROM `" + template.getCouchbaseBucket().name() + "`");
N1qlQuery query = N1qlQuery.simple("SELECT * FROM `" + template.getCouchbaseBucket().name() + "`");
try {
template.findByN1QL(query, User.class);
fail("expected findByN1QL to fail with UnsupportedCouchbaseFeatureException");