[zeppelin] branch master updated: [ZEPPELIN-4551]. upgrade-note.sh Plugin GitNotebookRepo doesn't exist

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 52d2b4b  [ZEPPELIN-4551]. upgrade-note.sh Plugin GitNotebookRepo 
doesn't exist
52d2b4b is described below

commit 52d2b4b0b2430573e4d088ea4099c2b4b9bc8a5c
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Thu Jan 16 10:41:20 2020 +0800

    [ZEPPELIN-4551]. upgrade-note.sh Plugin GitNotebookRepo doesn't exist
    
    ### What is this PR for?
    
    In this PR, we always load NotebookRepo from current classpath first, then 
fallback to plugin ClassPathLoader. Actually we do it already for new 
NotebookRepo but miss that for the old NotebookRepo.
    
    ### What type of PR is it?
    [Bug Fix ]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4551
    
    ### How should this be tested?
    * CI pass
    
    ### 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: Jeff Zhang <zjf...@apache.org>
    
    Closes #3598 from zjffdu/ZEPPELIN-4551 and squashes the following commits:
    
    7eb734ce7 [Jeff Zhang] [ZEPPELIN-4551]. upgrade-note.sh Plugin 
GitNotebookRepo doesn't exist
---
 .../org/apache/zeppelin/plugin/PluginManager.java     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/plugin/PluginManager.java 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/plugin/PluginManager.java
index cdcfed0..032773e 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/plugin/PluginManager.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/plugin/PluginManager.java
@@ -100,17 +100,14 @@ public class PluginManager {
    */
   public OldNotebookRepo loadOldNotebookRepo(String notebookRepoClassName) 
throws IOException {
     LOGGER.info("Loading OldNotebookRepo Plugin: " + notebookRepoClassName);
-    // load plugin from classpath directly when it is test.
-    // otherwise load it from plugin folder
-    String isTest = System.getenv("IS_ZEPPELIN_TEST");
-    if (isTest != null && isTest.equals("true")) {
-      try {
-        OldNotebookRepo notebookRepo = (OldNotebookRepo)
-            (Class.forName(notebookRepoClassName).newInstance());
-        return notebookRepo;
-      } catch (InstantiationException | IllegalAccessException | 
ClassNotFoundException e) {
-        LOGGER.warn("Fail to instantiate notebookrepo from classpath 
directly:" + notebookRepoClassName);
-      }
+    // load plugin from classpath directly first for these builtin 
NotebookRepo (such as VFSNoteBookRepo
+    // and GitNotebookRepo). If fails, then try to load it from plugin folder
+    try {
+      OldNotebookRepo notebookRepo = (OldNotebookRepo)
+          (Class.forName(notebookRepoClassName).newInstance());
+      return notebookRepo;
+    } catch (InstantiationException | IllegalAccessException | 
ClassNotFoundException e) {
+      LOGGER.warn("Fail to instantiate notebookrepo from classpath directly:" 
+ notebookRepoClassName);
     }
 
     String simpleClassName = 
notebookRepoClassName.substring(notebookRepoClassName.lastIndexOf(".") + 1);