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

DATACOUCH-260 - Update to 2.4.1 and fix tests

Browse Source 
Adapted changes to 3.0 branch

Original pull request: #131.
This commit is contained in:
Subhashni Balakrishnan
2017-02-04 21:30:46 -08:00
parent 8733ea3cf5
commit 162d8124ab
17 changed files with 137 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateViewListener.java → src/integration/java/org/springframework/data/couchbase/core/CouchbaseTemplateQueryListener.java
View File

@@ -20,18 +20,21 @@ import java.util.Collections;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.cluster.ClusterInfo;
import com.couchbase.client.java.query.Index;
import com.couchbase.client.java.query.N1qlQuery;
import com.couchbase.client.java.view.DefaultView;
import com.couchbase.client.java.view.DesignDocument;
import com.couchbase.client.java.view.View;
import org.springframework.data.couchbase.config.BeanNames;
import org.springframework.data.couchbase.repository.index.IndexedRepositoryTests;
import org.springframework.test.context.TestContext;
import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
/**
* @author Michael Nitschinger
*/
public class CouchbaseTemplateViewListener extends DependencyInjectionTestExecutionListener {
public class CouchbaseTemplateQueryListener extends DependencyInjectionTestExecutionListener {
@Override
public void beforeTestClass(final TestContext testContext) throws Exception {
@@ -39,6 +42,7 @@ public class CouchbaseTemplateViewListener extends DependencyInjectionTestExecut
ClusterInfo clusterInfo = (ClusterInfo) testContext.getApplicationContext().getBean(BeanNames.COUCHBASE_CLUSTER_INFO);
populateTestData(client, clusterInfo);
createAndWaitForDesignDocs(client);
client.query(N1qlQuery.simple(Index.createPrimaryIndex().on(client.name())));
}
private void populateTestData(Bucket client, ClusterInfo clusterInfo) {

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

@@ -67,7 +67,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
* @author Anastasiia Smirnova */
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = IntegrationTestApplicationConfig.class)
@TestExecutionListeners(CouchbaseTemplateViewListener.class)
@TestExecutionListeners(CouchbaseTemplateQueryListener.class)
public class CouchbaseTemplateTests {
@Rule
@@ -83,7 +83,7 @@ public class CouchbaseTemplateTests {
private void removeIfExist(String key) {
try {
client.remove(key);
template.remove(key);
}
catch (DocumentDoesNotExistException e) {
//ignore

5
src/integration/java/org/springframework/data/couchbase/core/ReactiveCouchbaseTemplateViewListener.java → src/integration/java/org/springframework/data/couchbase/core/RxCouchbaseTemplateQueryListener.java
View File

@@ -21,6 +21,8 @@ import java.util.Collections;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.cluster.ClusterInfo;
import com.couchbase.client.java.error.DocumentDoesNotExistException;
import com.couchbase.client.java.query.Index;
import com.couchbase.client.java.query.N1qlQuery;
import com.couchbase.client.java.view.*;
import org.springframework.data.couchbase.config.BeanNames;
@@ -31,7 +33,7 @@ import rx.Observable;
/**
* @author Subhashni Balakrishnan
*/
public class ReactiveCouchbaseTemplateViewListener extends DependencyInjectionTestExecutionListener {
public class RxCouchbaseTemplateQueryListener extends DependencyInjectionTestExecutionListener {
@Override
public void beforeTestClass(final TestContext testContext) throws Exception {
@@ -39,6 +41,7 @@ public class ReactiveCouchbaseTemplateViewListener extends DependencyInjectionTe
ClusterInfo clusterInfo = (ClusterInfo) testContext.getApplicationContext().getBean(BeanNames.COUCHBASE_CLUSTER_INFO);
populateTestData(client, clusterInfo);
createAndWaitForDesignDocs(client);
client.query(N1qlQuery.simple(Index.createPrimaryIndex().on(client.name())));
}
private void populateTestData(Bucket client, ClusterInfo clusterInfo) {

31
src/integration/java/org/springframework/data/couchbase/core/RxJavaCouchbaseTemplateTests.java
View File

@@ -28,8 +28,6 @@ import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.PersistTo;
import com.couchbase.client.java.ReplicateTo;
import com.couchbase.client.java.document.RawJsonDocument;
import com.couchbase.client.java.error.DocumentAlreadyExistsException;
import com.couchbase.client.java.error.DocumentDoesNotExistException;
import com.couchbase.client.java.query.AsyncN1qlQueryResult;
import com.couchbase.client.java.query.N1qlParams;
import com.couchbase.client.java.query.N1qlQuery;
@@ -39,7 +37,6 @@ import com.couchbase.client.java.view.Stale;
import com.couchbase.client.java.view.ViewQuery;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -60,7 +57,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
**/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = ReactiveIntegrationTestApplicationConfig.class)
@TestExecutionListeners(ReactiveCouchbaseTemplateViewListener.class)
@TestExecutionListeners(RxCouchbaseTemplateQueryListener.class)
public class RxJavaCouchbaseTemplateTests {
@Rule
@@ -76,12 +73,18 @@ public class RxJavaCouchbaseTemplateTests {
private void removeIfExist(String key) {
template.remove(key).subscribe();
template.remove(key).subscribe(
v -> {},
err -> {}
);
}
private void removeCollectionIfExist(Collection<ReactiveBeer> beers) {
template.remove(beers, PersistTo.MASTER, ReplicateTo.NONE)
.subscribe();
.subscribe(
v -> {},
err -> {}
);
}
@Test
@@ -129,7 +132,7 @@ public class RxJavaCouchbaseTemplateTests {
removeIfExist(id);
template.save(beer).subscribe();
Object result = client.get(id);
Object result = template.findById(id, ReactiveBeer.class).toBlocking().single();
assertNotNull(result);
template.remove(beer).subscribe();
@@ -154,7 +157,7 @@ public class RxJavaCouchbaseTemplateTests {
ComplexPerson complex = new ComplexPerson(id, names, votes, info1, info2);
template.save(complex).toBlocking();
template.save(complex).subscribe();
assertNotNull(client.get(id));
ComplexPerson response = template.findById(id, ComplexPerson.class).toBlocking().single();
@@ -199,12 +202,10 @@ public class RxJavaCouchbaseTemplateTests {
@Test
public void shouldQueryRaw() {
N1qlQuery query = N1qlQuery.simple(select("name").from(i(client.name()))
.where(x("name").isNotMissing()));
N1qlQuery query = N1qlQuery.simple(select("name").from(i(client.name())).limit(1));
AsyncN1qlQueryResult queryResult = template.queryN1QL(query).toBlocking().single();
assertNotNull(queryResult);
assertTrue(queryResult.errors().toString(), queryResult.finalSuccess().toBlocking().single());
assertTrue(queryResult.finalSuccess().toBlocking().single());
assertFalse(queryResult.rows().toList().toBlocking().single().isEmpty());
}
@@ -212,7 +213,7 @@ public class RxJavaCouchbaseTemplateTests {
public void shouldQueryWithMapping() {
FullFragment ff1 = new FullFragment("fullFragment1", 1, "fullFragment", "test1");
FullFragment ff2 = new FullFragment("fullFragment2", 2, "fullFragment", "test2");
template.save(Arrays.asList(ff1, ff2));
template.save(Arrays.asList(ff1, ff2)).subscribe();
N1qlQuery query = N1qlQuery.simple(select(i("value")) //"value" is a n1ql keyword apparently
.from(i(client.name()))
@@ -270,9 +271,9 @@ public class RxJavaCouchbaseTemplateTests {
String id = "simple-doc-with-update-expiry-for-read";
DocumentWithTouchOnRead doc = new DocumentWithTouchOnRead(id);
template.save(doc).subscribe();
Thread.sleep(1500);
Thread.sleep(1000);
assertNotNull(template.findById(id, DocumentWithTouchOnRead.class).toBlocking().single());
Thread.sleep(1500);
Thread.sleep(1000);
assertNotNull(template.findById(id, DocumentWithTouchOnRead.class).toBlocking().single());
Thread.sleep(3000);
assertNull(template.findById(id, DocumentWithTouchOnRead.class).toBlocking().single());

6
src/integration/java/org/springframework/data/couchbase/repository/ReactivePartyRepository.java
View File

@@ -13,15 +13,15 @@ import reactor.core.publisher.Mono;
/**
* @author Subhashni Balakrishnan
*/
@ViewIndexed(designDoc = "party", viewName = "all")
@N1qlSecondaryIndexed(indexName = "party")
@ViewIndexed(designDoc = "reactiveParty", viewName = "all")
@N1qlSecondaryIndexed(indexName = "reactiveParty")
public interface ReactivePartyRepository extends ReactiveCouchbaseRepository<Party, String> {
Flux<Party> findByAttendeesGreaterThanEqual(int minAttendees);
Flux<Party> findByEventDateIs(Date targetDate);
@View(designDocument = "party", viewName = "byDate")
@View(designDocument = "reactiveParty", viewName = "byDate")
Flux<Party> findFirst3ByEventDateGreaterThanEqual(Date targetDate);
Flux<Object> findAllByDescriptionNotNull();

10
src/integration/java/org/springframework/data/couchbase/repository/ReactiveUserRepository.java
View File

@@ -20,25 +20,29 @@ import java.util.List;
import com.couchbase.client.java.view.ViewQuery;
import org.springframework.data.couchbase.core.query.N1qlSecondaryIndexed;
import org.springframework.data.couchbase.core.query.Query;
import org.springframework.data.couchbase.core.query.View;
import org.springframework.data.couchbase.core.query.ViewIndexed;
import reactor.core.publisher.Flux;
/**
* @author Subhashni Balakrishnan
*/
@ViewIndexed(designDoc = "reactiveUser", viewName = "all")
@N1qlSecondaryIndexed(indexName = "reactiveUser")
public interface ReactiveUserRepository extends ReactiveCouchbaseRepository<ReactiveUser, String> {
@View(designDocument = "user", viewName = "all")
Flux<ReactiveUser> customViewQuery(ViewQuery query);
@Query("#{#n1ql.selectEntity} WHERE username = $1")
@Query("#{#n1ql.selectEntity} WHERE username = $1 and #{#n1ql.filter}")
Flux<ReactiveUser> findByUsername(String username);
@Query("SELECT * FROM #{#n1ql.bucket} WHERE username = $1")
@Query("SELECT * FROM #{#n1ql.bucket} WHERE username = $1 and #{#n1ql.filter}")
Flux<ReactiveUser> findByUsernameBadSelect(String username);
@Query("#{#n1ql.selectEntity} WHERE username LIKE '%-#{3 + 1}'")
@Query("#{#n1ql.selectEntity} WHERE username LIKE '%-#{3 + 1}' and #{#n1ql.filter}")
Flux<ReactiveUser> findByUsernameWithSpelAndPlaceholder();
@Query

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

@@ -20,8 +20,10 @@ import java.util.List;
import com.couchbase.client.java.view.ViewQuery;
import org.springframework.data.couchbase.core.query.N1qlSecondaryIndexed;
import org.springframework.data.couchbase.core.query.Query;
import org.springframework.data.couchbase.core.query.View;
import org.springframework.data.couchbase.core.query.ViewIndexed;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
@@ -29,6 +31,8 @@ import org.springframework.data.domain.Slice;
/**
* @author Michael Nitschinger
*/
@ViewIndexed(designDoc = "user", viewName = "all")
@N1qlSecondaryIndexed(indexName = "User")
public interface UserRepository extends CouchbaseRepository<User, String> {
@View(designDocument = "user", viewName = "all")

9
src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTestListener.java
View File

@@ -1,6 +1,7 @@
package org.springframework.data.couchbase.repository.index;
import com.couchbase.client.java.Bucket;
import com.couchbase.client.java.error.DesignDocumentDoesNotExistException;
import com.couchbase.client.java.query.Index;
import com.couchbase.client.java.query.N1qlQuery;
@@ -18,8 +19,12 @@ public class IndexedRepositoryTestListener extends DependencyInjectionTestExecut
@Override
public void beforeTestClass(final TestContext testContext) throws Exception {
Bucket client = (Bucket) testContext.getApplicationContext().getBean(BeanNames.COUCHBASE_BUCKET);
client.bucketManager().removeDesignDocument(IndexedRepositoryTests.VIEW_DOC);
client.bucketManager().removeDesignDocument("foo");
try {
client.bucketManager().removeDesignDocument(IndexedRepositoryTests.VIEW_DOC);
client.bucketManager().removeDesignDocument("foo");
} catch (DesignDocumentDoesNotExistException ex) {
//ignore
}
client.query(N1qlQuery.simple(Index.dropPrimaryIndex(client.name())));
client.query(N1qlQuery.simple(Index.dropIndex(client.name(), IndexedRepositoryTests.SECONDARY)));
}

40
src/integration/java/org/springframework/data/couchbase/repository/index/IndexedRepositoryTests.java
View File

@@ -20,6 +20,7 @@ import static org.junit.Assert.*;
import java.util.Arrays;
import com.couchbase.client.java.error.DesignDocumentDoesNotExistException;
import com.couchbase.client.java.query.N1qlQuery;
import com.couchbase.client.java.query.N1qlQueryResult;
import com.couchbase.client.java.view.DesignDocument;
@@ -81,13 +82,10 @@ public class IndexedRepositoryTests {
IndexedUserRepository repository = factory.getRepository(IndexedUserRepository.class);
String bucket = template.getCouchbaseBucket().name();
N1qlQuery existQuery = N1qlQuery.simple("SELECT COUNT(name) = 1 AS exist FROM system:indexes WHERE keyspace_id = \"" + bucket
+ "\" AND is_primary");
N1qlQuery existQuery = N1qlQuery.simple("SELECT 1 FROM `"+ bucket +"`");
N1qlQueryResult exist = template.queryN1QL(existQuery);
assertTrue(exist.finalSuccess());
assertEquals(1, exist.allRows().size());
assertEquals(true, exist.allRows().get(0).value().getBoolean("exist"));
}
@Test
@@ -95,22 +93,24 @@ public class IndexedRepositoryTests {
IndexedUserRepository repository = factory.getRepository(IndexedUserRepository.class);
String bucket = template.getCouchbaseBucket().name();
N1qlQuery existQuery = N1qlQuery.simple("SELECT COUNT(name) = 1 AS exist FROM system:indexes WHERE keyspace_id = \"" + bucket
+ "\" AND name = \"" + SECONDARY + "\"");
N1qlQuery existQuery = N1qlQuery.simple("SELECT 1 FROM `"+ bucket +"` USE INDEX (" + SECONDARY +")");
N1qlQueryResult exist = template.queryN1QL(existQuery);
assertTrue(exist.finalSuccess());
assertEquals(1, exist.allRows().size());
assertEquals(true, exist.allRows().get(0).value().getBoolean("exist"));
}
@Test
public void shouldFindViewIndex() {
IndexedUserRepository repository = factory.getRepository(IndexedUserRepository.class);
DesignDocument designDoc = template.getCouchbaseBucket()
.bucketManager()
.getDesignDocument(VIEW_DOC);
DesignDocument designDoc = null;
try {
designDoc = template.getCouchbaseBucket()
.bucketManager()
.getDesignDocument(VIEW_DOC);
} catch(DesignDocumentDoesNotExistException ex) {
}
assertNotNull(designDoc);
for (View view : designDoc.views()) {
@@ -123,22 +123,24 @@ public class IndexedRepositoryTests {
AnotherIndexedUserRepository repository = ignoringIndexFactory.getRepository(AnotherIndexedUserRepository.class);
String bucket = template.getCouchbaseBucket().name();
N1qlQuery existQuery = N1qlQuery.simple("SELECT COUNT(name) = 1 AS exist FROM system:indexes WHERE keyspace_id = \"" + bucket
+ "\" AND name = \"" + IGNORED_SECONDARY + "\"");
N1qlQuery existQuery = N1qlQuery.simple("SELECT 1 FROM `"+ bucket +"` USE INDEX (" + IGNORED_SECONDARY +")");
N1qlQueryResult exist = template.queryN1QL(existQuery);
assertTrue(exist.finalSuccess());
assertEquals(1, exist.allRows().size());
assertEquals(false, exist.allRows().get(0).value().getBoolean("exist"));
assertFalse(exist.finalSuccess());
}
@Test
public void shouldNotFindViewIndexWithIgnoringIndexManager() {
AnotherIndexedUserRepository repository = ignoringIndexFactory.getRepository(AnotherIndexedUserRepository.class);
DesignDocument designDoc = template.getCouchbaseBucket()
.bucketManager()
.getDesignDocument(VIEW_DOC);
DesignDocument designDoc = null;
try {
designDoc = template.getCouchbaseBucket()
.bucketManager()
.getDesignDocument(VIEW_DOC);
} catch(DesignDocumentDoesNotExistException ex) {
//ignored
}
if (designDoc != null) {
for (View view : designDoc.views()) {