rx module: add rx() mapper by default fix #386

Author: jknack

jooby-mongodb-rx/src/main/java/org/jooby/mongodb/MongoRx.java

@@ -72,6 +72,11 @@
  * execution, concise code, and functional composition of results.
  * </p>
  *
+ * <p>
+ * This module depends on {@link Rx} module, please read the {@link Rx} documentation before using
+ * this module.
+ * </p>
+ *
  * <h2>exports</h2>
  * <ul>
  * <li>{@link MongoClient}</li>
@@ -80,12 +85,20 @@
  * <li>{@link Route.Mapper} for mongo observables</li>
  * </ul>
  *
+ * <h2>depends on</h2>
+ * <ul>
+ * <li>{@link Rx rx module}</li>
+ * </ul>
+ *
  * <h2>usage</h2>
  * <pre>{@code
  *
  * import org.jooby.mongodb.MongoRx;
  *
  * {
+ *   // required by MongoRx
+ *   use(new Rx());
+ *
  *   use(new MongoRx());
  *
  *   get("/", req -> {
@@ -110,6 +123,9 @@
  * </p>
  * <pre>{@code
  * {
+ *   // required by MongoRx
+ *   use(new Rx());
+ *
  *   use(new MongoRx("mongodb://localhost/mydb"));
  * }
  * }</pre>
@@ -120,6 +136,9 @@
  *
  * <pre>{@code
  * {
+ *   // required by MongoRx
+ *   use(new Rx());
+ *
  *   use(new MongoRx("mongodb://localhost/mydb"));
  *
  *   get("/", req -> {
@@ -135,6 +154,9 @@
  *
  * <pre>{@code
  * {
+ *   // required by MongoRx
+ *   use(new Rx());
+ *
  *   use(new MongoRx("mongodb://localhost/mydb.mycol"));
  *
  *   get("/", req -> {
@@ -151,6 +173,9 @@
  *
  * <pre>{@code
  * {
+ *   // required by MongoRx
+ *   use(new Rx());
+ *
  *   use(new MongoRx()
  *      .observableAdapter(observable -> observable.observeOn(Scheduler.io())));
  *
@@ -175,6 +200,9 @@
  * <p>
  * <pre>{@code
  * {
+ *   // required by MongoRx
+ *   use(new Rx());
+ *
  *   use(new MongoRx("db1"));
  *
  *   use(new MongoRx("db2"));
@@ -207,6 +235,9 @@
  *
  * <pre>{@code
  * {
+ *   // required by MongoRx
+ *   use(new Rx());
+ *
  *   use(new MongoRx().observableAdapter(o -> o.observeOn(Schedulers.io())));
  * }
  * }</pre>
@@ -389,7 +420,6 @@ public void configure(final Env env, final Config conf, final Binder binder) {
 
     /** mapper */
     env.routes()
-        .map(Rx.rx())
         .map(mapper());
 
     log.info("Started {}", cstr);

jooby-mongodb-rx/src/test/java/org/jooby/mongodb/MongodbRxTest.java

@@ -100,15 +100,8 @@ public class MongodbRxTest {
         .andReturn(unit.get(MongoClient.class));
   };
 
-  @SuppressWarnings({"rawtypes", "unchecked" })
   private Block env = unit -> {
-    Route.Mapper rx = unit.mock(Route.Mapper.class);
-
-    unit.mockStatic(Rx.class);
-    expect(Rx.rx()).andReturn(rx);
-
     Routes routes = unit.mock(Routes.class);
-    expect(routes.map(rx)).andReturn(routes);
     expect(routes.map(unit.capture(Route.Mapper.class))).andReturn(routes);
 
     Env env = unit.get(Env.class);

jooby-rxjava-jdbc/src/main/java/org/jooby/rx/RxJdbc.java

@@ -21,16 +21,13 @@
 import javax.inject.Provider;
 import javax.sql.DataSource;
 
-import org.jooby.Deferred;
 import org.jooby.Env;
 import org.jooby.jdbc.Jdbc;
 
 import com.github.davidmoten.rx.jdbc.Database;
 import com.google.inject.Binder;
 import com.typesafe.config.Config;
 
-import rx.Observable;
-
 /**
  * <h1>rxjdbc</h1>
  * <p>
@@ -39,8 +36,8 @@
  * </p>
  *
  * <p>
- * This module depends on {@link Jdbc} module, make sure you read the doc of the {@link Jdbc}
- * module.
+ * This module depends on {@link Jdbc} and {@link Rx} modules, make sure you read the doc of the {@link Jdbc}
+ * and {@link Rx} modules before using {@link RxJdbc}.
  * </p>
  *
  * <h2>exports</h2>
@@ -49,6 +46,11 @@
  * <li>A Hikari {@link DataSource} object</li>
  * </ul>
  *
+ * <h2>depends on</h2>
+ * <ul>
+ * <li>{@link Rx rx module}</li>
+ * </ul>
+ *
  * <h2>usage</h2>
  *
  * <pre>{@code
@@ -57,22 +59,20 @@
  * import org.jooby.rx.Rx;
  *
  * {
+ *   // required by RxJdbc
+ *   use(new Rx());
+ *
  *   use(new RxJdbc());
  *
  *   get("/reactive", req ->
  *     req.require(Database.class)
  *       .select("select name from something where id = :id")
  *       .parameter("id", 1)
  *       .getAs(String.class)
- *   ).map(Rx.rx());
+ *   );
  * }
  * }</pre>
  *
- * <p>
- * The {@link Rx#rx()} mapper converts {@link Observable rx observables} to {@link Deferred}
- * instances. More at {@link Rx}.
- * </p>
- *
  * <h2>multiple db connections</h2>
  *
  * <pre>{@code
@@ -81,6 +81,9 @@
  * import org.jooby.rx.Rx;
  *
  * {
+ *   // required by RxJdbc
+ *   use(new Rx());
+ *
  *   use(new RxJdbc("db.main"));
  *   use(new RxJdbc("db.audit"));
  *