Merge table columns if two pipes with with no space are next to each other.

Optimise imports, reformat and remove dead code

Approved-by: Joshua Carpenter <joshua@interoctiv.io>

README.md

@@ -7,7 +7,7 @@ It can be accessed via:
 
 *   Macro Browser
 *   {markdown} tags
-*   SOAP API using <ac:macro ac:name="markdown">/ac:macro>
+*   SOAP API using <ac:macro ac:name="markdown"></ac:macro>
 
 This macro supports the following languages:
 

pom.xml

@@ -9,13 +9,13 @@
     </parent>
     <groupId>com.atlassian.plugins.confluence.markdown</groupId>
     <artifactId>confluence-markdown-macro</artifactId>
-    <version>1.3.2</version>
+    <version>1.4.2</version>
     <organization>
         <name>Atlassian</name>
         <url>http://www.atlassian.com/</url>
     </organization>
     <name>confluence-markdown-macro</name>
-    <description>This plugin provides a Markdown render macro for Confluence.</description>
+    <description>This plugin provides macros to render markdown for Confluence.</description>
     <packaging>atlassian-plugin</packaging>
     <dependencies>
         <dependency>
@@ -51,27 +51,27 @@
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-all</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-anchorlink</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-autolink</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-superscript</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
         </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-ext-youtube-embedded</artifactId>
-            <version>0.32.24</version>
+            <version>0.34.53</version>
         </dependency>
         <dependency>
             <groupId>com.atlassian.plugin</groupId>
@@ -90,6 +90,8 @@
                 <configuration>
                     <productVersion>${confluence.version}</productVersion>
                     <productDataVersion>${confluence.data.version}</productDataVersion>
+                    <enableQuickReload>true</enableQuickReload>
+                    <enableFastdev>false</enableFastdev>
                 </configuration>
             </plugin>
             <plugin>
@@ -104,7 +106,7 @@
     <properties>
         <confluence.version>6.9.0</confluence.version>
         <confluence.data.version>6.9.0</confluence.data.version>
-        <amps.version>6.2.11</amps.version>
+        <amps.version>6.3.21</amps.version>
         <plugin.testrunner.version>1.1</plugin.testrunner.version>
         <atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version>
     </properties>

src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java

