[ZEPPELIN-4574] Fixed rootNotebookFolder and noteFileName in VFSNotebookRepo.java to allow it to work on windows

Muhammad-ms · Muhammad-ms · commit 81b054e92e7e · 2020-01-20T16:19:33.000Z
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
@@ -88,7 +88,7 @@ protected void setNotebookDirectory(String notebookDirPath) throws IOException {
       LOGGER.info("Notebook dir doesn't exist: {}, creating it.",
           rootNotebookFileObject.getName().getPath());
     }
-    this.rootNotebookFolder = rootNotebookFileObject.getName().getPath();
+    this.rootNotebookFolder = rootNotebookFileObject.getName().getURI().replace("file:///", "/");
   }
 
   @Override
@@ -110,7 +110,7 @@ private Map<String, NoteInfo> listFolder(FileObject fileObject) throws IOExcepti
         noteInfos.putAll(listFolder(child));
       }
     } else {
-      String noteFileName = fileObject.getName().getPath();
+      String noteFileName = fileObject.getName().getURI().replace("file:///", "/");
       if (noteFileName.endsWith(".zpln")) {
         try {
           String noteId = getNoteId(noteFileName);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protected void setNotebookDirectory(String notebookDirPath) throws IOException {`
`88`	`88`	`LOGGER.info("Notebook dir doesn't exist: {}, creating it.",`
`89`	`89`	`rootNotebookFileObject.getName().getPath());`
`90`	`90`	`}`
`91`		`- this.rootNotebookFolder = rootNotebookFileObject.getName().getPath();`
	`91`	`+ this.rootNotebookFolder = rootNotebookFileObject.getName().getURI().replace("file:///", "/");`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`@@ -110,7 +110,7 @@ private Map<String, NoteInfo> listFolder(FileObject fileObject) throws IOExcepti`
`110`	`110`	`noteInfos.putAll(listFolder(child));`
`111`	`111`	`}`
`112`	`112`	`} else {`
`113`		`- String noteFileName = fileObject.getName().getPath();`
	`113`	`+ String noteFileName = fileObject.getName().getURI().replace("file:///", "/");`
`114`	`114`	`if (noteFileName.endsWith(".zpln")) {`
`115`	`115`	`try {`
`116`	`116`	`String noteId = getNoteId(noteFileName);`