DATACOUCH-623 - Add replace() method to CouchbaseRepository for CAS usage.

Author: mikereiche

src/main/java/org/springframework/data/couchbase/repository/CouchbaseRepository.java

@@ -43,4 +43,8 @@ public interface CouchbaseRepository<T, ID> extends PagingAndSortingRepository<T
 	@Override
 	List<T> findAllById(Iterable<ID> iterable);
 
+	<S extends T> S replace(S var1);
+
+	<S extends T> Iterable<S> replaceAll(Iterable<S> var1);
+
 }

src/main/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepository.java

@@ -15,8 +15,11 @@
  */
 package org.springframework.data.couchbase.repository;
 
+import org.reactivestreams.Publisher;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.reactive.ReactiveSortingRepository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 /**
  * Couchbase-specific {@link ReactiveSortingRepository} implementation.
@@ -27,4 +30,10 @@
 @NoRepositoryBean
 public interface ReactiveCouchbaseRepository<T, ID> extends ReactiveSortingRepository<T, ID> {
 
-}
+  public <S extends T> Mono<S> replace(final S entity);
+
+  public <S extends T> Flux<S> replaceAll(final Iterable<S> entities);
+
+  public <S extends T> Flux<S> replaceAll(final Publisher<S> entityStream);
+
+  }

src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java

@@ -86,6 +86,21 @@ public <S extends T> Iterable<S> saveAll(final Iterable<S> entities) {
 				.all(Streamable.of(entities).toList());
 	}
 
+	@Override
+	@SuppressWarnings("unchecked")
+	public <S extends T> S replace(final S entity) {
+		Assert.notNull(entity, "Entity must not be null!");
+		return (S) couchbaseOperations.replaceById(entityInformation.getJavaType()).one(entity);
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <S extends T> Iterable<S> replaceAll(final Iterable<S> entities) {
+		Assert.notNull(entities, "The given Iterable of entities must not be null!");
+		return (Iterable<S>) couchbaseOperations.replaceById(entityInformation.getJavaType())
+				.all(Streamable.of(entities).toList());
+	}
+
 	@Override
 	public Optional<T> findById(final ID id) {
 		Assert.notNull(id, "The given id must not be null!");

src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java

@@ -80,6 +80,12 @@ public <S extends T> Mono<S> save(final S entity) {
 		return (Mono<S>) operations.upsertById(entityInformation.getJavaType()).one(entity);
 	}
 
+	@SuppressWarnings("unchecked")
+	public <S extends T> Mono<S> replace(final S entity) {
+		Assert.notNull(entity, "Entity must not be null!");
+		return (Mono<S>) operations.replaceById(entityInformation.getJavaType()).one(entity);
+	}
+
 	@Override
 	public Flux<T> findAll(final Sort sort) {
 		return findAll(new Query().with(sort));
@@ -99,6 +105,20 @@ public <S extends T> Flux<S> saveAll(final Publisher<S> entityStream) {
 		return Flux.from(entityStream).flatMap(this::save);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public <S extends T> Flux<S> replaceAll(final Iterable<S> entities) {
+		Assert.notNull(entities, "The given Iterable of entities must not be null!");
+		return (Flux<S>) operations.replaceById(entityInformation.getJavaType()).all(Streamable.of(entities).toList());
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <S extends T> Flux<S> replaceAll(final Publisher<S> entityStream) {
+		Assert.notNull(entityStream, "The given Iterable of entities must not be null!");
+		return Flux.from(entityStream).flatMap(this::replace);
+	}
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Mono<T> findById(final ID id) {

src/test/java/org/springframework/data/couchbase/domain/UserRepository.java

@@ -18,6 +18,8 @@
 
 import java.util.List;
 
+import com.couchbase.client.java.json.JsonArray;
+import org.springframework.data.couchbase.repository.CouchbaseRepository;
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
@@ -30,10 +32,14 @@
  * @author Michael Reiche
  */
 @Repository
-public interface UserRepository extends PagingAndSortingRepository<User, String> {
+public interface UserRepository extends CouchbaseRepository<User, String> {
 
 	List<User> findByFirstname(String firstname);
 
+	List<User> findByFirstnameIn(String... firstnames);
+
+	List<User> findByFirstnameIn(JsonArray firstnames);
+
 	List<User> findByFirstnameAndLastname(String firstname, String lastname);
 
 	@Query("#{#n1ql.selectEntity} where #{#n1ql.filter} and firstname = $1 and lastname = $2")

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

@@ -31,10 +31,13 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.couchbase.CouchbaseClientFactory;
 import org.springframework.data.couchbase.config.AbstractCouchbaseConfiguration;
 import org.springframework.data.couchbase.domain.Airport;
 import org.springframework.data.couchbase.domain.AirportRepository;
+import org.springframework.data.couchbase.domain.User;
+import org.springframework.data.couchbase.domain.UserRepository;
 import org.springframework.data.couchbase.repository.config.EnableCouchbaseRepositories;
 import org.springframework.data.couchbase.util.Capabilities;
 import org.springframework.data.couchbase.util.ClusterAwareIntegrationTests;
@@ -58,6 +61,8 @@ public class CouchbaseRepositoryQueryIntegrationTests extends ClusterAwareIntegr
 
 	@Autowired AirportRepository airportRepository;
 
+	@Autowired UserRepository userRepository;
+
 	@BeforeEach
 	void beforeEach() {
 		try {
@@ -118,6 +123,17 @@ void findBySimpleProperty() {
 
 	}
 
+	@Test
+	public void testCas() {
+
+		User user = new User("1", "Dave", "Wilson");
+		userRepository.save(user);
+		user.setVersion(user.getVersion() - 1);
+		assertThrows(DataIntegrityViolationException.class, () -> userRepository.replace(user));
+		userRepository.delete(user);
+
+	}
+
 	@Test
 	void count() {
 		String[] iatas = { "JFK", "IAD", "SFO", "SJC", "SEA", "LAX", "PHX" };
@@ -132,8 +148,8 @@ void count() {
 				airportRepository.save(airport);
 			}
 
-			Long count = airportRepository.countFancyExpression( Arrays.asList("JFK"), Arrays.asList("jfk"), false);
-			assertEquals( 1, count);
+			Long count = airportRepository.countFancyExpression(Arrays.asList("JFK"), Arrays.asList("jfk"), false);
+			assertEquals(1, count);
 
 			long airportCount = airportRepository.count();
 			assertEquals(7, airportCount);