From 90546357c7a8c54dd18c200b4b0382b1b9d54326 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 25 Aug 2017 13:37:28 +0200 Subject: [PATCH] #291 - Adapt to API changes in Spring Data Cassandra. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Exclude CassandraDataAutoConfiguration because the referenced Spring Data Cassandra version is not compatible with CassandraDataAutoConfiguration. Refactor bulk loading to flapMap(…) as CassandraTemplate.insert(…) no longer accepts an entity stream. --- cassandra/pom.xml | 2 +- .../cassandra/people/ApplicationConfiguration.java | 3 ++- .../people/ReactiveCassandraTemplateIntegrationTest.java | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 1f698a0c..60afd4a8 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -20,7 +20,7 @@ util example java8 - + reactive diff --git a/cassandra/reactive/src/main/java/example/springdata/cassandra/people/ApplicationConfiguration.java b/cassandra/reactive/src/main/java/example/springdata/cassandra/people/ApplicationConfiguration.java index d3d023a3..0685d9fe 100644 --- a/cassandra/reactive/src/main/java/example/springdata/cassandra/people/ApplicationConfiguration.java +++ b/cassandra/reactive/src/main/java/example/springdata/cassandra/people/ApplicationConfiguration.java @@ -16,6 +16,7 @@ package example.springdata.cassandra.people; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration; import org.springframework.data.cassandra.config.AbstractReactiveCassandraConfiguration; import org.springframework.data.cassandra.config.SchemaAction; import org.springframework.data.cassandra.repository.config.EnableReactiveCassandraRepositories; @@ -25,7 +26,7 @@ import org.springframework.data.cassandra.repository.config.EnableReactiveCassan * * @author Mark Paluch */ -@SpringBootApplication +@SpringBootApplication(exclude = CassandraDataAutoConfiguration.class) @EnableReactiveCassandraRepositories class ApplicationConfiguration extends AbstractReactiveCassandraConfiguration { diff --git a/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactiveCassandraTemplateIntegrationTest.java b/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactiveCassandraTemplateIntegrationTest.java index dd0383a2..c9aa4eb5 100644 --- a/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactiveCassandraTemplateIntegrationTest.java +++ b/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactiveCassandraTemplateIntegrationTest.java @@ -53,10 +53,11 @@ public class ReactiveCassandraTemplateIntegrationTest { public void setUp() { template.truncate(Person.class) // - .thenMany(template.insert(Flux.just(new Person("Walter", "White", 50), // + .thenMany(Flux.just(new Person("Walter", "White", 50), // new Person("Skyler", "White", 45), // new Person("Saul", "Goodman", 42), // - new Person("Jesse", "Pinkman", 27)))) // + new Person("Jesse", "Pinkman", 27))) // + .flatMap(template::insert) // .then() // .block(); }