Repository: zeppelin Updated Branches: refs/heads/master 54d746f2c -> c5109ba8a
[ZEPPELIN-2801] fix adding unnecessary new lines in Jupyter to Zeppelin note converter ### What is this PR for? Fixes the issue of having doubled new lines between lines when converting Jupyter notes into Zeppelin note. ### What type of PR is it? Bug Fix ### Todos * [x] - remove unnecessary `\n` line separator ### What is the Jira issue? [ZEPPELIN-2801](https://issues.apache.org/jira/browse/ZEPPELIN-2801) ### How should this be tested? 1. prepare sample jupyter note 2. run `java -cp zeppelin-jupyter/target/zeppelin-jupyter-0.8.0-SNAPSHOT.jar org.apache.zeppelin.jupyter.JupyterUtil -i path/To/*.ipynb`, should produce `note.json` 3. import `note.json` into Zeppelin, shouldn't have doubled spaces ### 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: Khalid Huseynov <khalid...@gmail.com> Closes #2499 from khalidhuseynov/fix/ZEPPELIN-2801 and squashes the following commits: 039a51db3 [Khalid Huseynov] add verification for end of line 9af495930 [Khalid Huseynov] change lineseparator to empty string Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c5109ba8 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c5109ba8 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c5109ba8 Branch: refs/heads/master Commit: c5109ba8a0f8d131e40f278aae30b1d16a559ec1 Parents: 54d746f Author: Khalid Huseynov <khalid...@gmail.com> Authored: Sun Jul 23 17:21:31 2017 +0900 Committer: Khalid Huseynov <khalid...@gmail.com> Committed: Mon Jul 24 16:33:44 2017 +0900 ---------------------------------------------------------------------- .../apache/zeppelin/jupyter/JupyterUtil.java | 34 ++++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c5109ba8/zeppelin-jupyter/src/main/java/org/apache/zeppelin/jupyter/JupyterUtil.java ---------------------------------------------------------------------- diff --git a/zeppelin-jupyter/src/main/java/org/apache/zeppelin/jupyter/JupyterUtil.java b/zeppelin-jupyter/src/main/java/org/apache/zeppelin/jupyter/JupyterUtil.java index eb7db20..3879efb 100644 --- a/zeppelin-jupyter/src/main/java/org/apache/zeppelin/jupyter/JupyterUtil.java +++ b/zeppelin-jupyter/src/main/java/org/apache/zeppelin/jupyter/JupyterUtil.java @@ -24,6 +24,7 @@ import java.io.Reader; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -100,8 +101,9 @@ public class JupyterUtil { name = "Note converted from Jupyter"; } note.setName(name); - + String lineSeparator = System.lineSeparator(); + String emptyString = ""; Paragraph paragraph; List<Paragraph> paragraphs = new ArrayList<>(); String interpreterName; @@ -119,7 +121,8 @@ public class JupyterUtil { TypeData typeData; if (output instanceof Stream) { type = TypeData.TEXT; - result = Joiner.on(lineSeparator).join(((Stream) output).getText()); + List<String> text = verifyEndOfLine(((Stream) output).getText(), lineSeparator); + result = Joiner.on(emptyString).join(text); typeData = new TypeData(type, result); typeDataList.add(typeData); } else if (output instanceof ExecuteResult || output instanceof DisplayData) { @@ -129,7 +132,8 @@ public class JupyterUtil { for (Map.Entry<String, Object> datum : data.entrySet()) { if (TEXT_PLAIN.equals(datum.getKey())) { type = TypeData.TEXT; - result = Joiner.on(lineSeparator).join((List<String>) datum.getValue()); + List<String> text = verifyEndOfLine((List<String>) datum.getValue(), lineSeparator); + result = Joiner.on(emptyString).join(text); } else if (IMAGE_PNG.equals(datum.getKey())) { type = TypeData.HTML; result = makeHTML(((String) datum.getValue()).replace("\n", "")); @@ -144,8 +148,9 @@ public class JupyterUtil { // Error Error error = (Error) output; type = TypeData.TEXT; - result = - Joiner.on(lineSeparator).join(new String[] {error.getEname(), error.getEvalue()}); + List<String> text = verifyEndOfLine(Arrays.asList(error.getEname(), error.getEvalue()), + lineSeparator); + result = Joiner.on(emptyString).join(text); typeData = new TypeData(type, result); typeDataList.add(typeData); } @@ -156,8 +161,8 @@ public class JupyterUtil { interpreterName = ""; } - paragraph.setText( - interpreterName + lineSeparator + Joiner.on(lineSeparator).join(cell.getSource())); + List<String> source = verifyEndOfLine(cell.getSource(), lineSeparator); + paragraph.setText(interpreterName + lineSeparator + Joiner.on(emptyString).join(source)); paragraph.setResults(new Result(Result.SUCCESS, typeDataList)); paragraphs.add(paragraph); @@ -168,6 +173,21 @@ public class JupyterUtil { return note; } + private List<String> verifyEndOfLine(List<String> content, String lineSeparator) { + if (null == content || content.size() == 1) { + // one-liners don't have line separator + return content; + } + for (int i = 0; i < content.size(); i++) { + String line = content.get(i); + // verify to end with line separator except the last element + if (null != line && !line.endsWith(lineSeparator) && i != (content.size() - 1)) { + content.set(i, line + lineSeparator); + } + } + return content; + } + private Gson getGson(GsonBuilder gsonBuilder) { return gsonBuilder.registerTypeAdapterFactory(cellTypeFactory) .registerTypeAdapterFactory(outputTypeFactory).create();
