From 77bd2ac3774a62fa78db277555d31cdce880a9fa Mon Sep 17 00:00:00 2001 From: astroshim Date: Wed, 22 Feb 2017 01:11:44 +0900 Subject: [PATCH] add user when inserting paragraph. --- .../src/main/java/org/apache/zeppelin/notebook/Note.java | 1 + .../main/java/org/apache/zeppelin/notebook/Paragraph.java | 6 ++++-- .../test/java/org/apache/zeppelin/notebook/NoteTest.java | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 62ded184b27..c98151d9e8a 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -348,6 +348,7 @@ public Paragraph insertParagraph(int index, AuthenticationInfo authenticationInf synchronized (paragraphs) { paragraphs.add(index, p); } + p.addUser(p, p.getUser()); if (noteEventListener != null) { noteEventListener.onParagraphCreate(p); } diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java index 92a1d26f6c4..1bf693c9ca0 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java @@ -142,10 +142,12 @@ public Paragraph cloneParagraphForUser(String user) { p.setResult(getReturn()); p.setStatus(getStatus()); p.setId(getId()); + addUser(p, user); + return p; + } + public void addUser(Paragraph p, String user) { userParagraphMap.put(user, p); - - return p; } public String getUser() { diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java index 708acd6e315..9da7783a2f0 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java @@ -130,6 +130,13 @@ public void insertParagraphWithInvalidReplNameTest() { assertNull(p2.getText()); } + @Test + public void insertParagraphwithUser() { + Note note = new Note(repo, interpreterFactory, interpreterSettingManager, jobListenerFactory, index, credentials, noteEventListener); + Paragraph p = note.insertParagraph(note.getParagraphs().size(), AuthenticationInfo.ANONYMOUS); + assertEquals("anonymous", p.getUser()); + } + @Test public void clearAllParagraphOutputTest() { when(interpreterFactory.getInterpreter(anyString(), anyString(), eq("md"))).thenReturn(interpreter);