From e3d89873d6cbf8a334a8c799573d875e5c873b27 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Wed, 12 Dec 2018 14:57:44 +0100 Subject: [PATCH] Demonstrate how to replace the rx static method by a static proxy creation method that will be generated on the rx version as static method --- .../io/vertx/guides/wiki/database/WikiDatabaseService.java | 5 ++--- .../java/io/vertx/guides/wiki/http/HttpServerVerticle.java | 2 +- .../vertx/guides/wiki/database/WikiDatabaseVerticleTest.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/step-8/src/main/java/io/vertx/guides/wiki/database/WikiDatabaseService.java b/step-8/src/main/java/io/vertx/guides/wiki/database/WikiDatabaseService.java index baaf30a..6851f00 100644 --- a/step-8/src/main/java/io/vertx/guides/wiki/database/WikiDatabaseService.java +++ b/step-8/src/main/java/io/vertx/guides/wiki/database/WikiDatabaseService.java @@ -43,9 +43,8 @@ static WikiDatabaseService create(JDBCClient dbClient, HashMap return new WikiDatabaseServiceImpl(dbClient, sqlQueries, readyHandler); } - @GenIgnore - static io.vertx.guides.wiki.database.reactivex.WikiDatabaseService createProxy(Vertx vertx, String address) { - return new io.vertx.guides.wiki.database.reactivex.WikiDatabaseService(new WikiDatabaseServiceVertxEBProxy(vertx, address)); + static io.vertx.guides.wiki.database.WikiDatabaseService createProxy(Vertx vertx, String address) { + return new WikiDatabaseServiceVertxEBProxy(vertx, address); } @Fluent diff --git a/step-8/src/main/java/io/vertx/guides/wiki/http/HttpServerVerticle.java b/step-8/src/main/java/io/vertx/guides/wiki/http/HttpServerVerticle.java index f898b77..a159220 100644 --- a/step-8/src/main/java/io/vertx/guides/wiki/http/HttpServerVerticle.java +++ b/step-8/src/main/java/io/vertx/guides/wiki/http/HttpServerVerticle.java @@ -80,7 +80,7 @@ public class HttpServerVerticle extends AbstractVerticle { public void start(Future startFuture) throws Exception { String wikiDbQueue = config().getString(CONFIG_WIKIDB_QUEUE, "wikidb.queue"); - dbService = io.vertx.guides.wiki.database.WikiDatabaseService.createProxy(vertx.getDelegate(), wikiDbQueue); + dbService = WikiDatabaseService.createProxy(vertx, wikiDbQueue); // end::rx-vertx-delegate[] webClient = WebClient.create(vertx, new WebClientOptions() diff --git a/step-8/src/test/java/io/vertx/guides/wiki/database/WikiDatabaseVerticleTest.java b/step-8/src/test/java/io/vertx/guides/wiki/database/WikiDatabaseVerticleTest.java index d627bb7..889a81c 100644 --- a/step-8/src/test/java/io/vertx/guides/wiki/database/WikiDatabaseVerticleTest.java +++ b/step-8/src/test/java/io/vertx/guides/wiki/database/WikiDatabaseVerticleTest.java @@ -18,12 +18,12 @@ package io.vertx.guides.wiki.database; import io.vertx.core.DeploymentOptions; -import io.vertx.core.Vertx; import io.vertx.core.json.JsonObject; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext; import io.vertx.ext.unit.junit.VertxUnitRunner; import io.vertx.guides.wiki.database.reactivex.WikiDatabaseService; +import io.vertx.reactivex.core.Vertx; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -47,7 +47,7 @@ public void prepare(TestContext context) throws InterruptedException { .put(WikiDatabaseVerticle.CONFIG_WIKIDB_JDBC_MAX_POOL_SIZE, 4); vertx.deployVerticle(new WikiDatabaseVerticle(), new DeploymentOptions().setConfig(conf), context.asyncAssertSuccess(id -> - service = io.vertx.guides.wiki.database.WikiDatabaseService.createProxy(vertx, WikiDatabaseVerticle.CONFIG_WIKIDB_QUEUE))); + service = WikiDatabaseService.createProxy(vertx, WikiDatabaseVerticle.CONFIG_WIKIDB_QUEUE))); } @After