@@ -0,0 +1,191 @@
+package com.atlassian.plugins.confluence.markdown;
+
+import com.atlassian.confluence.content.render.xhtml.ConversionContext;
+import com.atlassian.confluence.content.render.xhtml.DefaultConversionContext;
+import com.atlassian.confluence.macro.Macro;
+import com.atlassian.confluence.macro.MacroExecutionException;
+import com.atlassian.confluence.xhtml.api.XhtmlContent;
+import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
+import com.atlassian.renderer.RenderContext;
+import com.atlassian.renderer.v2.RenderMode;
+import com.atlassian.renderer.v2.macro.BaseMacro;
+import com.atlassian.renderer.v2.macro.MacroException;
+import com.atlassian.webresource.api.assembler.PageBuilderService;
+import com.vladsch.flexmark.ast.Node;
+import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension;
+import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
+import com.vladsch.flexmark.ext.definition.DefinitionExtension;
+import com.vladsch.flexmark.ext.footnotes.FootnoteExtension;
+import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
+import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
+import com.vladsch.flexmark.ext.ins.InsExtension;
+import com.vladsch.flexmark.ext.tables.TablesExtension;
+import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
+import com.vladsch.flexmark.ext.youtube.embedded.YouTubeLinkExtension;
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.superscript.SuperscriptExtension;
+import com.vladsch.flexmark.util.options.MutableDataSet;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Map;
+
+
+public class MarkdownFromURLMacro extends BaseMacro implements Macro {
+
+    private final XhtmlContent xhtmlUtils;
+
+    private PageBuilderService pageBuilderService;
+
+    @Autowired
+    public MarkdownFromURLMacro(@ComponentImport PageBuilderService pageBuilderService, XhtmlContent xhtmlUtils) {
+        this.pageBuilderService = pageBuilderService;
+        this.xhtmlUtils = xhtmlUtils;
+    }
+
+
+    @Override
+    public BodyType getBodyType() {
+        return BodyType.PLAIN_TEXT;
+    }
+
+    @Override
+    public OutputType getOutputType() {
+        return OutputType.BLOCK;
+    }
+
+    @Override
+
+    public String execute(Map<String, String> parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException
+    {
+
+		if (bodyContent != null) {
+			pageBuilderService.assembler().resources().requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs");
+
+			MutableDataSet options = new MutableDataSet()
+                    .set(HtmlRenderer.GENERATE_HEADER_ID, true)
+                    .set(HtmlRenderer.INDENT_SIZE, 2)
+                    .set(HtmlRenderer.PERCENT_ENCODE_URLS, true)
+                    // for full GFM table compatibility add the following table extension options:
+
+                    .set(TablesExtension.COLUMN_SPANS, false)
+                    .set(TablesExtension.APPEND_MISSING_COLUMNS, true)
+                    .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
+                    .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
+                    .set(TablesExtension.CLASS_NAME, "confluenceTable")
+                    .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));
+
+			options.set(Parser.EXTENSIONS, Arrays.asList(
+				TablesExtension.create(), 
+				StrikethroughSubscriptExtension.create(),
+				InsExtension.create(),
+				TaskListExtension.create(),
+				FootnoteExtension.create(),
+				WikiLinkExtension.create(),
+				DefinitionExtension.create(),
+				AnchorLinkExtension.create(),
+				AutolinkExtension.create(),
+				SuperscriptExtension.create(),
+				YouTubeLinkExtension.create()
+
+			));
+
+
+			String highlightjs = "<script>\n" +
+					"AJS.$('[data-macro-name=\"markdown-from-url\"] code').each(function(i, block) {\n" +
+					"    hljs.highlightBlock(block);\n" +
+					"  });\n" +
+					"</script>";
+
+			String highlightjscss = "<style>\n"+
+					".hljs {display: inline;}\n" +
+					"pre > code {display: block !important;}\n" +
+					"</style>";
+
+			String tableFixJs = "<script>AJS.$('[data-macro-name=\"markdown-from-url\"] table thead th').each(function(i, block) {\n" +
+                    "    block.classList.add(\"confluenceTh\");\n" +
+                    "});\n" +
+                    "\n" +
+                    "AJS.$('[data-macro-name=\"markdown-from-url\"] table tbody tr td').each(function(i, block) {\n" +
+                    "    block.classList.add(\"confluenceTd\");\n" +
+                    "});</script>";
+
+			class privateRepositoryException extends Exception {
+				public privateRepositoryException(String message) {
+					super(message);
+				}
+			}
+			
+			Parser parser = Parser.builder(options).build();
+			HtmlRenderer renderer = HtmlRenderer.builder(options).build();
+			
+			String exceptionsToReturn = "";
+			String html = "";
+			String toParse = "";
+			try {
+				URL importFrom = new URL(bodyContent);
+				BufferedReader in = new BufferedReader(
+					new InputStreamReader(importFrom.openStream())
+				);
+				String inputLine;
+				while ((inputLine = in.readLine()) != null) {
+					toParse = toParse + "\n" + inputLine;
+				}
+				in.close();
+				toParse = toParse.trim();
+				if (toParse.startsWith("<html>\n<head>\n  <title>OpenID transaction in progress</title>")) {
+					throw new privateRepositoryException("Cannot import from private repository.");
+				}else {
+					Node document = parser.parse(toParse);
+					html = renderer.render(document) + highlightjs + highlightjscss + tableFixJs;
+				}
+			}
+			catch (MalformedURLException u) {
+				exceptionsToReturn = exceptionsToReturn + "<strong>Error with Markdown From URL macro: Invalid URL.</strong><br>Please enter a valid URL. If you are not trying to import markdown from a URL, use the Markdown macro instead of the Markdown from URL macro.<br>For support <a href='https://community.atlassian.com/t5/tag/addon-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/tg-p'>visit our Q&A in the Atlassian Community</a>. You can ask a new question by clicking the \"Create\" button on the top right of the Q&A.<br>";
+			}
+			catch (privateRepositoryException p) {
+				exceptionsToReturn = exceptionsToReturn + "<strong>Error with Markdown From URL macro: Importing from private Bitbucket repositories is not supported.</strong><br>Please make your repository public before importing. Alternatively, you can copy and paste your markdown into the Markdown macro.<br>If you are allowed access, you can find the markdown file <a href='" + bodyContent + "'>here</a>.<br>For support <a href='https://community.atlassian.com/t5/tag/addon-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/tg-p'>visit our Q&A in the Atlassian Community</a>. You can ask a new question by clicking the \"Create\" button on the top right of the Q&A.<br>";
+			}
+			catch (FileNotFoundException f) {
+				exceptionsToReturn = exceptionsToReturn + "<strong>Error with Markdown From URL macro: URL does not exist.</strong><br>" + bodyContent + "<br>Please double check your URL. Perhaps you made a typo or perhaps the page has been moved.<br>This can also be caused by changing the Github repository containing the file from public to private. If this is the case go back to the raw file and re-copy the link.<br>For support <a href='https://community.atlassian.com/t5/tag/addon-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/tg-p'>visit our Q&A in the Atlassian Community</a>. You can ask a new question by clicking the \"Create\" button on the top right of the Q&A.<br>";
+			}
+			catch (IOException e) {
+				exceptionsToReturn = exceptionsToReturn + "<strong>Error with Markdown From URL macro: Unexpected error.</strong><br>" + e.toString() + "<br>For support <a href='https://community.atlassian.com/t5/tag/addon-com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/tg-p'>visit our Q&A in the Atlassian Community</a>. You can ask a new question by clicking the \"Create\" button on the top right of the Q&A.<br>"; 
+			}
+			finally {
+				if (exceptionsToReturn != "") {
+					html = "<p style='background: #ffe0e0; border-radius: 5px; padding: 10px;'>" + exceptionsToReturn + "</p>";
+				}
+				return html;
+			}
+ 		}else {
+			return "";
+		}
+    }
+
+    @Override
+    public boolean hasBody() {
+        return true;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public RenderMode getBodyRenderMode() {
+        return RenderMode.NO_RENDER;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public String execute(Map map, String s, RenderContext renderContext) throws MacroException {
+        try {
+            return execute(map, s, new DefaultConversionContext(renderContext));
+        } catch (MacroExecutionException e) {
+            throw new MacroException(e.getMessage(), e);
+        }
+    }
+}

src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java

@@ -2,48 +2,36 @@ package com.atlassian.plugins.confluence.markdown;
 
 import com.atlassian.confluence.content.render.xhtml.ConversionContext;
 import com.atlassian.confluence.content.render.xhtml.DefaultConversionContext;
-import com.atlassian.confluence.content.render.xhtml.XhtmlException;
 import com.atlassian.confluence.macro.Macro;
 import com.atlassian.confluence.macro.MacroExecutionException;
-import com.atlassian.confluence.xhtml.api.MacroDefinition;
-import com.atlassian.confluence.xhtml.api.MacroDefinitionHandler;
 import com.atlassian.confluence.xhtml.api.XhtmlContent;
-
+import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 import com.atlassian.renderer.RenderContext;
 import com.atlassian.renderer.v2.RenderMode;
 import com.atlassian.renderer.v2.macro.BaseMacro;
 import com.atlassian.renderer.v2.macro.MacroException;
-
-//import com.atlassian.plugin.spring.scanner.annotation.component.Scanned;
-import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 import com.atlassian.webresource.api.assembler.PageBuilderService;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.vladsch.flexmark.ast.Node;
-import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
-import com.vladsch.flexmark.ext.tables.TablesExtension;
-import com.vladsch.flexmark.ext.ins.InsExtension;
-import com.vladsch.flexmark.ext.definition.DefinitionExtension;
-import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
-import com.vladsch.flexmark.ext.footnotes.FootnoteExtension;
-import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
-import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension;
-import com.vladsch.flexmark.superscript.SuperscriptExtension;
+import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
+import com.vladsch.flexmark.ext.definition.DefinitionExtension;
+import com.vladsch.flexmark.ext.footnotes.FootnoteExtension;
+import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
+import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension;
+import com.vladsch.flexmark.ext.ins.InsExtension;
+import com.vladsch.flexmark.ext.tables.TablesExtension;
+import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension;
 import com.vladsch.flexmark.ext.youtube.embedded.YouTubeLinkExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.superscript.SuperscriptExtension;
 import com.vladsch.flexmark.util.options.MutableDataSet;
+import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Arrays;
+import java.util.Map;
 
-//@Scanned
+public class MarkdownMacro extends BaseMacro implements Macro {
-public class MarkdownMacro extends BaseMacro implements Macro
-{
 
     private final XhtmlContent xhtmlUtils;
 
@@ -55,31 +43,34 @@ public class MarkdownMacro extends BaseMacro implements Macro
         this.xhtmlUtils = xhtmlUtils;
     }
 
-//    public MarkdownMacro(XhtmlContent xhtmlUtils)
-//    {
-//        this.xhtmlUtils = xhtmlUtils;
-//    }
-
     @Override
-    public BodyType getBodyType()
+    public BodyType getBodyType() {
-    {
         return BodyType.PLAIN_TEXT;
     }
 
     @Override
-    public OutputType getOutputType()
+    public OutputType getOutputType() {
-    {
         return OutputType.BLOCK;
     }
 
     @Override
-    public String execute(Map<String, String> parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException
+    public String execute(Map<String, String> parameters, String bodyContent, ConversionContext conversionContext) throws MacroExecutionException {
-    {
 
 
         pageBuilderService.assembler().resources().requireWebResource("com.atlassian.plugins.confluence.markdown.confluence-markdown-macro:highlightjs");
 
-        MutableDataSet options = new MutableDataSet();
+        MutableDataSet options = new MutableDataSet()
+                .set(HtmlRenderer.GENERATE_HEADER_ID, true)
+                .set(HtmlRenderer.INDENT_SIZE, 2)
+                .set(HtmlRenderer.PERCENT_ENCODE_URLS, true)
+                // for full GFM table compatibility add the following table extension options:
+
+                .set(TablesExtension.COLUMN_SPANS, true)
+                .set(TablesExtension.APPEND_MISSING_COLUMNS, true)
+                .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
+                .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
+                .set(TablesExtension.CLASS_NAME, "confluenceTable")
+                .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));
 
         options.set(Parser.EXTENSIONS, Arrays.asList(
                 TablesExtension.create(),
@@ -103,11 +94,27 @@ public class MarkdownMacro extends BaseMacro implements Macro
                 "  });\n" +
                 "</script>";
 
+        String highlightjscss = "<style>\n"+
+                ".hljs {display: inline;}\n" +
+                "pre > code {display: block !important;}\n" +
+                "</style>";
+
+        String tableFixJs = "<script> AJS.$('[data-macro-name=\"markdown\"] table thead th').each(function(i, block) {\n" +
+                "    block.classList.add(\"confluenceTh\");\n" +
+                "});\n" +
+                "\n" +
+                "AJS.$('[data-macro-name=\"markdown\"] table tbody tr td').each(function(i, block) {\n" +
+                "    block.classList.add(\"confluenceTd\");\n" +
+                "});</script>";
+
+
         Parser parser = Parser.builder(options).build();
         HtmlRenderer renderer = HtmlRenderer.builder(options).build();
 
         Node document = parser.parse(bodyContent);
-        String html = renderer.render(document ) + highlightjs;  // "<p>This is <em>Sparta</em></p>\n"
+
+        String html = renderer.render(document ) + highlightjs + highlightjscss + tableFixJs;  // "<p>This is <em>Sparta</em></p>\n"
+
         return html;
 
     }
@@ -127,7 +134,7 @@ public class MarkdownMacro extends BaseMacro implements Macro
         try {
             return execute(map, s, new DefaultConversionContext(renderContext));
         } catch (MacroExecutionException e) {
-            throw new MacroException(e.getMessage(),e);
+            throw new MacroException(e.getMessage(), e);
         }
     }
 }

src/main/resources/atlassian-plugin.xml

@@ -6,6 +6,7 @@
         <param name="plugin-icon">images/pluginIcon.png</param>
         <param name="plugin-logo">images/pluginLogo.png</param>
 	<param name="atlassian-data-center-compatible">true</param>
+    <param name="atlassian-data-center-status">compatible</param>
     </plugin-info>
 	
 	<xhtml-macro name="markdown"
@@ -14,8 +15,7 @@
                  icon="/download/resources/com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/images/pluginIcon.png"
                  documentation-url="https://spec.commonmark.org/0.28/">
         <category name="formatting"/>
-        <parameters>
+        <parameters />
-        </parameters>
     </xhtml-macro>
     <macro name="markdown"
            class="com.atlassian.plugins.confluence.markdown.MarkdownMacro"
@@ -23,10 +23,26 @@
            icon="/download/resources/com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/images/pluginIcon.png"
            documentation-url="https://spec.commonmark.org/0.28/">
         <category name="formatting"/>
-        <parameters>
+        <parameters />
-        </parameters>
+    </macro>
+    <xhtml-macro name="markdown-from-url"
+                 class="com.atlassian.plugins.confluence.markdown.MarkdownFromURLMacro"
+                 key="markdown-from-url"
+                 icon="/download/resources/com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/images/pluginIcon.png"
+                 documentation-url="https://spec.commonmark.org/0.28/">
+        <category name="formatting"/>
+        <parameters />
+	</xhtml-macro>
+    <macro name="markdown-from-url"
+           class="com.atlassian.plugins.confluence.markdown.MarkdownFromURLMacro"
+           key="markdown-from-url.wiki"
+           icon="/download/resources/com.atlassian.plugins.confluence.markdown.confluence-markdown-macro/images/pluginIcon.png"
+           documentation-url="https://spec.commonmark.org/0.28/">
+        <category name="formatting"/>
+        <parameters />
     </macro>
     <resource type="i18n" name="markdown" location="markdownproperties/markdown"/>
+	<resource type="i18n" name="markdown-from-url" location="markdown-from-url-properties/markdown-from-url"/>
     <resource type="download" name="images/" key="images" location="images/"/>
 
     <web-resource key="highlightjs" name="Highlight.js" >

src/main/resources/markdown-from-url-properties/markdown-from-url.properties

@@ -0,0 +1,2 @@
+com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown-from-url.label=Markdown From URL
+com.atlassian.plugins.confluence.markdown.confluence-markdown-macro.markdown-from-url.desc=This macro dynamically imports Markdown from a URL and renders it into HTML.