From 9d75a71204bc60f0638df43a2b8e919072dc4094 Mon Sep 17 00:00:00 2001 From: wulin Date: Sun, 19 Jan 2025 18:21:22 +0800 Subject: [PATCH] fixd imports --- .../console/core/entity/FlinkApplication.java | 27 ++++++++-- .../FlinkApplicationActionServiceImpl.java | 51 ++++++++++++++++++ ...nkApplicationBuildPipelineServiceImpl.java | 53 +++++++++++++++++-- .../FlinkApplicationManageServiceImpl.java | 32 +++++++++++ .../impl/FlinkSavepointServiceImpl.java | 6 +++ 5 files changed, 161 insertions(+), 8 deletions(-) diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplication.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplication.java index 9a5ac8d771..fcb787b957 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplication.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplication.java @@ -20,6 +20,11 @@ import org.apache.streampark.common.conf.ConfigKeys; import org.apache.streampark.common.conf.Workspace; import org.apache.streampark.common.constants.Constants; +import org.apache.streampark.common.enums.ApplicationType; +import org.apache.streampark.common.enums.FlinkDeployMode; +import org.apache.streampark.common.enums.FlinkJobType; +import org.apache.streampark.common.enums.FlinkK8sRestExposedType; +import org.apache.streampark.common.enums.StorageType; import org.apache.streampark.common.fs.FsOperator; import org.apache.streampark.console.base.mybatis.entity.BaseEntity; import org.apache.streampark.console.base.util.JacksonUtils; @@ -36,6 +41,11 @@ import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; @@ -43,6 +53,13 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + @Getter @Setter @TableName("t_flink_app") @@ -458,15 +475,15 @@ public String getAppHome() { } public String getMainClass() { - FlinkDevelopmentMode flinkDevelopmentMode = FlinkDevelopmentMode.of(deployMode); - if (flinkDevelopmentMode == FlinkDevelopmentMode.FLINK_SQL) { + FlinkJobType flinkJobType = FlinkJobType.of(jobType); + if (flinkJobType == FlinkJobType.FLINK_SQL) { return Constants.STREAMPARK_FLINKSQL_CLIENT_CLASS; - } else if (flinkDevelopmentMode == FlinkDevelopmentMode.FLINK_CDC) { + } else if (flinkJobType == FlinkJobType.FLINK_CDC) { return Constants.STREAMPARK_FLINKCDC_CLIENT_CLASS; - } else if (flinkDevelopmentMode == FlinkDevelopmentMode.PYFLINK) { + } else if (flinkJobType == FlinkJobType.PYFLINK) { return Constants.PYTHON_FLINK_DRIVER_CLASS_NAME; // Assuming this is the default behavior for other enum // values - } else if (flinkDevelopmentMode == FlinkDevelopmentMode.CUSTOM_CODE) { + } else if (flinkJobType == FlinkJobType.CUSTOM_CODE) { return mainClass; } else { return null; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java index fb3b80bd0f..717f90b559 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationActionServiceImpl.java @@ -20,12 +20,56 @@ import org.apache.streampark.common.conf.ConfigKeys; import org.apache.streampark.common.conf.Workspace; import org.apache.streampark.common.constants.Constants; +import org.apache.streampark.common.enums.ApplicationType; +import org.apache.streampark.common.enums.ClusterState; +import org.apache.streampark.common.enums.FlinkDeployMode; +import org.apache.streampark.common.enums.FlinkJobType; +import org.apache.streampark.common.enums.FlinkK8sRestExposedType; +import org.apache.streampark.common.enums.FlinkRestoreMode; +import org.apache.streampark.common.enums.ResolveOrder; import org.apache.streampark.common.fs.FsOperator; +import org.apache.streampark.common.util.AssertUtils; +import org.apache.streampark.common.util.DeflaterUtils; +import org.apache.streampark.common.util.ExceptionUtils; +import org.apache.streampark.common.util.HadoopUtils; +import org.apache.streampark.common.util.PropertiesUtils; import org.apache.streampark.console.base.exception.ApiAlertException; import org.apache.streampark.console.base.exception.ApplicationException; import org.apache.streampark.console.base.util.Tuple2; import org.apache.streampark.console.base.util.Tuple3; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; +import org.apache.streampark.console.core.entity.ApplicationLog; +import org.apache.streampark.console.core.entity.FlinkApplication; +import org.apache.streampark.console.core.entity.FlinkApplicationConfig; +import org.apache.streampark.console.core.entity.FlinkCluster; +import org.apache.streampark.console.core.entity.FlinkEnv; +import org.apache.streampark.console.core.entity.FlinkSavepoint; +import org.apache.streampark.console.core.entity.FlinkSql; +import org.apache.streampark.console.core.entity.Resource; +import org.apache.streampark.console.core.enums.CheckPointTypeEnum; +import org.apache.streampark.console.core.enums.ConfigFileTypeEnum; +import org.apache.streampark.console.core.enums.DistributedTaskEnum; +import org.apache.streampark.console.core.enums.EngineTypeEnum; +import org.apache.streampark.console.core.enums.FlinkAppStateEnum; +import org.apache.streampark.console.core.enums.OperationEnum; +import org.apache.streampark.console.core.enums.OptionStateEnum; +import org.apache.streampark.console.core.enums.ReleaseStateEnum; import org.apache.streampark.console.core.mapper.FlinkApplicationMapper; +import org.apache.streampark.console.core.service.DistributedTaskService; +import org.apache.streampark.console.core.service.FlinkClusterService; +import org.apache.streampark.console.core.service.FlinkEnvService; +import org.apache.streampark.console.core.service.FlinkSqlService; +import org.apache.streampark.console.core.service.ResourceService; +import org.apache.streampark.console.core.service.SavepointService; +import org.apache.streampark.console.core.service.SettingService; +import org.apache.streampark.console.core.service.VariableService; +import org.apache.streampark.console.core.service.application.ApplicationLogService; +import org.apache.streampark.console.core.service.application.FlinkApplicationActionService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBackupService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBuildPipelineService; +import org.apache.streampark.console.core.service.application.FlinkApplicationConfigService; +import org.apache.streampark.console.core.service.application.FlinkApplicationInfoService; +import org.apache.streampark.console.core.service.application.FlinkApplicationManageService; import org.apache.streampark.console.core.util.ServiceHelper; import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.console.core.watcher.FlinkClusterWatcher; @@ -69,6 +113,13 @@ import java.io.File; import java.net.URI; +import java.util.Date; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java index 1e468694f3..f930fb3cc3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java @@ -19,7 +19,6 @@ import org.apache.streampark.common.conf.Workspace; import org.apache.streampark.common.constants.Constants; -import org.apache.streampark.common.enums.ApplicationType; import org.apache.streampark.common.enums.FlinkDeployMode; import org.apache.streampark.common.enums.FlinkJobType; import org.apache.streampark.common.fs.FsOperator; @@ -31,12 +30,52 @@ import org.apache.streampark.console.base.util.WebUtils; import org.apache.streampark.console.core.bean.Dependency; import org.apache.streampark.console.core.bean.DockerConfig; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; +import org.apache.streampark.console.core.entity.ApplicationLog; +import org.apache.streampark.console.core.entity.FlinkApplication; +import org.apache.streampark.console.core.entity.FlinkApplicationConfig; +import org.apache.streampark.console.core.entity.FlinkEnv; +import org.apache.streampark.console.core.entity.FlinkSql; +import org.apache.streampark.console.core.entity.Message; +import org.apache.streampark.console.core.entity.Resource; +import org.apache.streampark.console.core.enums.CandidateTypeEnum; +import org.apache.streampark.console.core.enums.NoticeTypeEnum; +import org.apache.streampark.console.core.enums.OptionStateEnum; +import org.apache.streampark.console.core.enums.ReleaseStateEnum; +import org.apache.streampark.console.core.enums.ResourceTypeEnum; import org.apache.streampark.console.core.mapper.ApplicationBuildPipelineMapper; +import org.apache.streampark.console.core.service.FlinkEnvService; +import org.apache.streampark.console.core.service.FlinkSqlService; +import org.apache.streampark.console.core.service.MessageService; +import org.apache.streampark.console.core.service.ResourceService; +import org.apache.streampark.console.core.service.SettingService; +import org.apache.streampark.console.core.service.application.ApplicationLogService; +import org.apache.streampark.console.core.service.application.FlinkApplicationActionService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBackupService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBuildPipelineService; +import org.apache.streampark.console.core.service.application.FlinkApplicationConfigService; +import org.apache.streampark.console.core.service.application.FlinkApplicationInfoService; +import org.apache.streampark.console.core.service.application.FlinkApplicationManageService; import org.apache.streampark.console.core.util.ServiceHelper; import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.flink.packer.docker.DockerConf; import org.apache.streampark.flink.packer.maven.Artifact; import org.apache.streampark.flink.packer.maven.DependencyInfo; +import org.apache.streampark.flink.packer.pipeline.BuildPipeline; +import org.apache.streampark.flink.packer.pipeline.BuildResult; +import org.apache.streampark.flink.packer.pipeline.DockerBuildSnapshot; +import org.apache.streampark.flink.packer.pipeline.DockerProgressWatcher; +import org.apache.streampark.flink.packer.pipeline.DockerPullSnapshot; +import org.apache.streampark.flink.packer.pipeline.DockerPushSnapshot; +import org.apache.streampark.flink.packer.pipeline.DockerResolvedSnapshot; +import org.apache.streampark.flink.packer.pipeline.FlinkK8sApplicationBuildRequest; +import org.apache.streampark.flink.packer.pipeline.FlinkK8sSessionBuildRequest; +import org.apache.streampark.flink.packer.pipeline.FlinkRemotePerJobBuildRequest; +import org.apache.streampark.flink.packer.pipeline.FlinkYarnApplicationBuildRequest; +import org.apache.streampark.flink.packer.pipeline.PipeWatcher; +import org.apache.streampark.flink.packer.pipeline.PipelineSnapshot; +import org.apache.streampark.flink.packer.pipeline.PipelineStatusEnum; +import org.apache.streampark.flink.packer.pipeline.PipelineTypeEnum; import org.apache.streampark.flink.packer.pipeline.impl.FlinkK8sApplicationBuildPipeline; import org.apache.streampark.flink.packer.pipeline.impl.FlinkK8sSessionBuildPipeline; import org.apache.streampark.flink.packer.pipeline.impl.FlinkRemoteBuildPipeline; @@ -59,10 +98,18 @@ import javax.annotation.Nonnull; import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import static org.apache.streampark.common.enums.ApplicationType.APACHE_FLINK; import static org.apache.streampark.console.core.enums.OperationEnum.RELEASE; @Service @@ -415,13 +462,13 @@ private BuildPipeline createPipelineInstance(@Nonnull FlinkApplication app) { } FlinkDeployMode deployModeEnum = app.getDeployModeEnum(); - String mainClass = app.getMainClass(); + String mainClass = Constants.STREAMPARK_FLINKSQL_CLIENT_CLASS; switch (deployModeEnum) { case YARN_APPLICATION: String yarnProvidedPath = app.getAppLib(); String localWorkspace = app.getLocalAppHome().concat("/lib"); if (FlinkJobType.CUSTOM_CODE == app.getJobTypeEnum() - && ApplicationType.APACHE_FLINK == app.getApplicationType()) { + && APACHE_FLINK == app.getApplicationType()) { yarnProvidedPath = app.getAppHome(); localWorkspace = app.getLocalAppHome(); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java index 2972b3851e..f1bba8c614 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationManageServiceImpl.java @@ -29,7 +29,33 @@ import org.apache.streampark.console.base.util.ObjectUtils; import org.apache.streampark.console.base.util.WebUtils; import org.apache.streampark.console.core.bean.AppControl; +import org.apache.streampark.console.core.entity.Application; +import org.apache.streampark.console.core.entity.FlinkApplication; +import org.apache.streampark.console.core.entity.FlinkApplicationConfig; +import org.apache.streampark.console.core.entity.FlinkCluster; +import org.apache.streampark.console.core.entity.FlinkSql; +import org.apache.streampark.console.core.entity.Resource; +import org.apache.streampark.console.core.enums.CandidateTypeEnum; +import org.apache.streampark.console.core.enums.ChangeTypeEnum; +import org.apache.streampark.console.core.enums.EngineTypeEnum; +import org.apache.streampark.console.core.enums.FlinkAppStateEnum; +import org.apache.streampark.console.core.enums.OptionStateEnum; +import org.apache.streampark.console.core.enums.ReleaseStateEnum; import org.apache.streampark.console.core.mapper.FlinkApplicationMapper; +import org.apache.streampark.console.core.service.FlinkClusterService; +import org.apache.streampark.console.core.service.FlinkEffectiveService; +import org.apache.streampark.console.core.service.FlinkSqlService; +import org.apache.streampark.console.core.service.ProjectService; +import org.apache.streampark.console.core.service.ResourceService; +import org.apache.streampark.console.core.service.SavepointService; +import org.apache.streampark.console.core.service.SettingService; +import org.apache.streampark.console.core.service.YarnQueueService; +import org.apache.streampark.console.core.service.application.ApplicationLogService; +import org.apache.streampark.console.core.service.application.ApplicationService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBackupService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBuildPipelineService; +import org.apache.streampark.console.core.service.application.FlinkApplicationConfigService; +import org.apache.streampark.console.core.service.application.FlinkApplicationManageService; import org.apache.streampark.console.core.util.ServiceHelper; import org.apache.streampark.console.core.watcher.FlinkAppHttpWatcher; import org.apache.streampark.console.core.watcher.FlinkClusterWatcher; @@ -58,6 +84,12 @@ import java.io.File; import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java index fc78401175..50afd47498 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSavepointServiceImpl.java @@ -25,6 +25,12 @@ import org.apache.streampark.console.base.exception.ApiAlertException; import org.apache.streampark.console.base.exception.InternalException; import org.apache.streampark.console.base.mybatis.pager.MybatisPager; +import org.apache.streampark.console.core.entity.ApplicationLog; +import org.apache.streampark.console.core.entity.FlinkApplication; +import org.apache.streampark.console.core.entity.FlinkApplicationConfig; +import org.apache.streampark.console.core.entity.FlinkCluster; +import org.apache.streampark.console.core.entity.FlinkEnv; +import org.apache.streampark.console.core.entity.FlinkSavepoint; import org.apache.streampark.console.core.enums.CheckPointTypeEnum; import org.apache.streampark.console.core.enums.EngineTypeEnum; import org.apache.streampark.console.core.enums.OperationEnum;