fix: Handle more specific exception in catch block

1ambda · 1ambda · commit e08929a093f6 · 2016-09-08T00:24:49.000+09:00
diff --git a/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown4jParser.java b/markdown/src/main/java/org/apache/zeppelin/markdown/Markdown4jParser.java
@@ -25,8 +25,6 @@
 
 /** Markdown Parser using markdown4j processor . */
 public class Markdown4jParser implements MarkdownParser {
-  private final Logger logger = LoggerFactory.getLogger(Markdown4jParser.class);
-
   private Markdown4jProcessor processor;
 
   public Markdown4jParser() {
@@ -40,7 +38,8 @@ public String render(String markdownText) {
     try {
       html = processor.process(markdownText);
     } catch (IOException e) {
-      logger.error("Cannot parse markdown text to HTML using markdown4j", e);
+      // convert checked exception to non-checked exception
+      throw new RuntimeException(e);
     }
 
     return html;
diff --git a/markdown/src/main/java/org/apache/zeppelin/markdown/MarkdownInterpreter.java b/markdown/src/main/java/org/apache/zeppelin/markdown/MarkdownInterpreter.java
@@ -17,6 +17,7 @@
 
 package org.apache.zeppelin.markdown;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
 
@@ -89,7 +90,7 @@ public InterpreterResult interpret(String markdownText, InterpreterContext inter
 
     try {
       html = parser.render(markdownText);
-    } catch (Exception e) {
+    } catch (RuntimeException e) {
       LOGGER.error("Exception in MarkdownInterpreter while interpret ", e);
       return new InterpreterResult(Code.ERROR, InterpreterUtils.getMostRelevantMessage(e));
     }
diff --git a/markdown/src/main/java/org/apache/zeppelin/markdown/PegdownParser.java b/markdown/src/main/java/org/apache/zeppelin/markdown/PegdownParser.java
@@ -24,8 +24,6 @@
 
 /** Markdown Parser using pegdown processor. */
 public class PegdownParser implements MarkdownParser {
-  private final Logger logger = LoggerFactory.getLogger(PegdownParser.class);
-
   private PegDownProcessor processor;
 
   public PegdownParser() {
@@ -37,27 +35,22 @@ public PegdownParser() {
   @Override
   public String render(String markdownText) {
     String html = "";
+    String parsed = processor.markdownToHtml(markdownText);
 
-    try {
-      String parsed = processor.markdownToHtml(markdownText);
-      if (null == parsed) {
-        throw new RuntimeException("Cannot parse markdown text to HTML using pegdown");
-      }
-
-      html = wrapWithMarkdownClassDiv(parsed);
-    } catch (RuntimeException e) {
-      logger.error("Cannot parse markdown text to HTML using pegdown", e);
+    if (null == parsed) {
+      throw new RuntimeException("Cannot parse markdown text to HTML using pegdown");
     }
 
+    html = wrapWithMarkdownClassDiv(parsed);
     return html;
   }
 
   /** wrap with markdown class div to styling DOM using css. */
   public static String wrapWithMarkdownClassDiv(String html) {
     return new StringBuilder()
-        .append("<div class=\"markdown-body\">\n")
-        .append(html)
-        .append("\n</div>")
-        .toString();
+      .append("<div class=\"markdown-body\">\n")
+      .append(html)
+      .append("\n</div>")
+      .toString();
   }
 }
