Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.8 b7676ad56 -> 9bf4913a1


[HOTFIX] fix ZEPPELIN-3198 failures

### What is this PR for?
While merging ZEPPELIN-3198(https://github.com/apache/zeppelin/pull/2757), did 
not merge ZEPPELIN-3092 and ZEPPELIN-3182 (rebase from master), which is 
causing CI to fail.

### What type of PR is it?
[Hot Fix]

### How should this be tested?
* CI should pass

Author: Prabhjyot Singh <prabhjyotsi...@gmail.com>

Closes #2800 from prabhjyotsingh/hotfix/ZEPPELIN-3198 and squashes the 
following commits:

fdf47bb [Prabhjyot Singh] fix ZEPPELIN-3198 related failures

(cherry picked from commit bf923dc13c6051bc1a2622724300c56458d7ca08)
Signed-off-by: Prabhjyot Singh <prabhjyotsi...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/9bf4913a
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/9bf4913a
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/9bf4913a

Branch: refs/heads/branch-0.8
Commit: 9bf4913a1edf4ab0e17a2ecf64ace2dc40020bf0
Parents: b7676ad
Author: Prabhjyot Singh <prabhjyotsi...@gmail.com>
Authored: Wed Feb 14 16:43:16 2018 +0530
Committer: Prabhjyot Singh <prabhjyotsi...@gmail.com>
Committed: Thu Feb 15 08:48:16 2018 +0530

----------------------------------------------------------------------
 .../org/apache/zeppelin/notebook/Notebook.java  |  6 +++--
 .../zeppelin/notebook/repo/GCSNotebookRepo.java | 26 --------------------
 .../notebook/repo/NotebookRepoSync.java         |  6 +++--
 .../notebook/repo/GitHubNotebookRepoTest.java   |  6 ++---
 4 files changed, 11 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bf4913a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
----------------------------------------------------------------------
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
index b500e71..633072c 100644
--- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
+++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Notebook.java
@@ -369,7 +369,8 @@ public class Notebook implements NoteEventListener {
   public Revision checkpointNote(String noteId, String checkpointMessage,
       AuthenticationInfo subject) throws IOException {
     if (((NotebookRepoSync) notebookRepo).isRevisionSupportedInDefaultRepo()) {
-      return ((NotebookRepoWithVersionControl) 
notebookRepo).checkpoint(noteId, checkpointMessage, subject);
+      return ((NotebookRepoWithVersionControl) notebookRepo)
+          .checkpoint(noteId, checkpointMessage, subject);
     } else {
       return null;
 
@@ -387,7 +388,8 @@ public class Notebook implements NoteEventListener {
   public Note setNoteRevision(String noteId, String revisionId, 
AuthenticationInfo subject)
       throws IOException {
     if (((NotebookRepoSync) notebookRepo).isRevisionSupportedInDefaultRepo()) {
-      return ((NotebookRepoWithVersionControl) 
notebookRepo).setNoteRevision(noteId, revisionId, subject);
+      return ((NotebookRepoWithVersionControl) notebookRepo)
+          .setNoteRevision(noteId, revisionId, subject);
     } else {
       return null;
     }

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bf4913a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
----------------------------------------------------------------------
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
index 591c532..6d62298 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GCSNotebookRepo.java
@@ -196,32 +196,6 @@ public class GCSNotebookRepo implements NotebookRepo {
   }
 
   @Override
-  public Revision checkpoint(String noteId, String checkpointMsg, 
AuthenticationInfo subject)
-      throws IOException {
-    LOG.warn("checkpoint is not implemented for GCSNotebookRepo");
-    return null;
-  }
-
-  @Override
-  public Note get(String noteId, String revId, AuthenticationInfo subject) 
throws IOException {
-    LOG.warn("get revId is not implemented for GCSNotebookRepo");
-    return null;
-  }
-
-  @Override
-  public List<Revision> revisionHistory(String noteId, AuthenticationInfo 
subject) {
-    LOG.warn("revisionHistory is not implemented for GCSNotebookRepo");
-    return Collections.emptyList();
-  }
-
-  @Override
-  public Note setNoteRevision(String noteId, String revId, AuthenticationInfo 
subject)
-      throws IOException {
-    LOG.warn("setNoteRevision is not implemented for GCSNotebookRepo");
-    return null;
-  }
-
-  @Override
   public List<NotebookRepoSettingsInfo> getSettings(AuthenticationInfo 
subject) {
     LOG.warn("getSettings is not implemented for GCSNotebookRepo");
     return Collections.emptyList();

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bf4913a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
----------------------------------------------------------------------
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
index a2c9da8..6a2daef 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
@@ -460,7 +460,8 @@ public class NotebookRepoSync implements 
NotebookRepoWithVersionControl {
       try {
         if (isRevisionSupportedInRepo(i)) {
           allRepoCheckpoints
-              .add(((NotebookRepoWithVersionControl) 
getRepo(i)).checkpoint(noteId, checkpointMsg, subject));
+              .add(((NotebookRepoWithVersionControl) getRepo(i))
+                  .checkpoint(noteId, checkpointMsg, subject));
         }
       } catch (IOException e) {
         LOG.warn("Couldn't checkpoint in {} storage with index {} for note {}",
@@ -539,7 +540,8 @@ public class NotebookRepoSync implements 
NotebookRepoWithVersionControl {
     for (int i = 0; i < repoBound; i++) {
       try {
         if (isRevisionSupportedInRepo(i)) {
-          currentNote = ((NotebookRepoWithVersionControl) 
getRepo(i)).setNoteRevision(noteId, revId, subject);
+          currentNote = ((NotebookRepoWithVersionControl) getRepo(i))
+              .setNoteRevision(noteId, revId, subject);
         }
       } catch (IOException e) {
         // already logged

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9bf4913a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitHubNotebookRepoTest.java
----------------------------------------------------------------------
diff --git 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitHubNotebookRepoTest.java
 
b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitHubNotebookRepoTest.java
index 49a5cbd..7aac2ee 100644
--- 
a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitHubNotebookRepoTest.java
+++ 
b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/repo/GitHubNotebookRepoTest.java
@@ -138,7 +138,7 @@ public class GitHubNotebookRepoTest {
    * Test the case when the Notebook repository is created, it pulls the 
latest changes from the remote repository
    */
   public void pullChangesFromRemoteRepositoryOnLoadingNotebook() throws 
IOException, GitAPIException {
-    NotebookRepo.Revision firstHistoryRevision = 
gitHubNotebookRepo.revisionHistory(TEST_NOTE_ID, null).get(0);
+    NotebookRepoWithVersionControl.Revision firstHistoryRevision = 
gitHubNotebookRepo.revisionHistory(TEST_NOTE_ID, null).get(0);
 
     assert(this.firstCommitRevision.getName().equals(firstHistoryRevision.id));
   }
@@ -156,7 +156,7 @@ public class GitHubNotebookRepoTest {
     addParagraphToNotebook(TEST_NOTE_ID);
 
     // Commit and push the changes to remote repository
-    NotebookRepo.Revision thirdCommitRevision = gitHubNotebookRepo.checkpoint(
+    NotebookRepoWithVersionControl.Revision thirdCommitRevision = 
gitHubNotebookRepo.checkpoint(
             TEST_NOTE_ID, "Third commit from local repository", null);
 
     // Check all the commits as seen from the local repository. The commits 
are ordered chronologically. The last
@@ -184,7 +184,7 @@ public class GitHubNotebookRepoTest {
     addParagraphToNotebook(TEST_NOTE_ID);
 
     // Commit and push the changes to remote repository
-    NotebookRepo.Revision secondCommitRevision = gitHubNotebookRepo.checkpoint(
+    NotebookRepoWithVersionControl.Revision secondCommitRevision = 
gitHubNotebookRepo.checkpoint(
             TEST_NOTE_ID, "Second commit from local repository", null);
 
     // Check all the commits as seen from the remote repository. The commits 
are ordered chronologically. The last

Reply via email to