global route mapper fix #367

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue367.java

@@ -0,0 +1,40 @@
+package org.jooby.issues;
+
+import org.jooby.reactor.Reactor;
+import org.jooby.rx.Rx;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+import reactor.core.publisher.Flux;
+import rx.Observable;
+
+public class Issue367 extends ServerFeature {
+
+  {
+    mapper(Rx.rx());
+
+    mapper(Reactor.reactor());
+
+    get("/rx", () -> Observable.just("reactive"));
+
+    get("/flux", () -> Flux.just("reactive"));
+
+    get("/normal", () -> "no-reactive");
+  }
+
+  @Test
+  public void globalMapShouldWork() throws Exception {
+    request()
+        .get("/rx")
+        .expect("reactive");
+
+    request()
+        .get("/flux")
+        .expect("reactive");
+
+    request()
+        .get("/normal")
+        .expect("no-reactive");
+  }
+
+}

jooby/src/main/java/org/jooby/Jooby.java

@@ -585,6 +585,10 @@ public EnvDep(final Predicate<String> predicate, final Consumer<Config> callback
   /** stop callback . */
   private List<CheckedConsumer<Registry>> onStop = new ArrayList<>();
 
+  /** Mappers .*/
+  @SuppressWarnings("rawtypes")
+  private Mapper mapper;
+
   public Jooby() {
     this(null);
   }
@@ -3401,23 +3405,31 @@ public void start(final String[] args) throws Throwable {
   public void start(final String[] args, final Consumer<List<Route.Definition>> routes)
       throws Throwable {
     long start = System.currentTimeMillis();
+
     // shutdown hook
     Runtime.getRuntime().addShutdownHook(new Thread(() -> stop()));
 
     this.injector = bootstrap(args(args), routes);
 
     started.set(true);
 
-    Config config = injector.getInstance(Config.class);
+    Config conf = injector.getInstance(Config.class);
 
     Logger log = LoggerFactory.getLogger(getClass());
-    log.debug("config tree:\n{}", configTree(config.origin().description()));
+    log.debug("config tree:\n{}", configTree(conf.origin().description()));
 
     // start services
     for (CheckedConsumer<Registry> onStart : this.onStart) {
       onStart.accept(this);
     }
 
+    // route mapper
+    Set<Route.Definition> routeDefs = injector.getInstance(Route.KEY);
+    Set<WebSocket.Definition> sockets = injector.getInstance(WebSocket.KEY);
+    if (mapper != null) {
+      routeDefs.forEach(it -> it.map(mapper));
+    }
+
     // Start server
     Server server = injector.getInstance(Server.class);
     String serverName = server.getClass().getSimpleName().replace("Server", "").toLowerCase();
@@ -3426,17 +3438,26 @@ public void start(final String[] args, final Consumer<List<Route.Definition>> ro
     long end = System.currentTimeMillis();
 
     log.info("[{}@{}]: Server started in {}ms\n\n{}\n",
-        config.getString("application.env"),
+        conf.getString("application.env"),
         serverName,
         end - start,
-        injector.getInstance(AppPrinter.class));
+        new AppPrinter(routeDefs, sockets, conf));
 
-    boolean join = config.hasPath("server.join") ? config.getBoolean("server.join") : true;
+    boolean join = conf.hasPath("server.join") ? conf.getBoolean("server.join") : true;
     if (join) {
       server.join();
     }
   }
 
+  @Override
+  @SuppressWarnings({"rawtypes", "unchecked" })
+  public Jooby mapper(final Mapper mapper) {
+    this.mapper = Optional.ofNullable(this.mapper)
+        .map(it -> Route.Mapper.compose(it, mapper))
+        .orElse(mapper);
+    return this;
+  }
+
   /**
    * Run app in javascript.
    *

jooby/src/main/java/org/jooby/Route.java

@@ -273,6 +273,14 @@ public interface Route {
    */
   interface Mapper<T> {
 
+     @SuppressWarnings({"rawtypes", "unchecked" })
+    static Mapper<Object> compose(final Mapper it, final Mapper next) {
+      return v -> {
+        Object m = it.map(v);
+        return m == v ? next.map(v) : m;
+      };
+    }
+
     /**
      * Map the type to something else.
      *
@@ -1944,7 +1952,7 @@ default void next(final Request req, final Response rsp) throws Throwable {
     }
   }
 
-  /** Renderer key. */
+  /** Route key. */
   Key<Set<Route.Definition>> KEY = Key.get(new TypeLiteral<Set<Route.Definition>>() {
   });
 

jooby/src/main/java/org/jooby/Routes.java

@@ -20,6 +20,7 @@
 
 import java.util.Optional;
 
+import org.jooby.Route.Mapper;
 import org.jooby.handlers.AssetHandler;
 
 /**
@@ -2449,4 +2450,24 @@ default Route.Definition complete(final String pattern, final Route.Complete han
    */
   Route.Collection with(Runnable callback);
 
+  /**
+   * Apply the mapper to all the functional routes.
+   *
+   * <pre>{@code
+   * {
+   *   mapper(Rx.rx());
+   *
+   *   mapper(Reactor.reactor());
+   *
+   *   get("/rx", () -> Observable.just("reactive"));
+   *
+   *   get("/flux", () -> Flux.just("reactive"));
+   *
+   * }
+   * }</pre>
+   *
+   * @param mapper
+   * @return This instance.
+   */
+  Routes mapper(final Mapper<?> mapper);
 }

jooby/src/main/java/org/jooby/WebSocket.java

@@ -23,6 +23,7 @@
 import java.io.Closeable;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 import org.jooby.internal.RouteMatcher;
 import org.jooby.internal.RoutePattern;
@@ -83,6 +84,10 @@
  */
 public interface WebSocket extends Closeable {
 
+  /** Websocket key. */
+  Key<Set<WebSocket.Definition>> KEY = Key.get(new TypeLiteral<Set<WebSocket.Definition>>() {
+  });
+
   /**
    * A web socket connect handler. Executed every time a new client connect to the socket.
    *

jooby/src/main/java/org/jooby/internal/AppPrinter.java

@@ -26,8 +26,6 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import javax.inject.Inject;
-
 import org.jooby.Route;
 import org.jooby.WebSocket;
 
@@ -41,7 +39,6 @@ public class AppPrinter {
 
   private String[] urls;
 
-  @Inject
   public AppPrinter(final Set<Route.Definition> routes,
       final Set<WebSocket.Definition> sockets,
       final Config conf) {