Skip to content

[ZEPPELIN-957] Normalize note name. #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
astroshim wants to merge 6 commits into from
Closed

[ZEPPELIN-957] Normalize note name. #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e549977
normalize note name
Jun 6, 2016
2a255ac
change method name.
Jun 7, 2016
7aca4bf
move method to util
Jun 7, 2016
2f4d245
check windows path
Jun 11, 2016
2370654
fix things that moon pointed out.
Jun 11, 2016
eb95adb
adjust line
Jun 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,23 @@ public String getName() {
return name;
}

private String normalizeNoteName(String name){
name = name.trim();
name = name.replace("\\", "/");
while (name.indexOf("///") >= 0) {
name = name.replaceAll("///", "/");
}
name = name.replaceAll("//", "/");
if (name.length() == 0) {
name = "/";
}
return name;
}

public void setName(String name) {
if (name.indexOf('/') >= 0 || name.indexOf('\\') >= 0) {
name = normalizeNoteName(name);
}
this.name = name;
}

Expand Down
25 changes: 25 additions & 0 deletions zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,31 @@ public void testPerSessionInterpreterCloseOnUnbindInterpreterSetting() throws IO
notebook.removeNote(note1.getId());
}

@Test
public void testNormalizeNoteName() throws IOException {
// create a notes
Note note1 = notebook.createNote();

note1.setName("MyNote");
assertEquals(note1.getName(), "MyNote");

note1.setName("/MyNote");
assertEquals(note1.getName(), "/MyNote");

note1.setName("MyNote/sub");
assertEquals(note1.getName(), "MyNote/sub");

note1.setName("/MyNote/sub");
assertEquals(note1.getName(), "/MyNote/sub");

note1.setName("///////MyNote//////sub");
assertEquals(note1.getName(), "/MyNote/sub");

note1.setName("\\\\\\MyNote///sub");
assertEquals(note1.getName(), "/MyNote/sub");

notebook.removeNote(note1.getId());
}

private void delete(File file){
if(file.isFile()) file.delete();
Expand Down