ZEPPELIN-371 : Import a notebook

zeppelin-server/src/main/java/org/apache/zeppelin/socket/Message.java

@@ -55,6 +55,8 @@ public static enum OP {
     CLONE_NOTE, // [c-s] clone new notebook
                 // @param id id of note to clone
                 // @param name name fpor the cloned note
+    IMPORT_NOTE,  // [c-s] import notebook
+                  // @param object notebook
     NOTE_UPDATE,
 
     RUN_PARAGRAPH, // [c-s] run paragraph

zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java

@@ -16,20 +16,17 @@
  */
 package org.apache.zeppelin.socket;
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.zeppelin.conf.ZeppelinConfiguration;
 import org.apache.zeppelin.conf.ZeppelinConfiguration.ConfVars;
 import org.apache.zeppelin.display.AngularObject;
 import org.apache.zeppelin.display.AngularObjectRegistry;
 import org.apache.zeppelin.display.AngularObjectRegistryListener;
+import org.apache.zeppelin.display.Input;
 import org.apache.zeppelin.interpreter.InterpreterResult;
 import org.apache.zeppelin.interpreter.InterpreterSetting;
 import org.apache.zeppelin.notebook.JobListenerFactory;
@@ -119,6 +116,9 @@ public void onMessage(NotebookSocket conn, String msg) {
           case CLONE_NOTE:
             cloneNote(conn, notebook, messagereceived);
             break;
+          case IMPORT_NOTE:
+            importNote(conn, notebook, messagereceived);
+            break;
           case COMMIT_PARAGRAPH:
             updateParagraph(conn, notebook, messagereceived);
             break;
@@ -171,7 +171,7 @@ public void onClose(NotebookSocket conn, int code, String reason) {
     }
   }
 
-  private Message deserializeMessage(String msg) {
+  protected Message deserializeMessage(String msg) {
     return gson.fromJson(msg, Message.class);
   }
 
@@ -467,6 +467,61 @@ private void cloneNote(NotebookSocket conn, Notebook notebook, Message fromMessa
     broadcastNoteList();
   }
 
+  protected Note importNote(NotebookSocket conn, Notebook notebook, Message fromMessage)
+      throws IOException {
+
+    Note note = notebook.createNote();
+    if (fromMessage != null) {
+      String noteName = (String) ((Map) fromMessage.get("notebook")).get("name");
+      if (noteName == null || noteName.isEmpty()) {
+        noteName = "Note " + note.getId();
+      }
+      note.setName(noteName);
+      ArrayList<Map> paragraphs = ((Map<String, ArrayList>) fromMessage.get("notebook"))
+          .get("paragraphs");
+      if (paragraphs.size() > 0) {
+        for (Map paragraph : paragraphs) {
+          try {
+            Paragraph p = note.addParagraph();
+            String text = (String) paragraph.get("text");
+            p.setText(text);
+            p.setTitle((String) paragraph.get("title"));
+            Map<String, Object> params = (Map<String, Object>) ((Map) paragraph
+                .get("settings")).get("params");
+            Map<String, Input> forms = (Map<String, Input>) ((Map) paragraph
+                .get("settings")).get("forms");
+            if (params != null) {
+              p.settings.setParams(params);
+            }
+            if (forms != null) {
+              p.settings.setForms(forms);
+            }
+            Map<String, Object> result = (Map) paragraph.get("result");
+            if (result != null) {
+              InterpreterResult.Code code = InterpreterResult.Code
+                  .valueOf((String) result.get("code"));
+              InterpreterResult.Type type = InterpreterResult.Type
+                  .valueOf((String) result.get("type"));
+              String msg = (String) result.get("msg");
+              p.setReturn(new InterpreterResult(code, type, msg), null);
+            }
+
+            Map<String, Object> config = (Map<String, Object>) paragraph
+                .get("config");
+            p.setConfig(config);
+          } catch (Exception e) {
+            LOG.error("Exception while setting parameter in paragraph", e);
+          }
+        }
+      }
+    }
+
+    note.persist();
+    broadcastNote(note);
+    broadcastNoteList();
+    return note;
+  }
+
   private void removeParagraph(NotebookSocket conn, Notebook notebook,
       Message fromMessage) throws IOException {
     final String paragraphId = (String) fromMessage.get("id");

zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java

@@ -299,7 +299,7 @@ private void createNewNote() {
       notebookTitles.add(el.getText());
     }
 
-    WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5/a"));
+    WebElement createNoteLink = driver.findElement(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5/a[contains(.,'Create new note')]"));
     createNoteLink.click();
 
     WebDriverWait block = new WebDriverWait(driver, 10);

zeppelin-server/src/test/java/org/apache/zeppelin/socket/NotebookServerTest.java

@@ -136,6 +136,27 @@ public void testMakeSureNoAngularObjectBroadcastToWebsocketWhoFireTheEvent() thr
     notebook.removeNote(note1.getId());
   }
 
+  @Test
+  public void testImportNotebook() throws IOException {
+    String msg = "{\"op\":\"IMPORT_NOTE\",\"data\":" +
+        "{\"notebook\":{\"paragraphs\": [{\"text\": \"Test " +
+        "paragraphs import\",\"config\":{},\"settings\":{}}]," +
+        "\"name\": \"Test Zeppelin notebook import\",\"config\": " +
+        "{}}}}";
+    Message messageReceived = notebookServer.deserializeMessage(msg);
+    Note note = null;
+    try {
+      note = notebookServer.importNote(null, notebook, messageReceived);
+    } catch (NullPointerException e) {
+      //broadcastNoteList(); failed nothing to worry.
+    }
+
+    assertNotEquals(null, notebook.getNote(note.getId()));
+    assertEquals("Test Zeppelin notebook import", notebook.getNote(note.getId()).getName());
+    assertEquals("Test paragraphs import", notebook.getNote(note.getId()).getParagraphs().get(0).getText());
+    notebook.removeNote(note.getId());
+  }
+
   private NotebookSocket createWebSocket() {
     NotebookSocket sock = mock(NotebookSocket.class);
     when(sock.getRequest()).thenReturn(createHttpServletRequest());