You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by wa...@apache.org on 2023/04/04 03:01:10 UTC
[incubator-seatunnel] branch dev updated: [Chore][Zeta] Remove redundant code (#4489)
This is an automated email from the ASF dual-hosted git repository.
wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 17720b5d2 [Chore][Zeta] Remove redundant code (#4489)
17720b5d2 is described below
commit 17720b5d2941043140f28de8eeb0795da88676d7
Author: Tyrantlucifer <Ty...@gmail.com>
AuthorDate: Tue Apr 4 11:01:01 2023 +0800
[Chore][Zeta] Remove redundant code (#4489)
---
.../core/starter/seatunnel/command/ClientExecuteCommand.java | 6 +++---
.../java/org/apache/seatunnel/engine/client/SeaTunnelClient.java | 3 ---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java b/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java
index cec77e55c..2c6c47c9e 100644
--- a/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java
+++ b/seatunnel-core/seatunnel-starter/src/main/java/org/apache/seatunnel/core/starter/seatunnel/command/ClientExecuteCommand.java
@@ -84,7 +84,7 @@ public class ClientExecuteCommand implements Command<ClientCommandArgs> {
StringUtils.isNotEmpty(clusterName)
? clusterName
: Constant.DEFAULT_SEATUNNEL_CLUSTER_NAME);
- instance = createServerInLocal(clusterName);
+ instance = createServerInLocal(clusterName, seaTunnelConfig);
}
if (StringUtils.isNotEmpty(clusterName)) {
seaTunnelConfig.getHazelcastConfig().setClusterName(clusterName);
@@ -227,8 +227,8 @@ public class ClientExecuteCommand implements Command<ClientCommandArgs> {
}
}
- private HazelcastInstance createServerInLocal(String clusterName) {
- SeaTunnelConfig seaTunnelConfig = ConfigProvider.locateAndGetSeaTunnelConfig();
+ private HazelcastInstance createServerInLocal(
+ String clusterName, SeaTunnelConfig seaTunnelConfig) {
seaTunnelConfig.getHazelcastConfig().setClusterName(clusterName);
return HazelcastInstanceFactory.newHazelcastInstance(
seaTunnelConfig.getHazelcastConfig(),
diff --git a/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelClient.java b/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelClient.java
index c556c43e7..97f602b46 100644
--- a/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelClient.java
+++ b/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelClient.java
@@ -17,8 +17,6 @@
package org.apache.seatunnel.engine.client;
-import org.apache.seatunnel.shade.com.fasterxml.jackson.databind.ObjectMapper;
-
import org.apache.seatunnel.common.utils.JsonUtils;
import org.apache.seatunnel.engine.client.job.JobClient;
import org.apache.seatunnel.engine.client.job.JobExecutionEnvironment;
@@ -41,7 +39,6 @@ import java.util.Map;
import java.util.Set;
public class SeaTunnelClient implements SeaTunnelClientInstance {
- private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private final SeaTunnelHazelcastClient hazelcastClient;
@Getter private final JobClient jobClient;