Fixed some codes after rebase

zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterGroup.java

@@ -33,7 +33,7 @@ import org.apache.zeppelin.scheduler.SchedulerFactory;
  * and InterpreterGroup will have reference to these all interpreters.
  *
  * Remember, list of interpreters are dedicated to a note.
- * (when InterpreterOption.perNoteSession==true)
+ * (when InterpreterOption.session==true)
  * So InterpreterGroup internally manages map of [noteId, list of interpreters]
  *
  * A InterpreterGroup runs on interpreter process.

zeppelin-server/src/test/java/org/apache/zeppelin/rest/InterpreterRestApiTest.java

@@ -98,7 +98,7 @@ public class InterpreterRestApiTest extends AbstractTestRestApi {
     String jsonRequest = "{\"name\":\"md2\",\"group\":\"md\",\"properties\":{\"propname\":\"propvalue\"}," +
         "\"interpreterGroup\":[{\"class\":\"org.apache.zeppelin.markdown.Markdown\",\"name\":\"md\"}]," +
         "\"dependencies\":[]," +
-        "\"option\": { \"remote\": true, \"perNoteSession\": false }}";
+        "\"option\": { \"remote\": true, \"session\": false }}";
     PostMethod post = httpPost("/interpreter/setting/", jsonRequest);
     LOG.info("testSettingCRUD create response\n" + post.getResponseBodyAsString());
     assertThat("test create method:", post, isCreated());
@@ -114,7 +114,7 @@ public class InterpreterRestApiTest extends AbstractTestRestApi {
     jsonRequest = "{\"name\":\"md2\",\"group\":\"md\",\"properties\":{\"propname\":\"Otherpropvalue\"}," +
         "\"interpreterGroup\":[{\"class\":\"org.apache.zeppelin.markdown.Markdown\",\"name\":\"md\"}]," +
         "\"dependencies\":[]," +
-        "\"option\": { \"remote\": true, \"perNoteSession\": false }}";
+        "\"option\": { \"remote\": true, \"session\": false }}";
     PutMethod put = httpPut("/interpreter/setting/" + newSettingId, jsonRequest);
     LOG.info("testSettingCRUD update response\n" + put.getResponseBodyAsString());
     assertThat("test update method:", put, isAllowed());

zeppelin-web/src/app/interpreter/interpreter.controller.js

@@ -167,14 +167,14 @@
       }
 
       if (sessionOption === 'isolated') {
-        option.perNoteSession = false;
-        option.perNoteProcess = true;
+        option.session = false;
+        option.process = true;
       } else if (sessionOption === 'scoped') {
-        option.perNoteSession = true;
-        option.perNoteProcess = false;
+        option.session = true;
+        option.process = false;
       } else {
-        option.perNoteSession = false;
-        option.perNoteProcess = false;
+        option.session = false;
+        option.process = false;
       }
     };
 
@@ -187,9 +187,9 @@
         var setting = $scope.interpreterSettings[index];
         option = setting.option;
       }
-      if (option.perNoteSession) {
+      if (option.session) {
         return 'scoped';
-      } else if (option.perNoteProcess) {
+      } else if (option.process) {
         return 'isolated';
       } else {
         return 'shared';
@@ -402,8 +402,8 @@
           remote: true,
           isExistingProcess: false,
           setPermission: false,
-          perNoteSession: false,
-          perNoteProcess: false
+          session: false,
+          process: false
 
         }
       };

zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterOption.java

@@ -30,8 +30,8 @@ public class InterpreterOption {
   boolean perNote;
   boolean perUser;
 
-  boolean perNoteSession;
-  boolean perNoteProcess;
+  boolean session;
+  boolean process;
   
   boolean isExistingProcess;
   boolean setPermission;
@@ -97,12 +97,12 @@ public class InterpreterOption {
     this.remote = remote;
   }
 
-  public boolean isPerNoteSession() {
-    return perNoteSession;
+  public boolean isSession() {
+    return session;
   }
 
-  public void setPerNoteSession(boolean perNoteSession) {
-    this.perNoteSession = perNoteSession;
+  public void setSession(boolean session) {
+    this.session = session;
   }
 
   public String getHost() {
@@ -113,11 +113,11 @@ public class InterpreterOption {
     return port;
   }
 
-  public boolean isPerNoteProcess() {
-    return perNoteProcess;
+  public boolean isProcess() {
+    return process;
   }
 
-  public void setPerNoteProcess(boolean perNoteProcess) {
-    this.perNoteProcess = perNoteProcess;
+  public void setProcess(boolean process) {
+    this.process = process;
   }
 }