Revert "change NotebookRepo api to get note revision from Revision ob…

…ject to String revId" This reverts commit baaa704.
SWC-SENSE · Jul 18, 2016 · aa0a7d6 · aa0a7d6
1 parent ce097ed
commit aa0a7d6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/AzureNotebookRepo.java
@@ -217,7 +217,7 @@ public Revision checkpoint(String noteId, String checkpointMsg, AuthenticationIn
   }
 
   @Override
-  public Note get(String noteId, String revId, AuthenticationInfo subject) throws IOException {
+  public Note get(String noteId, Revision rev, AuthenticationInfo subject) throws IOException {
     // Auto-generated method stub
     return null;
   }

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/GitNotebookRepo.java
@@ -108,7 +108,7 @@ public Revision checkpoint(String pattern, String commitMessage, AuthenticationI
    * 4. apply stash on top and remove it
    */
   @Override
-  public synchronized Note get(String noteId, String revId, AuthenticationInfo subject)
+  public synchronized Note get(String noteId, Revision rev, AuthenticationInfo subject)
       throws IOException {
     Note note = null;
     RevCommit stash = null;
@@ -123,7 +123,7 @@ public synchronized Note get(String noteId, String revId, AuthenticationInfo sub
       }
       ObjectId head = git.getRepository().resolve(Constants.HEAD);
       // checkout to target revision
-      git.checkout().setStartPoint(revId).addPath(noteId).call();
+      git.checkout().setStartPoint(rev.id).addPath(noteId).call();
       // get the note
       note = super.get(noteId, subject);
       // checkout back to head
@@ -137,7 +137,7 @@ public synchronized Note get(String noteId, String revId, AuthenticationInfo sub
             stashes.size());
       }
     } catch (GitAPIException e) {
-      LOG.error("Failed to return note from revision \"{}\"", revId, e);
+      LOG.error("Failed to return note from revision \"{}\"", rev.message, e);
     }
     return note;
   }

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepo.java
@@ -89,7 +89,7 @@ public interface NotebookRepo {
    * @return a Notebook
    * @throws IOException
    */
-  @ZeppelinApi public Note get(String noteId, String revId, AuthenticationInfo subject)
+  @ZeppelinApi public Note get(String noteId, Revision rev, AuthenticationInfo subject)
       throws IOException;
 
   /**

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
@@ -389,12 +389,12 @@ public Revision checkpoint(String noteId, String checkpointMsg, AuthenticationIn
   }
 
   @Override
-  public Note get(String noteId, String revId, AuthenticationInfo subject) {
+  public Note get(String noteId, Revision rev, AuthenticationInfo subject) {
     Note revisionNote = null;
     try {
-      revisionNote = getRepo(0).get(noteId, revId, subject);
+      revisionNote = getRepo(0).get(noteId, rev, subject);
     } catch (IOException e) {
-      LOG.error("Failed to get revision {} of note {}", revId, noteId, e);
+      LOG.error("Failed to get revision {} of note {}", rev.id, noteId, e);
     }
     return revisionNote;
   }

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/S3NotebookRepo.java
@@ -260,7 +260,7 @@ public Revision checkpoint(String noteId, String checkpointMsg, AuthenticationIn
   }
 
   @Override
-  public Note get(String noteId, String revId, AuthenticationInfo subject) throws IOException {
+  public Note get(String noteId, Revision rev, AuthenticationInfo subject) throws IOException {
     // Auto-generated method stub
     return null;
   }

diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/VFSNotebookRepo.java
@@ -274,7 +274,7 @@ public Revision checkpoint(String noteId, String checkpointMsg, AuthenticationIn
   }
 
   @Override
-  public Note get(String noteId, String revId, AuthenticationInfo subject) throws IOException {
+  public Note get(String noteId, Revision rev, AuthenticationInfo subject) throws IOException {
     // Auto-generated method stub
     return null;
   }

diff --git a/...-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/ZeppelinHubRepo.java b/...-zengine/src/main/java/org/apache/zeppelin/notebook/repo/zeppelinhub/ZeppelinHubRepo.java
@@ -196,7 +196,7 @@ public Revision checkpoint(String noteId, String checkpointMsg, AuthenticationIn
   }
 
   @Override
-  public Note get(String noteId, String revId, AuthenticationInfo subject) throws IOException {
+  public Note get(String noteId, Revision rev, AuthenticationInfo subject) throws IOException {
     // Auto-generated method stub
     return null;
   }