From 42a27837a0c6e670f4f1b0664eb4efb8c51385aa Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 11 Sep 2017 16:06:29 +0200 Subject: [PATCH] #297 - Adapt to latest API changes in Reactor 3.1 RC1 and Spring Data MongoDB. --- .../people/ReactiveCassandraTemplateIntegrationTest.java | 2 +- .../people/ReactivePersonRepositoryIntegrationTest.java | 2 +- .../springdata/mongodb/people/ApplicationConfiguration.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 aa676094..66baaddb 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 @@ -79,7 +79,7 @@ public class ReactiveCassandraTemplateIntegrationTest { .last() // .flatMap(v -> template.count(Person.class)) // .doOnNext(System.out::println) // - .doOnTerminate((i, t) -> countDownLatch.countDown()) // + .doOnTerminate(countDownLatch::countDown) // .subscribe(); countDownLatch.await(); diff --git a/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactivePersonRepositoryIntegrationTest.java b/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactivePersonRepositoryIntegrationTest.java index baeda41a..2c962f1d 100644 --- a/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactivePersonRepositoryIntegrationTest.java +++ b/cassandra/reactive/src/test/java/example/springdata/cassandra/people/ReactivePersonRepositoryIntegrationTest.java @@ -75,7 +75,7 @@ public class ReactivePersonRepositoryIntegrationTest { .last() // .flatMap(v -> repository.count()) // .doOnNext(System.out::println) // - .doOnTerminate((l, t) -> countDownLatch.countDown()) // + .doOnTerminate(countDownLatch::countDown) // .subscribe(); countDownLatch.await(); diff --git a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ApplicationConfiguration.java b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ApplicationConfiguration.java index d6a8bbaa..921423be 100644 --- a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ApplicationConfiguration.java +++ b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/ApplicationConfiguration.java @@ -54,7 +54,7 @@ class ApplicationConfiguration extends AbstractReactiveMongoConfiguration { @Override @Bean @DependsOn("embeddedMongoServer") - public MongoClient mongoClient() { + public MongoClient reactiveMongoClient() { int port = environment.getProperty("local.mongo.port", Integer.class); return MongoClients.create(String.format("mongodb://localhost:%d", port)); }