Minor cleanup of some dead lines

jknack · jknack · commit cf9b11eac571 · 2014-10-15T14:53:29.000-03:00
diff --git a/jooby-core/src/main/java/jooby/internal/RouteHandler.java b/jooby-core/src/main/java/jooby/internal/RouteHandler.java
@@ -30,8 +30,6 @@
 import jooby.Response;
 import jooby.Route;
 import jooby.Route.Err;
-import jooby.WebSocket;
-import jooby.WebSocket.Definition;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -65,22 +63,18 @@ public class RouteHandler {
 
   private Err.Handler err;
 
-  private Set<Definition> sockets;
-
   @Inject
   public RouteHandler(final Injector injector,
       final BodyConverterSelector selector,
       final Set<Request.Module> modules,
       final Set<Route.Definition> routes,
-      final Set<WebSocket.Definition> sockets,
       final Charset defaultCharset,
       final Locale defaultLocale,
       final Route.Err.Handler err) {
     this.rootInjector = requireNonNull(injector, "An injector is required.");
     this.selector = requireNonNull(selector, "A message converter selector is required.");
     this.modules = requireNonNull(modules, "Request modules are required.");
     this.routeDefs = requireNonNull(routes, "The routes are required.");
-    this.sockets = requireNonNull(sockets, "The sockets are required.");
     this.charset = requireNonNull(defaultCharset, "A defaultCharset is required.");
     this.locale = requireNonNull(defaultLocale, "A defaultLocale is required.");
     this.err = requireNonNull(err, "An err handler is required.");
@@ -112,7 +106,7 @@ public void handle(final HttpServletRequest request, final HttpServletResponse r
 
     final String path = verb + requestURI;
 
-    log.info("handling: {}", path);
+    log.debug("handling: {}", path);
 
     log.debug("  content-type: {}", type);
 
@@ -170,14 +164,10 @@ public void handle(final HttpServletRequest request, final HttpServletResponse r
       }
     } finally {
       long end = System.currentTimeMillis();
-      log.info("  status -> {} in {}ms", response.getStatus(), end - start);
+      log.debug("  status -> {} in {}ms", response.getStatus(), end - start);
     }
   }
 
-  public boolean hasWebSockets() {
-    return sockets.size() > 0;
-  }
-
   public Injector injector() {
     return rootInjector;
   }
@@ -431,29 +421,6 @@ public String toString() {
           routeDef.consumes(), routeDef.produces(), routeDef.name()));
     }
 
-    if (sockets.size() > 0) {
-      buffer.append("\nWeb Sockets:\n");
-
-      verbMax = "WS".length();
-      routeMax = 0;
-      consumesMax = 0;
-      producesMax = 0;
-      for (WebSocket.Definition socketDef : sockets) {
-        routeMax = Math.max(routeMax, socketDef.pattern().length());
-
-        consumesMax = Math.max(consumesMax, socketDef.consumes().toString().length());
-
-        producesMax = Math.max(producesMax, socketDef.produces().toString().length());
-      }
-
-      format = "  %-" + verbMax + "s %-" + routeMax + "s    %" + consumesMax + "s     %"
-          + producesMax + "s    (%s)\n";
-
-      for (WebSocket.Definition socketDef : sockets) {
-        buffer.append(String.format(format, "WS", socketDef.pattern(),
-            socketDef.consumes(), socketDef.produces(), socketDef.name()));
-      }
-    }
     return buffer.toString();
   }
 }
diff --git a/jooby-core/src/main/java/jooby/internal/jetty/JettyServerBuilder.java b/jooby-core/src/main/java/jooby/internal/jetty/JettyServerBuilder.java
@@ -138,7 +138,28 @@ public Object createWebSocket(final ServletUpgradeRequest req,
     server.addLifeCycleListener(new AbstractLifeCycleListener() {
       @Override
       public void lifeCycleStarted(final LifeCycle event) {
-        log.info("\nRoutes:\n{}", routeHandler);
+        StringBuilder buffer = new StringBuilder(routeHandler.toString());
+        if (sockets.size() > 0) {
+          buffer.append("\nWeb Sockets:\n");
+
+          int verbMax = "WS".length(), routeMax = 0, consumesMax = 0, producesMax = 0;
+          for (WebSocket.Definition socketDef : sockets) {
+            routeMax = Math.max(routeMax, socketDef.pattern().length());
+
+            consumesMax = Math.max(consumesMax, socketDef.consumes().toString().length());
+
+            producesMax = Math.max(producesMax, socketDef.produces().toString().length());
+          }
+
+          String format = "  %-" + verbMax + "s %-" + routeMax + "s    %" + consumesMax + "s     %"
+              + producesMax + "s    (%s)\n";
+
+          for (WebSocket.Definition socketDef : sockets) {
+            buffer.append(String.format(format, "WS", socketDef.pattern(),
+                socketDef.consumes(), socketDef.produces(), socketDef.name()));
+          }
+        }
+        log.info("\nRoutes:\n{}", buffer);
       }
     });
 
