whoops fail with a classnotfound error fix #402

Author: jknack

jooby-whoops/pom.xml

@@ -30,17 +30,28 @@
         <configuration>
           <overwrite>true</overwrite>
           <includes>
-            <include>org.ow2.asm:asm</include>
+            <include>com.mitchellbosecke:pebble</include>
+            <include>com.coverity.security:coverity-escapers</include>
           </includes>
           <rules>
+            <!-- pebble -->
             <rule>
-              <pattern>com.mitchellbosecke.pebble.*</pattern>
+              <pattern>com.mitchellbosecke.*</pattern>
               <result>org.jooby.internal.pebble.$@1</result>
             </rule>
             <rule>
-              <pattern>com.mitchellbosecke.pebble.**.*</pattern>
+              <pattern>com.mitchellbosecke.**.*</pattern>
               <result>org.jooby.internal.pebble.@1.$@2</result>
             </rule>
+            <!-- coverity -->
+            <rule>
+              <pattern>com.coverity.*</pattern>
+              <result>org.jooby.internal.coverity.$@1</result>
+            </rule>
+            <rule>
+              <pattern>com.coverity.**.*</pattern>
+              <result>org.jooby.internal.coverity.@1.$@2</result>
+            </rule>
             <keep>
               <pattern>org.jooby.**</pattern>
             </keep>
@@ -74,6 +85,7 @@
     <dependency>
       <groupId>com.mitchellbosecke</groupId>
       <artifactId>pebble</artifactId>
+      <optional>true</optional>
     </dependency>
 
     <!-- Test dependencies -->

jooby-whoops/src/main/java/org/jooby/whoops/Whoops.java

@@ -128,7 +128,7 @@
  * <code>prod-like</code> environments:
  * </p>
  *
- *  <pre>{@code
+ * <pre>{@code
  * {
  *   on("dev", () -> {
  *     use(new Whoops());
@@ -155,14 +155,32 @@ public class Whoops implements Jooby.Module {
   /** The logging system. */
   private final Logger log = LoggerFactory.getLogger(getClass());
 
+  private final int maxFrameSize;
+
+  /**
+   * Creates a new {@link Whoops} module.
+   *
+   * @param maxFrameSize Max number of frame to show in the pretty error page.
+   */
+  public Whoops(final int maxFrameSize) {
+    this.maxFrameSize = maxFrameSize;
+  }
+
+  /**
+   * Creates a new {@link Whoops} module with max frame size of 8.
+   */
+  public Whoops() {
+    this(8);
+  }
+
   @Override
   public void configure(final Env env, final Config conf, final Binder binder) {
     boolean whoops = conf.hasPath("whoops.enabled")
         ? conf.getBoolean("whoops.enabled")
         : "dev".equals(env.name());
     if (whoops) {
       ClassLoader loader = env.routes().getClass().getClassLoader();
-      Handler handler = prettyPage(loader, SourceLocator.local(), log);
+      Handler handler = prettyPage(loader, SourceLocator.local(), maxFrameSize, log);
       env.routes().err(tryPage(handler, log));
     }
   }
@@ -174,7 +192,7 @@ static Handler tryPage(final Handler handler, final Logger log) {
   }
 
   private static Handler prettyPage(final ClassLoader loader, final SourceLocator locator,
-      final Logger log) {
+      final int maxStackSize, final Logger log) {
     String css = readString(loader, "css/whoops.base.css");
     String clipboard = readString(loader, "js/clipboard.min.js");
     String js = readString(loader, "js/whoops.base.js");
@@ -234,6 +252,9 @@ private static Handler prettyPage(final ClassLoader loader, final SourceLocator
 
         frames.addAll(frames(loader, locator, head));
 
+        // truncate frames
+        frames = frames.subList(0, Math.min(maxStackSize, frames.size()));
+
         Map<String, Object> context = ImmutableMap.<String, Object> builder()
             .put("stylesheet", css)
             .put("zepto", zepto)
@@ -252,7 +273,7 @@ private static Handler prettyPage(final ClassLoader loader, final SourceLocator
 
         log.error("execution of: {}{} resulted in exception\nRoute:\n{}\n\nStacktrace:",
             req.method(), req.path(), req.route().print(6), err);
-        rsp.send(writer.toString());
+        rsp.type(MediaType.html).send(writer.toString());
       }
     };
   }
@@ -334,8 +355,9 @@ static String locationOf(final Class clazz) {
           }
           String cfile = clazz.getName().replace(".", "/") + ".class";
           String relativePath = path.replace(cfile, "");
-          return new File(System.getProperty("user.dir")).toPath()
-              .relativize(Paths.get(relativePath))
+          return new File(System.getProperty("user.dir"))
+              .toPath()
+              .relativize(Paths.get(relativePath).toFile().getCanonicalFile().toPath())
               .toString();
         }).getOrElse("~unknown"))
         .orElse("~unknown");