zeppelin git commit: [HOTFIX] Code style fix for branch-0.8

[zjffdu]

Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.8 6ce81b54f -> 3d1cb860b


[HOTFIX] Code style fix for branch-0.8

### What is this PR for?
Trivial code style fix for branch-0.8

### What type of PR is it?
[Hot Fix]

### Todos
* [ ] - Task

### What is the Jira issue?
* No jira created

### 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 

Closes #2946 from zjffdu/codestyle and squashes the following commits:

417fa7a [Jeff Zhang] [HOTFIX] Code style issue fix for branch-0.8


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/3d1cb860
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/3d1cb860
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/3d1cb860

Branch: refs/heads/branch-0.8
Commit: 3d1cb860b99f6caefbfd0b666b9d31a5b0d3536c
Parents: 6ce81b5
Author: Jeff Zhang 
Authored: Thu Apr 26 16:14:45 2018 +0800
Committer: Jeff Zhang 
Committed: Thu Apr 26 17:54:18 2018 +0800

--
 .../interpreter/InterpreterSettingManager.java  | 70 ++--
 1 file changed, 35 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/3d1cb860/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
--
diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
index b61ec55..c09cf4a 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSettingManager.java
@@ -434,17 +434,17 @@ public class InterpreterSettingManager {
 
   public List getInterpreterSettings(String noteId) {
 List settings = new ArrayList<>();
-  List interpreterSettingIds = interpreterBindings.get(noteId);
-  if (interpreterSettingIds != null) {
-for (String settingId : interpreterSettingIds) {
-  if (interpreterSettings.containsKey(settingId)) {
-settings.add(interpreterSettings.get(settingId));
-  } else {
-LOGGER.warn("InterpreterSetting {} has been removed, but note {} 
still bind to it.",
-settingId, noteId);
-  }
+List interpreterSettingIds = interpreterBindings.get(noteId);
+if (interpreterSettingIds != null) {
+  for (String settingId : interpreterSettingIds) {
+if (interpreterSettings.containsKey(settingId)) {
+  settings.add(interpreterSettings.get(settingId));
+} else {
+  LOGGER.warn("InterpreterSetting {} has been removed, but note {} 
still bind to it.",
+  settingId, noteId);
 }
   }
+}
 return settings;
   }
 
@@ -616,36 +616,36 @@ public class InterpreterSettingManager {
*/
   private void copyDependenciesFromLocalPath(final InterpreterSetting setting) 
{
 setting.setStatus(InterpreterSetting.Status.DOWNLOADING_DEPENDENCIES);
-  final Thread t = new Thread() {
-public void run() {
-  try {
-List deps = setting.getDependencies();
-if (deps != null) {
-  for (Dependency d : deps) {
-File destDir = new File(
-conf.getRelativeDir(ConfVars.ZEPPELIN_DEP_LOCALREPO));
-
-int numSplits = d.getGroupArtifactVersion().split(":").length;
-if (!(numSplits >= 3 && numSplits <= 6)) {
-  
dependencyResolver.copyLocalDependency(d.getGroupArtifactVersion(),
-  new File(destDir, setting.getId()));
-}
+final Thread t = new Thread() {
+  public void run() {
+try {
+  List deps = setting.getDependencies();
+  if (deps != null) {
+for (Dependency d : deps) {
+  File destDir = new File(
+  conf.getRelativeDir(ConfVars.ZEPPELIN_DEP_LOCALREPO));
+
+  int numSplits = d.getGroupArtifactVersion().split(":").length;
+  if (!(numSplits >= 3 && numSplits <= 6)) {
+
dependencyResolver.copyLocalDependency(d.getGroupArtifactVersion(),
+new File(destDir, setting.getId()));
   }
 }
-setting.setStatus(InterpreterSetting.Status.READY);
-  } catch (Exception e) {
-LOGGER.error(String.format("Error while copying deps for 
interpreter group : %s," +
-  

zeppelin git commit: [HOTFIX] Code style fix for branch-0.8

[zjffdu]

Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.8 7a8400e96 -> c6485d621


[HOTFIX] Code style fix for branch-0.8

### What is this PR for?

HotFix for code style issue of branch-0.8

### What type of PR is it?
[Hot Fix]

### Todos
* [ ] - Task

### What is the Jira issue?
* No jira created

### 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 

Closes #2868 from zjffdu/HOTFIX_JavaDoc and squashes the following commits:

69f3fc9 [Jeff Zhang] [HOTFIX] Code sytle fix for branch-0.8


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c6485d62
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c6485d62
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c6485d62

Branch: refs/heads/branch-0.8
Commit: c6485d621a82356070f6b373c22b9d677b80c801
Parents: 7a8400e
Author: Jeff Zhang 
Authored: Thu Mar 15 07:35:47 2018 +0800
Committer: Jeff Zhang 
Committed: Thu Mar 15 08:24:30 2018 +0800

--
 .../main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java   | 3 ++-
 .../src/main/java/org/apache/zeppelin/spark/ZeppelinR.java| 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6485d62/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
--
diff --git 
a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java 
b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
index 1eba9c2..f117686 100644
--- a/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
+++ b/livy/src/main/java/org/apache/zeppelin/livy/BaseLivyInterpreter.java
@@ -668,7 +668,8 @@ public abstract class BaseLivyInterpreter extends 
Interpreter {
 } else {
   restTemplate = new RestTemplate(new 
HttpComponentsClientHttpRequestFactory(httpClient));
 }
-restTemplate.getMessageConverters().add(0, new 
StringHttpMessageConverter(Charset.forName("UTF-8")));
+restTemplate.getMessageConverters().add(0,
+new StringHttpMessageConverter(Charset.forName("UTF-8")));
 return restTemplate;
   }
 

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c6485d62/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
--
diff --git 
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java 
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
index e481dbe..edd3233 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
+++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinR.java
@@ -399,6 +399,9 @@ public class ZeppelinR implements ExecuteResultHandler {
   }
 
 
+  /**
+   * InterpreterOutptStream for SparkInterpreter, used for checking R process 
status
+   */
   public static class SparkRInterpreterOutputStream extends 
InterpreterOutputStream {
 
 private SparkRInterpreter sparkRInterpreter;