diff --git a/pom.xml b/pom.xml index b5bd07f..61a5b82 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,8 @@ ${confluence.version} ${confluence.data.version} + true + false diff --git a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java index 1e8f8f8..e748399 100644 --- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java +++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java @@ -105,14 +105,13 @@ public class MarkdownMacro extends BaseMacro implements Macro " });\n" + ""; - Parser parser = Parser.builder(options).build(); - HtmlRenderer renderer = HtmlRenderer.builder(options).build(); - - String toParse = bodyContent; - if (parameters.get("URL") != null) { + if (bodyContent != null) { + Parser parser = Parser.builder(options).build(); + HtmlRenderer renderer = HtmlRenderer.builder(options).build(); + + String toParse = ""; try { - String urlParam = parameters.get("URL"); - URL importFrom = new URL(urlParam); + URL importFrom = new URL(bodyContent); BufferedReader in = new BufferedReader( new InputStreamReader(importFrom.openStream()) ); @@ -124,10 +123,13 @@ public class MarkdownMacro extends BaseMacro implements Macro in.close(); } catch (IOException e) {} - } - Node document = parser.parse(toParse); - String html = renderer.render(document) + highlightjs; - return html; + + Node document = parser.parse(toParse); + String html = renderer.render(document) + highlightjs; + return html; + }else { + return ""; + } } diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml index 82a6259..e64267c 100644 --- a/src/main/resources/atlassian-plugin.xml +++ b/src/main/resources/atlassian-plugin.xml @@ -14,10 +14,7 @@ icon="/download/resources/com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/images/pluginIcon.png" documentation-url="https://spec.commonmark.org/0.28/"> - - - - +