forked from apache/zeppelin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ZEPPELIN-5527] Remove the dependency of
markdown from `zeppelin-ju…
…pyter` ### What is this PR for? Simplifying dependences. ### What type of PR is it? [Improvement] ### Todos * [x] - Remove the dependency of `markdown` and implement a markdown parser directly ### What is the Jira issue? * Jira https://issues.apache.org/jira/browse/ZEPPELIN-5527 ### How should this be tested? Import Jupyter notebook ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Jongyoul Lee <[email protected]> Closes apache#4228 from jongyoul/ZEPPELIN-5527 and squashes the following commits: acf087e [Jongyoul Lee] Fix tests fae3fc1 [Jongyoul Lee] Remove a redundant newline 790f0cc [Jongyoul Lee] [ZEPPELIN-5527] Remove the dependency of `markdown` from `zeppelin-jupyter`
- Loading branch information
Showing
11 changed files
with
106 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
zeppelin-jupyter/src/main/java/org/apache/zeppelin/jupyter/parser/MarkdownParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.zeppelin.jupyter.parser; | ||
|
|
||
| import com.vladsch.flexmark.ext.autolink.AutolinkExtension; | ||
| import com.vladsch.flexmark.ext.emoji.EmojiExtension; | ||
| import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension; | ||
| import com.vladsch.flexmark.ext.tables.TablesExtension; | ||
| import com.vladsch.flexmark.ext.typographic.TypographicExtension; | ||
| import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension; | ||
| import com.vladsch.flexmark.html.HtmlRenderer; | ||
| import com.vladsch.flexmark.parser.Parser; | ||
| import com.vladsch.flexmark.util.ast.Node; | ||
| import com.vladsch.flexmark.util.data.MutableDataSet; | ||
| import java.util.Arrays; | ||
|
|
||
| import static com.vladsch.flexmark.ext.emoji.EmojiImageType.UNICODE_ONLY; | ||
|
|
||
| public class MarkdownParser { | ||
| private final Parser parser; | ||
| private final HtmlRenderer renderer; | ||
|
|
||
| public MarkdownParser() { | ||
| MutableDataSet options = new MutableDataSet(); | ||
| options.set(Parser.EXTENSIONS, Arrays.asList(StrikethroughExtension.create(), | ||
| TablesExtension.create(), | ||
| AutolinkExtension.create(), | ||
| WikiLinkExtension.create(), | ||
| TypographicExtension.create(), | ||
| EmojiExtension.create())); | ||
| options.set(HtmlRenderer.SOFT_BREAK, "<br />\n"); | ||
| options.set(EmojiExtension.USE_IMAGE_TYPE, UNICODE_ONLY); | ||
| parser = Parser.builder(options).build(); | ||
| renderer = HtmlRenderer.builder(options).build(); | ||
| } | ||
|
|
||
| public String render(String markdownText) { | ||
| Node document = parser.parse(markdownText); | ||
| String html = renderer.render(document); | ||
| return wrapWithMarkdownClassDiv(html); | ||
| } | ||
|
|
||
| public static String wrapWithMarkdownClassDiv(String html) { | ||
| return "<div class=\"markdown-body\">\n" + html + "</div>"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters