From e3fa72d3073eed8fdad0f68180996110416c7c20 Mon Sep 17 00:00:00 2001
From: unknown <joshua@interoctiv.io>
Date: Mon, 6 Aug 2018 19:25:49 -0500
Subject: [PATCH] Added import markdown from URL funtionality

---
 pom.xml                                       |  2 +-
 .../confluence/markdown/MarkdownMacro.java    | 25 ++++++++++++++++---
 src/main/resources/atlassian-plugin.xml       |  1 +
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 39dc27b..b5bd07f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,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.0</amps.version>
         <plugin.testrunner.version>1.1</plugin.testrunner.version>
         <atlassian.spring.scanner.version>2.1.7</atlassian.spring.scanner.version>
     </properties>
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 e7077bd..1e8f8f8 100644
--- a/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
+++ b/src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
@@ -40,6 +40,8 @@ import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.options.MutableDataSet;
 
+import java.net.*;
+import java.io.*;
 
 //@Scanned
 public class MarkdownMacro extends BaseMacro implements Macro
@@ -105,9 +107,26 @@ public class MarkdownMacro extends BaseMacro implements Macro
 
         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 toParse = bodyContent;
+		if (parameters.get("URL") != null) {
+			try {
+				String urlParam = parameters.get("URL");
+				URL importFrom = new URL(urlParam);
+				BufferedReader in = new BufferedReader(
+					new InputStreamReader(importFrom.openStream())
+				);
+				String inputLine;
+				toParse = "";
+				while ((inputLine = in.readLine()) != null) {
+					toParse = toParse + "\n" + inputLine;
+				}
+				in.close();
+			}
+			catch (IOException e) {}
+ 		}
+        Node document = parser.parse(toParse);
+        String html = renderer.render(document) + highlightjs;
         return html;
 
     }
diff --git a/src/main/resources/atlassian-plugin.xml b/src/main/resources/atlassian-plugin.xml
index 587e4da..82a6259 100644
--- a/src/main/resources/atlassian-plugin.xml
+++ b/src/main/resources/atlassian-plugin.xml
@@ -15,6 +15,7 @@
                  documentation-url="https://spec.commonmark.org/0.28/">
         <category name="formatting"/>
         <parameters>
+			<parameter name="URL" type="string" />
         </parameters>
     </xhtml-macro>
     <macro name="markdown"