From 8e00b49e3f36b6b07b457257c15bf0b98ef50f5a Mon Sep 17 00:00:00 2001 From: astroshim Date: Tue, 21 Jun 2016 16:17:58 +0900 Subject: [PATCH] default interpreter name should be group name. --- .../src/main/java/org/apache/zeppelin/notebook/Note.java | 2 +- .../test/java/org/apache/zeppelin/notebook/NoteTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 7108bb34367..e2cf64c7850 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -113,7 +113,7 @@ private void generateId() { private String getDefaultInterpreterName() { Optional settingOptional = replLoader.getDefaultInterpreterSetting(); - return settingOptional.isPresent() ? settingOptional.get().getName() : StringUtils.EMPTY; + return settingOptional.isPresent() ? settingOptional.get().getGroup() : StringUtils.EMPTY; } void putDefaultReplName() { diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java index 29da0583fcd..3e323efd5cd 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java @@ -112,7 +112,7 @@ public void putDefaultReplNameIfInterpreterSettingAbsent() { @Test public void putDefaultReplNameIfInterpreterSettingPresent() { InterpreterSetting interpreterSetting = Mockito.mock(InterpreterSetting.class); - when(interpreterSetting.getName()).thenReturn("spark"); + when(interpreterSetting.getGroup()).thenReturn("spark"); when(replLoader.getDefaultInterpreterSetting()) .thenReturn(Optional.of(interpreterSetting)); @@ -126,7 +126,7 @@ public void putDefaultReplNameIfInterpreterSettingPresent() { @Test public void addParagraphWithLastReplName() { InterpreterSetting interpreterSetting = Mockito.mock(InterpreterSetting.class); - when(interpreterSetting.getName()).thenReturn("spark"); + when(interpreterSetting.getGroup()).thenReturn("spark"); when(replLoader.getDefaultInterpreterSetting()) .thenReturn(Optional.of(interpreterSetting)); @@ -141,7 +141,7 @@ public void addParagraphWithLastReplName() { @Test public void insertParagraphWithLastReplName() { InterpreterSetting interpreterSetting = Mockito.mock(InterpreterSetting.class); - when(interpreterSetting.getName()).thenReturn("spark"); + when(interpreterSetting.getGroup()).thenReturn("spark"); when(replLoader.getDefaultInterpreterSetting()) .thenReturn(Optional.of(interpreterSetting)); @@ -165,4 +165,4 @@ public void setLastReplName() { assertEquals("spark", note.getLastReplName()); } -} \ No newline at end of file +}