From 815971b33d12e921185bacb9821a557e6eeb7477 Mon Sep 17 00:00:00 2001 From: Michael Nitschinger Date: Wed, 17 Feb 2021 09:37:08 +0100 Subject: [PATCH] Revert "DATACOUCH-650 - Implements CrudRepository and ReactiveCrudRepository.deleteById(Iterable ids)." This reverts commit f8b77492891ae6a02f91c5ef087c8e2a642943c1. --- pom.xml | 8 +-- .../support/SimpleCouchbaseRepository.java | 7 --- .../SimpleReactiveCouchbaseRepository.java | 6 -- ...chbaseRepositoryQueryIntegrationTests.java | 26 +-------- ...chbaseRepositoryQueryIntegrationTests.java | 56 ++++++------------- 5 files changed, 18 insertions(+), 85 deletions(-) diff --git a/pom.xml b/pom.xml index db533050..29ee6ad2 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 3.0.10 3.0.10 - 2.4.0-DATACMNS-800-SNAPSHOT + 2.3.7.BUILD-SNAPSHOT spring.data.couchbase @@ -161,12 +161,6 @@ test - - io.projectreactor - reactor-test - test - - org.jetbrains.kotlin diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java index 5e8d569f..7444e916 100644 --- a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java +++ b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleCouchbaseRepository.java @@ -42,7 +42,6 @@ import com.couchbase.client.java.query.QueryScanConsistency; * * @author Michael Nitschinger * @author Mark Paluch - * @author Jens Schauder */ public class SimpleCouchbaseRepository implements CouchbaseRepository { @@ -131,12 +130,6 @@ public class SimpleCouchbaseRepository implements CouchbaseRepository ids) { - Assert.notNull(ids, "The given Iterable of ids must not be null!"); - couchbaseOperations.removeById().all(Streamable.of(ids).map(Objects::toString).toList()); - } - @Override public long count() { return couchbaseOperations.findByQuery(entityInformation.getJavaType()).consistentWith(buildQueryScanConsistency()) diff --git a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java index fe2bcd96..94a77a3e 100644 --- a/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java +++ b/src/main/java/org/springframework/data/couchbase/repository/support/SimpleReactiveCouchbaseRepository.java @@ -44,7 +44,6 @@ import com.couchbase.client.java.query.QueryScanConsistency; * @author Christoph Strobl * @author David Kelly * @author Douglas Six - * @author Jens Schauder * @since 3.0 */ public class SimpleReactiveCouchbaseRepository implements ReactiveCouchbaseRepository { @@ -186,11 +185,6 @@ public class SimpleReactiveCouchbaseRepository implements ReactiveCouchba return Flux.from(entityStream).flatMap(this::delete).single(); } - @Override - public Mono deleteAllById(final Iterable ids) { - return operations.removeById().all(Streamable.of(ids).map(Object::toString).toList()).then(); - } - @SuppressWarnings("unchecked") @Override public Mono count() { diff --git a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java index 4c14ce1d..dc98617c 100644 --- a/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/CouchbaseRepositoryQueryIntegrationTests.java @@ -16,8 +16,6 @@ package org.springframework.data.couchbase.repository; -import static java.util.Arrays.*; -import static org.assertj.core.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*; import java.util.ArrayList; @@ -28,7 +26,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -50,7 +47,6 @@ import org.springframework.data.couchbase.util.Capabilities; import org.springframework.data.couchbase.util.ClusterAwareIntegrationTests; import org.springframework.data.couchbase.util.ClusterType; import org.springframework.data.couchbase.util.IgnoreWhen; -import org.springframework.data.util.StreamUtils; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import com.couchbase.client.core.error.IndexExistsException; @@ -60,7 +56,6 @@ import com.couchbase.client.core.error.IndexExistsException; * * @author Michael Nitschinger * @author Michael Reiche - * @author Jens Schauder */ @SpringJUnitConfig(CouchbaseRepositoryQueryIntegrationTests.Config.class) @IgnoreWhen(missesCapabilities = Capabilities.QUERY, clusterTypes = ClusterType.MOCKED) @@ -175,7 +170,7 @@ public class CouchbaseRepositoryQueryIntegrationTests extends ClusterAwareIntegr airportRepository.save(airport); } - Long count = airportRepository.countFancyExpression(asList("JFK"), asList("jfk"), false); + Long count = airportRepository.countFancyExpression(Arrays.asList("JFK"), Arrays.asList("jfk"), false); assertEquals(1, count); long airportCount = airportRepository.count(); @@ -282,25 +277,6 @@ public class CouchbaseRepositoryQueryIntegrationTests extends ClusterAwareIntegr } } - @Test // DATACOUCH-650 - void deleteAllById() { - - Airport vienna = new Airport("airports::vie", "vie", "LOWW"); - Airport frankfurt = new Airport("airports::fra", "fra", "EDDF"); - Airport losAngeles = new Airport("airports::lax", "lax", "KLAX"); - - try { - airportRepository.saveAll(asList(vienna, frankfurt, losAngeles)); - - airportRepository.deleteAllById(asList(vienna.getId(), losAngeles.getId())); - - - assertThat(airportRepository.findAll()).containsExactly(frankfurt); - } finally { - airportRepository.deleteAll(); - } - } - private void sleep(int millis) { try { Thread.sleep(millis); // so they are executed out-of-order diff --git a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java index 935c79d9..12285ae0 100644 --- a/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java +++ b/src/test/java/org/springframework/data/couchbase/repository/ReactiveCouchbaseRepositoryQueryIntegrationTests.java @@ -16,7 +16,15 @@ package org.springframework.data.couchbase.repository; -import com.couchbase.client.core.error.IndexExistsException; +import static org.junit.jupiter.api.Assertions.*; + +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.stream.Collectors; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -35,18 +43,8 @@ import org.springframework.data.couchbase.util.ClusterAwareIntegrationTests; import org.springframework.data.couchbase.util.ClusterType; import org.springframework.data.couchbase.util.IgnoreWhen; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; -import reactor.test.StepVerifier; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.stream.Collectors; - -import static java.util.Arrays.*; -import static org.assertj.core.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.*; +import com.couchbase.client.core.error.IndexExistsException; /** * template class for Reactive Couchbase operations @@ -58,13 +56,10 @@ import static org.junit.jupiter.api.Assertions.*; @IgnoreWhen(missesCapabilities = Capabilities.QUERY, clusterTypes = ClusterType.MOCKED) public class ReactiveCouchbaseRepositoryQueryIntegrationTests extends ClusterAwareIntegrationTests { - @Autowired - CouchbaseClientFactory clientFactory; + @Autowired CouchbaseClientFactory clientFactory; - @Autowired - ReactiveAirportRepository airportRepository; // intellij flags "Could not Autowire", but it runs ok. - @Autowired - ReactiveUserRepository userRepository; // intellij flags "Could not Autowire", but it runs ok. + @Autowired ReactiveAirportRepository airportRepository; // intellij flags "Could not Autowire", but it runs ok. + @Autowired ReactiveUserRepository userRepository; // intellij flags "Could not Autowire", but it runs ok. @BeforeEach void beforeEach() { @@ -98,9 +93,9 @@ public class ReactiveCouchbaseRepositoryQueryIntegrationTests extends ClusterAwa vie = new Airport("airports::vie", "vie", "loww"); airportRepository.save(vie).block(); List airports1 = airportRepository.findAllByIata("vie").collectList().block(); - assertEquals(1, airports1.size()); + assertEquals(1,airports1.size()); List airports2 = airportRepository.findAllByIata("vie").collectList().block(); - assertEquals(1, airports2.size()); + assertEquals(1,airports2.size()); } finally { airportRepository.delete(vie).block(); } @@ -119,7 +114,7 @@ public class ReactiveCouchbaseRepositoryQueryIntegrationTests extends ClusterAwa @Test void count() { - String[] iatas = {"JFK", "IAD", "SFO", "SJC", "SEA", "LAX", "PHX"}; + String[] iatas = { "JFK", "IAD", "SFO", "SJC", "SEA", "LAX", "PHX" }; Future[] future = new Future[iatas.length]; ExecutorService executorService = Executors.newFixedThreadPool(iatas.length); try { @@ -153,25 +148,6 @@ public class ReactiveCouchbaseRepositoryQueryIntegrationTests extends ClusterAwa } } - @Test - // DATACOUCH-650 - void deleteAllById() { - - Airport vienna = new Airport("airports::vie", "vie", "LOWW"); - Airport frankfurt = new Airport("airports::fra", "fra", "EDDF"); - Airport losAngeles = new Airport("airports::lax", "lax", "KLAX"); - - try { - airportRepository.saveAll(asList(vienna, frankfurt, losAngeles)).as(StepVerifier::create).verifyComplete(); - - airportRepository.deleteAllById(asList(vienna.getId(), losAngeles.getId())).as(StepVerifier::create).verifyComplete(); - - airportRepository.findAll().as(StepVerifier::create).expectNext(frankfurt).verifyComplete(); - } finally { - airportRepository.deleteAll(); - } - } - @Configuration @EnableReactiveCouchbaseRepositories("org.springframework.data.couchbase") static class Config extends AbstractCouchbaseConfiguration {