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 e78e16c [ZEPPELIN-5130] Code and pom cleanup
e78e16c is described below
commit e78e16cbedf006731976e3ed46fed82760e82e08
Author: Philipp Dallig <[email protected]>
AuthorDate: Wed Mar 3 15:59:25 2021 +0100
[ZEPPELIN-5130] Code and pom cleanup
### What is this PR for?
Improve the code during development.
### What type of PR is it?
- Maintenance
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5130
### How should this be tested?
* CI
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Philipp Dallig <[email protected]>
Closes #4068 from Reamer/misc_cleanup and squashes the following commits:
2fd53fa0e [Philipp Dallig] Remove zeppelin-zengine test dependency out of
zeppelin-plugins, because this dependency isn't in use
f79884e80 [Philipp Dallig] Remove aws-java-sdk-s3 out of parent pom
521c96722 [Philipp Dallig] some cleanup
---
pom.xml | 6 ------
.../org/apache/zeppelin/spark/ZeppelinRContext.java | 1 -
.../zeppelin/interpreter/InterpreterContext.java | 2 +-
.../interpreter/remote/RemoteClientFactory.java | 4 ----
.../remote/RemoteInterpreterEventClient.java | 19 ++++++-------------
.../launcher/DockerInterpreterLauncher.java | 2 +-
zeppelin-plugins/pom.xml | 8 --------
7 files changed, 8 insertions(+), 34 deletions(-)
diff --git a/pom.xml b/pom.xml
index fae0a7e..d437970 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,12 +383,6 @@
</dependency>
<dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- <version>${aws.sdk.s3.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>${jettison.version}</version>
diff --git
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java
index becc869..13427ce 100644
---
a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java
+++
b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/ZeppelinRContext.java
@@ -19,7 +19,6 @@ package org.apache.zeppelin.spark;
import org.apache.spark.SparkContext;
import org.apache.spark.api.java.JavaSparkContext;
-import org.apache.spark.sql.SQLContext;
import org.apache.zeppelin.interpreter.ZeppelinContext;
/**
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java
index a4efb03..89b1e54 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/InterpreterContext.java
@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class InterpreterContext {
private static final ThreadLocal<InterpreterContext> threadIC = new
ThreadLocal<>();
- private static final ConcurrentHashMap<Thread, InterpreterContext>
allContexts = new ConcurrentHashMap();
+ private static final ConcurrentHashMap<Thread, InterpreterContext>
allContexts = new ConcurrentHashMap<>();
public InterpreterOutput out;
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteClientFactory.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteClientFactory.java
index 2abac21..9c8656f 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteClientFactory.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteClientFactory.java
@@ -21,10 +21,7 @@ import org.apache.commons.pool2.BasePooledObjectFactory;
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.DefaultPooledObject;
import org.apache.thrift.TServiceClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -33,7 +30,6 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class RemoteClientFactory<T extends TServiceClient> extends
BasePooledObjectFactory<T>{
- private static final Logger LOGGER =
LoggerFactory.getLogger(RemoteClientFactory.class);
private Set<T> clientSockets = ConcurrentHashMap.newKeySet();
private SupplierWithIO<T> supplier;
diff --git
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
index c2f38a3..eb0decf 100644
---
a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
+++
b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
@@ -17,7 +17,6 @@
package org.apache.zeppelin.interpreter.remote;
import com.google.gson.Gson;
-import org.apache.thrift.TException;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
@@ -36,7 +35,6 @@ import org.apache.zeppelin.interpreter.thrift.ParagraphInfo;
import org.apache.zeppelin.interpreter.thrift.RegisterInfo;
import org.apache.zeppelin.interpreter.thrift.RemoteInterpreterEventService;
import org.apache.zeppelin.interpreter.thrift.RunParagraphsEvent;
-import org.apache.zeppelin.interpreter.thrift.ServiceException;
import org.apache.zeppelin.interpreter.thrift.WebUrlInfo;
import org.apache.zeppelin.resource.RemoteResource;
import org.apache.zeppelin.resource.Resource;
@@ -58,8 +56,8 @@ import java.util.Map;
*/
public class RemoteInterpreterEventClient implements ResourcePoolConnector,
AngularObjectRegistryListener {
- private final static Logger LOGGER =
LoggerFactory.getLogger(RemoteInterpreterEventClient.class);
- private final static Gson GSON = new Gson();
+ private static final Logger LOGGER =
LoggerFactory.getLogger(RemoteInterpreterEventClient.class);
+ private static final Gson GSON = new Gson();
private PooledRemoteClient<RemoteInterpreterEventService.Client>
remoteClient;
private String intpGroupId;
@@ -114,9 +112,7 @@ public class RemoteInterpreterEventClient implements
ResourcePoolConnector,
@Override
public ResourceSet getAllResources() {
try {
- List<String> resources = callRemoteFunction(client -> {
- return client.getAllResources(intpGroupId);
- });
+ List<String> resources = callRemoteFunction(client ->
client.getAllResources(intpGroupId));
ResourceSet resourceSet = new ResourceSet();
for (String res : resources) {
RemoteResource resource = RemoteResource.fromJson(res);
@@ -131,16 +127,14 @@ public class RemoteInterpreterEventClient implements
ResourcePoolConnector,
}
public List<ParagraphInfo> getParagraphList(String user, String noteId) {
- List<ParagraphInfo> paragraphList = callRemoteFunction(client ->
client.getParagraphList(user, noteId));
- return paragraphList;
+ return callRemoteFunction(client -> client.getParagraphList(user, noteId));
}
@Override
public Object readResource(ResourceId resourceId) {
try {
ByteBuffer buffer = callRemoteFunction(client ->
client.getResource(resourceId.toJson()));
- Object o = Resource.deserializeObject(buffer);
- return o;
+ return Resource.deserializeObject(buffer);
} catch (IOException | ClassNotFoundException e) {
LOGGER.warn("Fail to readResource: " + resourceId, e);
return null;
@@ -172,8 +166,7 @@ public class RemoteInterpreterEventClient implements
ResourcePoolConnector,
null);
try {
ByteBuffer buffer = callRemoteFunction(client ->
client.invokeMethod(intpGroupId, invokeMethod.toJson()));
- Object o = Resource.deserializeObject(buffer);
- return o;
+ return Resource.deserializeObject(buffer);
} catch (IOException | ClassNotFoundException e) {
LOGGER.error("Failed to invoke method", e);
return null;
diff --git
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
index a81768c..4865aed 100644
---
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
+++
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
@@ -39,7 +39,7 @@ public class DockerInterpreterLauncher extends
InterpreterLauncher {
@Override
public InterpreterClient launchDirectly(InterpreterLaunchContext context)
throws IOException {
- LOGGER.info("Launching Interpreter: " +
context.getInterpreterSettingGroup());
+ LOGGER.info("Launching Interpreter: {}",
context.getInterpreterSettingGroup());
this.context = context;
this.properties = context.getProperties();
int connectTimeout = getConnectTimeout();
diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml
index 77a396a..5936e47 100644
--- a/zeppelin-plugins/pom.xml
+++ b/zeppelin-plugins/pom.xml
@@ -75,14 +75,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>zeppelin-zengine</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
<!-- Test libraries -->
<dependency>
<groupId>junit</groupId>
