You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by ki...@apache.org on 2022/05/23 12:42:19 UTC
[incubator-seatunnel] branch api-draft updated: [API-DRAFT]Rename Flink-stater package name (#1942)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch api-draft
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/api-draft by this push:
new a508e29e [API-DRAFT]Rename Flink-stater package name (#1942)
a508e29e is described below
commit a508e29e941e937e5fee91dfad2e7297dd8b3a3b
Author: Kirs <ki...@apache.org>
AuthorDate: Mon May 23 20:42:12 2022 +0800
[API-DRAFT]Rename Flink-stater package name (#1942)
* [API-DRAFT]Rename Flink-stater package name
Package name plus engine name to avoid package conflicts
* revert test files
---
.../core/starter/{ => flink}/FlinkStarter.java | 9 +--
.../core/starter/{ => flink}/SeatunnelFlink.java | 11 ++--
.../starter/{ => flink}/args/FlinkCommandArgs.java | 4 +-
.../command/FlinkApiConfValidateCommand.java | 7 ++-
.../command/FlinkApiTaskExecuteCommand.java | 7 ++-
.../{ => flink}/command/FlinkCommandBuilder.java | 6 +-
.../{ => flink}/config/FlinkApiConfigChecker.java | 3 +-
.../{ => flink}/config/FlinkApiEnvironment.java | 2 +-
.../{ => flink}/config/FlinkExecutionContext.java | 5 +-
.../starter/{ => flink}/config/FlinkJobType.java | 2 +-
.../starter/{ => flink}/config/FlinkRunMode.java | 2 +-
.../{ => flink}/constant/FlinkConstant.java | 2 +-
.../starter/{ => flink}/env/FlinkEnvironment.java | 2 +-
.../execution/AbstractPluginExecuteProcessor.java | 2 +-
.../{ => flink}/execution/FlinkTaskExecution.java | 2 +-
.../execution/PluginExecuteProcessor.java | 2 +-
.../execution/SinkExecuteProcessor.java | 2 +-
.../execution/SourceExecuteProcessor.java | 2 +-
.../execution/TransformExecuteProcessor.java | 2 +-
.../{ => flink}/utils/CommandLineUtils.java | 8 +--
.../core/starter/{ => flink}/FlinkStarterTest.java | 2 +-
.../{ => flink}/args/FlinkCommandArgsTest.java | 2 +-
.../core/starter/utils/CommandLineUtilsTest.java | 66 ----------------------
.../example/flink/SeaTunnelApiExample.java | 4 +-
24 files changed, 50 insertions(+), 106 deletions(-)
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/FlinkStarter.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/FlinkStarter.java
similarity index 87%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/FlinkStarter.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/FlinkStarter.java
index 786f7ebf..1a0c5fa3 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/FlinkStarter.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/FlinkStarter.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter;
+package org.apache.seatunnel.core.starter.flink;
import org.apache.seatunnel.common.config.Common;
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
-import org.apache.seatunnel.core.starter.config.FlinkJobType;
-import org.apache.seatunnel.core.starter.utils.CommandLineUtils;
+import org.apache.seatunnel.core.starter.Starter;
+import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.flink.config.FlinkJobType;
+import org.apache.seatunnel.core.starter.flink.utils.CommandLineUtils;
import java.util.List;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/SeatunnelFlink.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/SeatunnelFlink.java
similarity index 77%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/SeatunnelFlink.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/SeatunnelFlink.java
index 4135e3e2..330c2e50 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/SeatunnelFlink.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/SeatunnelFlink.java
@@ -15,14 +15,15 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter;
+package org.apache.seatunnel.core.starter.flink;
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.Seatunnel;
import org.apache.seatunnel.core.starter.command.Command;
-import org.apache.seatunnel.core.starter.command.FlinkCommandBuilder;
-import org.apache.seatunnel.core.starter.config.FlinkJobType;
import org.apache.seatunnel.core.starter.exception.CommandException;
-import org.apache.seatunnel.core.starter.utils.CommandLineUtils;
+import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.flink.command.FlinkCommandBuilder;
+import org.apache.seatunnel.core.starter.flink.config.FlinkJobType;
+import org.apache.seatunnel.core.starter.flink.utils.CommandLineUtils;
public class SeatunnelFlink {
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/args/FlinkCommandArgs.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/args/FlinkCommandArgs.java
similarity index 95%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/args/FlinkCommandArgs.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/args/FlinkCommandArgs.java
index afc18651..9fd4bdd4 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/args/FlinkCommandArgs.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/args/FlinkCommandArgs.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.args;
+package org.apache.seatunnel.core.starter.flink.args;
import org.apache.seatunnel.common.config.DeployMode;
import org.apache.seatunnel.core.starter.command.AbstractCommandArgs;
import org.apache.seatunnel.core.starter.config.EngineType;
-import org.apache.seatunnel.core.starter.config.FlinkRunMode;
+import org.apache.seatunnel.core.starter.flink.config.FlinkRunMode;
import com.beust.jcommander.IStringConverter;
import com.beust.jcommander.Parameter;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkApiConfValidateCommand.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkApiConfValidateCommand.java
similarity index 87%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkApiConfValidateCommand.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkApiConfValidateCommand.java
index dee9fadb..5ca54a39 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkApiConfValidateCommand.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkApiConfValidateCommand.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.command;
+package org.apache.seatunnel.core.starter.flink.command;
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.command.Command;
import org.apache.seatunnel.core.starter.config.ConfigBuilder;
-import org.apache.seatunnel.core.starter.config.FlinkApiConfigChecker;
import org.apache.seatunnel.core.starter.exception.ConfigCheckException;
+import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.flink.config.FlinkApiConfigChecker;
import org.apache.seatunnel.core.starter.utils.FileUtils;
import org.slf4j.Logger;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkApiTaskExecuteCommand.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkApiTaskExecuteCommand.java
similarity index 89%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkApiTaskExecuteCommand.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkApiTaskExecuteCommand.java
index 6b0ed827..f674ca12 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkApiTaskExecuteCommand.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkApiTaskExecuteCommand.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.command;
+package org.apache.seatunnel.core.starter.flink.command;
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.command.Command;
import org.apache.seatunnel.core.starter.config.ConfigBuilder;
import org.apache.seatunnel.core.starter.exception.CommandExecuteException;
-import org.apache.seatunnel.core.starter.execution.FlinkTaskExecution;
+import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.flink.execution.FlinkTaskExecution;
import org.apache.seatunnel.core.starter.utils.FileUtils;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkCommandBuilder.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkCommandBuilder.java
similarity index 87%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkCommandBuilder.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkCommandBuilder.java
index 019f1bbd..24661acf 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/command/FlinkCommandBuilder.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/command/FlinkCommandBuilder.java
@@ -15,10 +15,12 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.command;
+package org.apache.seatunnel.core.starter.flink.command;
import org.apache.seatunnel.common.config.Common;
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.command.Command;
+import org.apache.seatunnel.core.starter.command.CommandBuilder;
+import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
public class FlinkCommandBuilder implements CommandBuilder<FlinkCommandArgs> {
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkApiConfigChecker.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkApiConfigChecker.java
similarity index 90%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkApiConfigChecker.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkApiConfigChecker.java
index bbbdaa9b..2ae68515 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkApiConfigChecker.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkApiConfigChecker.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.config;
+package org.apache.seatunnel.core.starter.flink.config;
+import org.apache.seatunnel.core.starter.config.ConfigChecker;
import org.apache.seatunnel.core.starter.exception.ConfigCheckException;
import org.apache.seatunnel.shade.com.typesafe.config.Config;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkApiEnvironment.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkApiEnvironment.java
similarity index 97%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkApiEnvironment.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkApiEnvironment.java
index 62ac0eb9..5b8ba32d 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkApiEnvironment.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkApiEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.config;
+package org.apache.seatunnel.core.starter.flink.config;
import org.apache.seatunnel.apis.base.env.RuntimeEnv;
import org.apache.seatunnel.common.config.CheckResult;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkExecutionContext.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkExecutionContext.java
similarity index 95%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkExecutionContext.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkExecutionContext.java
index 94fc0c99..05bf68d0 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkExecutionContext.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkExecutionContext.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.config;
+package org.apache.seatunnel.core.starter.flink.config;
import org.apache.seatunnel.apis.base.api.BaseSink;
import org.apache.seatunnel.apis.base.api.BaseSource;
import org.apache.seatunnel.apis.base.api.BaseTransform;
+import org.apache.seatunnel.core.starter.config.AbstractExecutionContext;
+import org.apache.seatunnel.core.starter.config.EngineType;
+import org.apache.seatunnel.core.starter.config.PluginType;
import org.apache.seatunnel.flink.FlinkEnvironment;
import org.apache.seatunnel.plugin.discovery.PluginIdentifier;
import org.apache.seatunnel.plugin.discovery.flink.FlinkSinkPluginDiscovery;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkJobType.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkJobType.java
similarity index 95%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkJobType.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkJobType.java
index 4ffe4f6e..f18f8346 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkJobType.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkJobType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.config;
+package org.apache.seatunnel.core.starter.flink.config;
public enum FlinkJobType {
JAR("start-seatunnel-flink.sh"),
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkRunMode.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkRunMode.java
similarity index 95%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkRunMode.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkRunMode.java
index 9d54ad72..25b9a5a0 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/config/FlinkRunMode.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/config/FlinkRunMode.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.config;
+package org.apache.seatunnel.core.starter.flink.config;
/**
* Flink run mode, used to determine whether to run in local or cluster mode.
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/constant/FlinkConstant.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/constant/FlinkConstant.java
similarity index 93%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/constant/FlinkConstant.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/constant/FlinkConstant.java
index af8f6422..620e5b2e 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/constant/FlinkConstant.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/constant/FlinkConstant.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.constant;
+package org.apache.seatunnel.core.starter.flink.constant;
public class FlinkConstant {
public static final int USAGE_EXIT_CODE = 234;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/env/FlinkEnvironment.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/env/FlinkEnvironment.java
similarity index 99%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/env/FlinkEnvironment.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/env/FlinkEnvironment.java
index 132147e0..337e6c8d 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/env/FlinkEnvironment.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/env/FlinkEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.env;
+package org.apache.seatunnel.core.starter.flink.env;
import org.apache.seatunnel.apis.base.env.RuntimeEnv;
import org.apache.seatunnel.common.config.CheckResult;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/AbstractPluginExecuteProcessor.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/AbstractPluginExecuteProcessor.java
similarity index 98%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/AbstractPluginExecuteProcessor.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/AbstractPluginExecuteProcessor.java
index 01e3bea7..9df335a3 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/AbstractPluginExecuteProcessor.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/AbstractPluginExecuteProcessor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.execution;
+package org.apache.seatunnel.core.starter.flink.execution;
import static org.apache.seatunnel.apis.base.plugin.Plugin.RESULT_TABLE_NAME;
import static org.apache.seatunnel.apis.base.plugin.Plugin.SOURCE_TABLE_NAME;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/FlinkTaskExecution.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/FlinkTaskExecution.java
similarity index 98%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/FlinkTaskExecution.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/FlinkTaskExecution.java
index c84d673d..7805201f 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/FlinkTaskExecution.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/FlinkTaskExecution.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.execution;
+package org.apache.seatunnel.core.starter.flink.execution;
import org.apache.seatunnel.common.constants.JobMode;
import org.apache.seatunnel.core.starter.config.EngineType;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/PluginExecuteProcessor.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/PluginExecuteProcessor.java
similarity index 95%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/PluginExecuteProcessor.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/PluginExecuteProcessor.java
index 72be93e9..3a458a79 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/PluginExecuteProcessor.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/PluginExecuteProcessor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.execution;
+package org.apache.seatunnel.core.starter.flink.execution;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.types.Row;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/SinkExecuteProcessor.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/SinkExecuteProcessor.java
similarity index 98%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/SinkExecuteProcessor.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/SinkExecuteProcessor.java
index f8b12f86..cdabafb9 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/SinkExecuteProcessor.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/SinkExecuteProcessor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.execution;
+package org.apache.seatunnel.core.starter.flink.execution;
import org.apache.seatunnel.api.sink.SeaTunnelSink;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/SourceExecuteProcessor.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/SourceExecuteProcessor.java
similarity index 98%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/SourceExecuteProcessor.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/SourceExecuteProcessor.java
index 95fe4b38..911698e6 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/SourceExecuteProcessor.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/SourceExecuteProcessor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.execution;
+package org.apache.seatunnel.core.starter.flink.execution;
import org.apache.seatunnel.flink.FlinkEnvironment;
import org.apache.seatunnel.plugin.discovery.PluginIdentifier;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/TransformExecuteProcessor.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/TransformExecuteProcessor.java
similarity index 98%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/TransformExecuteProcessor.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/TransformExecuteProcessor.java
index a3614088..9bd5ed8f 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/execution/TransformExecuteProcessor.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/execution/TransformExecuteProcessor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.execution;
+package org.apache.seatunnel.core.starter.flink.execution;
import org.apache.seatunnel.flink.FlinkEnvironment;
import org.apache.seatunnel.flink.stream.FlinkStreamTransform;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/utils/CommandLineUtils.java b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/utils/CommandLineUtils.java
similarity index 92%
rename from seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/utils/CommandLineUtils.java
rename to seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/utils/CommandLineUtils.java
index c636476da..9b29fdf1 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/utils/CommandLineUtils.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/main/java/org/apache/seatunnel/core/starter/flink/utils/CommandLineUtils.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.utils;
+package org.apache.seatunnel.core.starter.flink.utils;
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
-import org.apache.seatunnel.core.starter.config.FlinkJobType;
-import org.apache.seatunnel.core.starter.constant.FlinkConstant;
+import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.flink.config.FlinkJobType;
+import org.apache.seatunnel.core.starter.flink.constant.FlinkConstant;
import com.beust.jcommander.JCommander;
import com.beust.jcommander.UnixStyleUsageFormatter;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/FlinkStarterTest.java b/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/flink/FlinkStarterTest.java
similarity index 98%
rename from seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/FlinkStarterTest.java
rename to seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/flink/FlinkStarterTest.java
index 6bbea695..bdcb0a6c 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/FlinkStarterTest.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/flink/FlinkStarterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter;
+package org.apache.seatunnel.core.starter.flink;
import org.junit.Assert;
import org.junit.Test;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/args/FlinkCommandArgsTest.java b/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/flink/args/FlinkCommandArgsTest.java
similarity index 96%
rename from seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/args/FlinkCommandArgsTest.java
rename to seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/flink/args/FlinkCommandArgsTest.java
index 1caf47a5..ac13a464 100644
--- a/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/args/FlinkCommandArgsTest.java
+++ b/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/flink/args/FlinkCommandArgsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.core.starter.args;
+package org.apache.seatunnel.core.starter.flink.args;
import com.beust.jcommander.JCommander;
import org.junit.Assert;
diff --git a/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/utils/CommandLineUtilsTest.java b/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/utils/CommandLineUtilsTest.java
deleted file mode 100644
index e36190e1..00000000
--- a/seatunnel-core/seatunnel-flink-starter/src/test/java/org/apache/seatunnel/core/starter/utils/CommandLineUtilsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.seatunnel.core.starter.utils;
-
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
-import org.apache.seatunnel.core.starter.config.FlinkJobType;
-import org.apache.seatunnel.core.starter.config.FlinkRunMode;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class CommandLineUtilsTest {
-
- @Test
- public void testParseCommandArgs() {
- String[] args = {"--detached", "-c", "app.conf", "-t", "-i", "city=shenyang", "-i", "date=20200202",
- "-r", "run-application", "--unkown", "unkown-command"};
- FlinkCommandArgs flinkCommandArgs = CommandLineUtils.parseCommandArgs(args, FlinkJobType.JAR);
- Assert.assertEquals(Arrays.asList("--detached", "--unkown", "unkown-command"), flinkCommandArgs.getFlinkParams());
- Assert.assertEquals(FlinkRunMode.APPLICATION_RUN, flinkCommandArgs.getRunMode());
- Assert.assertEquals(Arrays.asList("city=shenyang", "date=20200202"), flinkCommandArgs.getVariables());
-
- String[] args1 = {"--detached", "-c", "app.conf", "-t", "-i", "city=shenyang", "-i", "date=20200202",
- "-r", "run-application", "--unkown", "unkown-command"};
- flinkCommandArgs = CommandLineUtils.parseCommandArgs(args1, FlinkJobType.SQL);
- Assert.assertEquals(Arrays.asList("--detached", "--unkown", "unkown-command"), flinkCommandArgs.getFlinkParams());
- Assert.assertEquals(FlinkRunMode.APPLICATION_RUN, flinkCommandArgs.getRunMode());
- Assert.assertEquals(Arrays.asList("city=shenyang", "date=20200202"), flinkCommandArgs.getVariables());
- }
-
- @Test
- public void testBuildFlinkCommand() {
- String[] args = {"--detached", "-c", "app.conf", "-t", "-i", "city=shenyang", "-i", "date=20200202",
- "-r", "run-application", "--unkown", "unkown-command"};
- FlinkCommandArgs flinkCommandArgs = CommandLineUtils.parseCommandArgs(args, FlinkJobType.JAR);
- List<String> commands = CommandLineUtils.buildFlinkCommand(flinkCommandArgs, "CLASS_NAME", "/path/to/jar");
- Assert.assertEquals(Arrays.asList("${FLINK_HOME}/bin/flink", "run-application", "--detached", "--unkown", "unkown-command", "-c",
- "CLASS_NAME", "/path/to/jar", "--config", "app.conf", "--check", "-Dcity=shenyang", "-Ddate=20200202"),
- commands);
-
- flinkCommandArgs = CommandLineUtils.parseCommandArgs(args, FlinkJobType.SQL);
- commands = CommandLineUtils.buildFlinkCommand(flinkCommandArgs, "CLASS_NAME", "/path/to/jar");
- Assert.assertEquals(Arrays.asList("${FLINK_HOME}/bin/flink", "run-application", "--detached", "--unkown", "unkown-command", "-c",
- "CLASS_NAME", "/path/to/jar", "--config", "app.conf", "--check", "-Dcity=shenyang", "-Ddate=20200202"),
- commands);
-
- }
-}
diff --git a/seatunnel-examples/seatunnel-flink-examples/src/main/java/org/apache/seatunnel/example/flink/SeaTunnelApiExample.java b/seatunnel-examples/seatunnel-flink-examples/src/main/java/org/apache/seatunnel/example/flink/SeaTunnelApiExample.java
index 00c59f15..c8cbc116 100644
--- a/seatunnel-examples/seatunnel-flink-examples/src/main/java/org/apache/seatunnel/example/flink/SeaTunnelApiExample.java
+++ b/seatunnel-examples/seatunnel-flink-examples/src/main/java/org/apache/seatunnel/example/flink/SeaTunnelApiExample.java
@@ -18,10 +18,10 @@
package org.apache.seatunnel.example.flink;
import org.apache.seatunnel.core.starter.Seatunnel;
-import org.apache.seatunnel.core.starter.args.FlinkCommandArgs;
import org.apache.seatunnel.core.starter.command.Command;
-import org.apache.seatunnel.core.starter.command.FlinkCommandBuilder;
import org.apache.seatunnel.core.starter.exception.CommandException;
+import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
+import org.apache.seatunnel.core.starter.flink.command.FlinkCommandBuilder;
import java.io.FileNotFoundException;
import java.net.URISyntaxException;