[zeppelin] branch master updated: fixed minor formatting issues preventing the full build (#4620)

[pdallig]

This is an automated email from the ASF dual-hosted git repository.

pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 319dee60c4 fixed minor formatting issues preventing the full build 
(#4620)
319dee60c4 is described below

commit 319dee60c4dbaef5869e76818b5859a995e94f5c
Author: Maksim Zinal <maxzi...@yandex.ru>
AuthorDate: Tue Aug 1 14:56:09 2023 +0300

    fixed minor formatting issues preventing the full build (#4620)
    
    Co-authored-by: Maksim Zinal <mzi...@ru.ibm.com>
---
 .gitignore                                         |  3 +++
 .../launcher/ClusterInterpreterLauncher.java       |  2 +-
 .../launcher/DockerInterpreterProcess.java         |  3 ++-
 .../launcher/DockerInterpreterProcessTest.java     | 31 ++++++++++++----------
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 425d6fbaaa..2d58c179ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,6 +97,9 @@ Thumbs.db
 .idea/
 *.iml
 
+# vscode project files
+.vscode/
+
 # maven target files
 target/
 **/target/
diff --git 
a/zeppelin-plugins/launcher/cluster/src/main/java/org/apache/zeppelin/interpreter/launcher/ClusterInterpreterLauncher.java
 
b/zeppelin-plugins/launcher/cluster/src/main/java/org/apache/zeppelin/interpreter/launcher/ClusterInterpreterLauncher.java
index 5681e42eb4..9b8841c6a3 100644
--- 
a/zeppelin-plugins/launcher/cluster/src/main/java/org/apache/zeppelin/interpreter/launcher/ClusterInterpreterLauncher.java
+++ 
b/zeppelin-plugins/launcher/cluster/src/main/java/org/apache/zeppelin/interpreter/launcher/ClusterInterpreterLauncher.java
@@ -230,7 +230,7 @@ public class ClusterInterpreterLauncher extends 
StandardInterpreterLauncher
 
     // must first step start check interpreter thread
     ClusterInterpreterCheckThread intpCheckThread = new 
ClusterInterpreterCheckThread(
-      intpProcess, context.getInterpreterGroupId(), 
getConnectTimeout(context));
+        intpProcess, context.getInterpreterGroupId(), 
getConnectTimeout(context));
     intpCheckThread.start();
 
     return intpProcess;
diff --git 
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
 
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
index 228eee5e7a..a643f96bd3 100644
--- 
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
+++ 
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcess.java
@@ -131,7 +131,8 @@ public class DockerInterpreterProcess extends 
RemoteInterpreterProcess {
     this.containerName = interpreterGroupId.toLowerCase();
 
     containerSparkHome = 
zconf.getString(ConfVars.ZEPPELIN_DOCKER_CONTAINER_SPARK_HOME);
-    uploadLocalLibToContainter = 
zconf.getBoolean(ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER);
+    uploadLocalLibToContainter = zconf.getBoolean(
+        ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER);
 
     try {
       this.zeppelinHome = getZeppelinHome();
diff --git 
a/zeppelin-plugins/launcher/docker/src/test/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcessTest.java
 
b/zeppelin-plugins/launcher/docker/src/test/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcessTest.java
index 6b33b86afa..1bf5541268 100644
--- 
a/zeppelin-plugins/launcher/docker/src/test/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcessTest.java
+++ 
b/zeppelin-plugins/launcher/docker/src/test/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterProcessTest.java
@@ -62,27 +62,30 @@ class DockerInterpreterProcessTest {
 
   @Test
   void testEnv() throws IOException {
-    
when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_CONTAINER_SPARK_HOME)).thenReturn("my-spark-home");
-    
when(zconf.getBoolean(ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER)).thenReturn(false);
-    
when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_HOST)).thenReturn("http://my-docker-host:2375";);
+    when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_CONTAINER_SPARK_HOME))
+        .thenReturn("my-spark-home");
+    
when(zconf.getBoolean(ConfVars.ZEPPELIN_DOCKER_UPLOAD_LOCAL_LIB_TO_CONTAINTER))
+        .thenReturn(false);
+    when(zconf.getString(ConfVars.ZEPPELIN_DOCKER_HOST))
+        .thenReturn("http://my-docker-host:2375";);
 
     Properties properties = new Properties();
     properties.setProperty(
-      
ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT.getVarName(),
 "5000");
+        
ZeppelinConfiguration.ConfVars.ZEPPELIN_INTERPRETER_CONNECT_TIMEOUT.getVarName(),
 "5000");
     HashMap<String, String> envs = new HashMap<String, String>();
     envs.put("MY_ENV1", "V1");
 
     DockerInterpreterProcess intp = spy(new DockerInterpreterProcess(
-      zconf,
-      "interpreter-container:1.0",
-      "shared_process",
-      "sh",
-      "shell",
-      properties,
-      envs,
-      "zeppelin.server.hostname",
-      12320,
-      5000, 10));
+        zconf,
+        "interpreter-container:1.0",
+        "shared_process",
+        "sh",
+        "shell",
+        properties,
+        envs,
+        "zeppelin.server.hostname",
+        12320,
+        5000, 10));
 
     assertEquals("my-spark-home", intp.containerSparkHome);
     assertFalse(intp.uploadLocalLibToContainter);