From d43574679955016d873a643868b9a84cde03bb8e Mon Sep 17 00:00:00 2001 From: benjobs Date: Thu, 3 Oct 2024 09:02:55 +0800 Subject: [PATCH] [Improve] AppBuildPile class name rename to ApplicationBuildPipeline (#4105) * [Improve] AppBuildPile class name rename to ApplicationBuildPipelint * [Improve] Word "BackUp" rename to Backup * [Improve] lombok @Data annotation improvements * [Improve] lombok.Setter import package name improvement --- .../api/ConnectStrategyProperties.java | 6 ++- .../registry/api/model/BaseHeartBeat.java | 6 ++- .../streampark/registry/api/model/Server.java | 6 ++- .../registry/core/JdbcRegistryProperties.java | 6 ++- .../model/DO/JdbcRegistryClientHeartbeat.java | 6 ++- .../core/model/DO/JdbcRegistryData.java | 6 ++- .../model/DO/JdbcRegistryDataChanceEvent.java | 6 ++- .../core/model/DO/JdbcRegistryLock.java | 6 ++- .../DTO/JdbcRegistryClientHeartbeatDTO.java | 9 ++-- .../DTO/JdbcRegistryDataChanceEventDTO.java | 6 ++- .../core/model/DTO/JdbcRegistryDataDTO.java | 6 ++- .../core/model/DTO/JdbcRegistryLockDTO.java | 6 ++- .../core/server/JdbcRegistryLockManager.java | 6 ++- .../console/base/domain/RestRequest.java | 6 ++- .../base/domain/router/RouterMeta.java | 6 ++- .../base/domain/router/RouterTree.java | 6 ++- .../console/base/domain/router/VueRouter.java | 6 ++- .../base/mybatis/entity/BaseEntity.java | 6 ++- .../console/core/bean/AlertConfigParams.java | 6 ++- .../core/bean/AlertDingTalkParams.java | 6 ++- .../console/core/bean/AlertEmailParams.java | 6 ++- .../core/bean/AlertHttpCallbackParams.java | 6 ++- .../console/core/bean/AlertLarkParams.java | 6 ++- .../core/bean/AlertLarkRobotResponse.java | 6 ++- .../console/core/bean/AlertProbeMsg.java | 6 ++- .../console/core/bean/AlertTemplate.java | 6 ++- .../console/core/bean/AlertWeComParams.java | 6 ++- .../bean/AppBuildDockerResolvedDetail.java | 18 ++++--- .../console/core/bean/AppControl.java | 6 ++- .../console/core/bean/DockerConfig.java | 6 ++- .../console/core/bean/EmailConfig.java | 6 ++- .../console/core/bean/FlinkCatalogParams.java | 15 ++++-- .../console/core/bean/FlinkConnector.java | 6 ++- .../console/core/bean/FlinkTaskItem.java | 6 ++- .../console/core/bean/MavenConfig.java | 6 ++- .../console/core/bean/MavenPom.java | 6 ++- .../console/core/bean/ResponseResult.java | 6 ++- .../console/core/bean/RobotResponse.java | 6 ++- .../console/core/bean/SparkTaskItem.java | 6 ++- .../component/FlinkCheckpointProcessor.java | 6 ++- .../console/core/config/ConsoleConfig.java | 6 ++- .../FlinkApplicationController.java | 12 ++--- ...roller.java => FlinkConfigController.java} | 2 +- ...ller.java => FlinkPipelineController.java} | 12 ++--- .../SparkApplicationController.java | 12 ++--- ...ller.java => SparkPipelineController.java} | 12 ++--- .../console/core/entity/AlertConfig.java | 6 ++- .../console/core/entity/Application.java | 6 ++- ...ine.java => ApplicationBuildPipeline.java} | 34 +++++++------ .../console/core/entity/ApplicationLog.java | 6 ++- .../console/core/entity/DistributedTask.java | 6 ++- .../console/core/entity/ExternalLink.java | 6 ++- .../console/core/entity/FlinkApplication.java | 4 +- ...ackUp.java => FlinkApplicationBackup.java} | 12 +++-- .../core/entity/FlinkApplicationConfig.java | 6 ++- .../console/core/entity/FlinkCatalog.java | 6 ++- .../console/core/entity/FlinkCluster.java | 6 ++- .../console/core/entity/FlinkEffective.java | 6 ++- .../console/core/entity/FlinkEnv.java | 6 ++- .../console/core/entity/FlinkSavepoint.java | 6 ++- .../console/core/entity/FlinkSql.java | 6 ++- .../console/core/entity/Message.java | 6 ++- .../console/core/entity/Resource.java | 6 ++- .../console/core/entity/Setting.java | 6 ++- .../console/core/entity/SparkApplication.java | 6 ++- ...ackUp.java => SparkApplicationBackup.java} | 12 +++-- .../core/entity/SparkApplicationConfig.java | 6 ++- .../console/core/entity/SparkEffective.java | 6 ++- .../console/core/entity/SparkEnv.java | 6 ++- .../console/core/entity/SparkSql.java | 6 ++- .../console/core/entity/Variable.java | 6 ++- .../console/core/entity/YarnQueue.java | 6 ++- .../ApplicationBuildPipelineMapper.java | 4 +- ...java => FlinkApplicationBackupMapper.java} | 4 +- .../mapper/SparkApplicationBackUpMapper.java | 4 +- .../core/metrics/flink/CheckPoints.java | 26 +++++++--- .../core/metrics/flink/JobsOverview.java | 12 +++-- .../console/core/metrics/flink/Overview.java | 6 ++- .../console/core/metrics/spark/Job.java | 6 ++- .../spark/SparkApplicationSummary.java | 6 ++- .../core/metrics/spark/SparkExecutor.java | 6 ++- .../core/metrics/yarn/YarnAppInfo.java | 9 ++-- .../console/core/runner/QuickStartRunner.java | 6 +-- ...ava => FlinkApplicationBackupService.java} | 14 +++--- ...FlinkApplicationBuildPipelineService.java} | 6 +-- ... SparkAplicationBuildPipelineService.java} | 6 +-- ...ava => SparkApplicationBackupService.java} | 14 +++--- .../FlinkApplicationActionServiceImpl.java | 12 ++--- ...=> FlinkApplicationBackupServiceImpl.java} | 50 +++++++++---------- ...kApplicationBuildPipelineServiceImpl.java} | 39 ++++++++------- .../FlinkApplicationManageServiceImpl.java | 8 +-- .../SparkApplicationActionServiceImpl.java | 8 +-- ...=> SparkApplicationBackupServiceImpl.java} | 48 +++++++++--------- ...kApplicationBuildPipelineServiceImpl.java} | 35 ++++++------- .../SparkApplicationManageServiceImpl.java | 8 +-- .../service/impl/FlinkSqlServiceImpl.java | 4 +- .../service/impl/SparkSqlServiceImpl.java | 4 +- .../core/task/ApplicationBackUpCleanTask.java | 14 +++--- .../console/system/entity/AccessToken.java | 6 ++- .../console/system/entity/Member.java | 6 ++- .../console/system/entity/Menu.java | 6 ++- .../console/system/entity/Role.java | 6 ++- .../console/system/entity/RoleMenu.java | 6 ++- .../console/system/entity/Team.java | 6 ++- .../console/system/entity/User.java | 6 ++- 105 files changed, 551 insertions(+), 364 deletions(-) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/{ConfigController.java => FlinkConfigController.java} (98%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/{FlinkBuildPipelineController.java => FlinkPipelineController.java} (85%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/{SparkBuildPipelineController.java => SparkPipelineController.java} (86%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/{AppBuildPipeline.java => ApplicationBuildPipeline.java} (91%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/{FlinkApplicationBackUp.java => FlinkApplicationBackup.java} (93%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/{SparkApplicationBackUp.java => SparkApplicationBackup.java} (92%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/{FlinkApplicationBackUpMapper.java => FlinkApplicationBackupMapper.java} (90%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/{FlinkApplicationBackUpService.java => FlinkApplicationBackupService.java} (89%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/{AppBuildPipeService.java => FlinkApplicationBuildPipelineService.java} (91%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/{SparkAppBuildPipeService.java => SparkAplicationBuildPipelineService.java} (90%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/{SparkApplicationBackUpService.java => SparkApplicationBackupService.java} (89%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/{FlinkApplicationBackUpServiceImpl.java => FlinkApplicationBackupServiceImpl.java} (83%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/{FlinkAppBuildPipeServiceImpl.java => FlinkApplicationBuildPipelineServiceImpl.java} (95%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/{SparkApplicationBackUpServiceImpl.java => SparkApplicationBackupServiceImpl.java} (84%) rename streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/{SparkAppBuildPipeServiceImpl.java => SparkApplicationBuildPipelineServiceImpl.java} (94%) diff --git a/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/ConnectStrategyProperties.java b/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/ConnectStrategyProperties.java index 8f8a6aac9e..30a384a78c 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/ConnectStrategyProperties.java +++ b/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/ConnectStrategyProperties.java @@ -17,11 +17,13 @@ package org.apache.streampark.registry.api; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.time.Duration; -@Data +@Getter +@Setter public class ConnectStrategyProperties { private StrategyType strategy = StrategyType.STOP; diff --git a/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/BaseHeartBeat.java b/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/BaseHeartBeat.java index a93be10603..ca9c98fab4 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/BaseHeartBeat.java +++ b/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/BaseHeartBeat.java @@ -20,11 +20,13 @@ import org.apache.streampark.registry.api.enums.ServerStatusEnum; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.SuperBuilder; -@Data +@Getter +@Setter @SuperBuilder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/Server.java b/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/Server.java index 0bdcbc5fcb..2571169fae 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/Server.java +++ b/streampark-console/streampark-console-registry/streampark-registry-api/src/main/java/org/apache/streampark/registry/api/model/Server.java @@ -17,11 +17,13 @@ package org.apache.streampark.registry.api.model; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.Date; -@Data +@Getter +@Setter public class Server { private int id; diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/JdbcRegistryProperties.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/JdbcRegistryProperties.java index e7ed5baa69..16bd4de88b 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/JdbcRegistryProperties.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/JdbcRegistryProperties.java @@ -22,7 +22,8 @@ import org.apache.commons.lang3.StringUtils; import com.zaxxer.hikari.HikariConfig; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -35,7 +36,8 @@ import java.time.Duration; -@Data +@Getter +@Setter @Slf4j @Validated @Configuration diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryClientHeartbeat.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryClientHeartbeat.java index 018a867ded..3875acab8e 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryClientHeartbeat.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryClientHeartbeat.java @@ -22,13 +22,15 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Date; @TableName(value = "t_jdbc_registry_client_heartbeat") -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryData.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryData.java index 8a363aec2d..29e3c8810b 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryData.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryData.java @@ -22,13 +22,15 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Date; @TableName(value = "t_jdbc_registry_data") -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryDataChanceEvent.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryDataChanceEvent.java index 4ebce10e57..8088a3bb4a 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryDataChanceEvent.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryDataChanceEvent.java @@ -22,13 +22,15 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Date; @TableName(value = "t_jdbc_registry_data_change_event") -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryLock.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryLock.java index 19dd87321e..f77783c011 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryLock.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DO/JdbcRegistryLock.java @@ -22,13 +22,15 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Date; @TableName(value = "t_jdbc_registry_lock") -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java index 98957864db..462ba92f9b 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryClientHeartbeatDTO.java @@ -22,13 +22,15 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.SneakyThrows; import java.util.Date; -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor @@ -83,7 +85,8 @@ public JdbcRegistryClientHeartbeatDTO clone() { .build(); } - @Data + @Getter + @Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java index 721ff66d85..8803e83fcb 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataChanceEventDTO.java @@ -23,12 +23,14 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Date; -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataDTO.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataDTO.java index 85d3eb6856..06df011a7c 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataDTO.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryDataDTO.java @@ -21,12 +21,14 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Date; -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryLockDTO.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryLockDTO.java index 0404d632a7..e274f52ecd 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryLockDTO.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/model/DTO/JdbcRegistryLockDTO.java @@ -21,12 +21,14 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Date; -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/server/JdbcRegistryLockManager.java b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/server/JdbcRegistryLockManager.java index 0a9ce84d2c..ec0392f3af 100644 --- a/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/server/JdbcRegistryLockManager.java +++ b/streampark-console/streampark-console-registry/streampark-registry-core/src/main/java/org/apache/streampark/registry/core/server/JdbcRegistryLockManager.java @@ -25,8 +25,9 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.dao.DuplicateKeyException; @@ -135,7 +136,8 @@ public void releaseJdbcRegistryLock(Long clientId, String lockKey) { jdbcRegistryLockHolderMap.remove(lockKey); } - @Data + @Getter + @Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java index eaa0d912da..94cd686386 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/RestRequest.java @@ -17,11 +17,13 @@ package org.apache.streampark.console.base.domain; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; -@Data +@Getter +@Setter public class RestRequest implements Serializable { private static final long serialVersionUID = 1L; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterMeta.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterMeta.java index 5d5d752bbc..c8203da9a1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterMeta.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterMeta.java @@ -19,12 +19,14 @@ import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; /** Vue Router Meta */ -@Data +@Getter +@Setter @AllArgsConstructor @JsonInclude(JsonInclude.Include.NON_NULL) public class RouterMeta implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterTree.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterTree.java index de51493211..3d65742db8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterTree.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/RouterTree.java @@ -20,13 +20,15 @@ import org.apache.streampark.console.system.entity.Menu; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.ArrayList; import java.util.Date; import java.util.List; -@Data +@Getter +@Setter @JsonInclude(JsonInclude.Include.NON_NULL) public class RouterTree { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/VueRouter.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/VueRouter.java index 7aa9d5cf0d..38c2820425 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/VueRouter.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/domain/router/VueRouter.java @@ -19,14 +19,16 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; import java.util.ArrayList; import java.util.List; /** Build Vue Router */ -@Data +@Getter +@Setter @JsonInclude(JsonInclude.Include.NON_NULL) public class VueRouter implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/entity/BaseEntity.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/entity/BaseEntity.java index 787734a2b1..5c386c2f62 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/entity/BaseEntity.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/mybatis/entity/BaseEntity.java @@ -19,13 +19,15 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; import java.util.Date; /** Base entity. */ -@Data +@Getter +@Setter public abstract class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java index 9494df36aa..0b34f56bd3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertConfigParams.java @@ -23,13 +23,15 @@ import org.apache.commons.lang3.StringUtils; import com.fasterxml.jackson.core.JsonProcessingException; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import java.io.Serializable; -@Data +@Getter +@Setter @Slf4j public class AlertConfigParams implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertDingTalkParams.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertDingTalkParams.java index c236305a24..08e9706334 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertDingTalkParams.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertDingTalkParams.java @@ -18,13 +18,15 @@ package org.apache.streampark.console.core.bean; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import java.io.Serializable; -@Data +@Getter +@Setter @JsonIgnoreProperties(ignoreUnknown = true) public class AlertDingTalkParams implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertEmailParams.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertEmailParams.java index e7d666140a..c576c5f157 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertEmailParams.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertEmailParams.java @@ -18,13 +18,15 @@ package org.apache.streampark.console.core.bean; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import java.io.Serializable; -@Data +@Getter +@Setter @JsonIgnoreProperties(ignoreUnknown = true) public class AlertEmailParams implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertHttpCallbackParams.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertHttpCallbackParams.java index fcc78cd71a..4a9c66f72c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertHttpCallbackParams.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertHttpCallbackParams.java @@ -18,13 +18,15 @@ package org.apache.streampark.console.core.bean; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import java.io.Serializable; -@Data +@Getter +@Setter @JsonIgnoreProperties(ignoreUnknown = true) public class AlertHttpCallbackParams implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkParams.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkParams.java index ff50a46aa5..6a6a18b84c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkParams.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkParams.java @@ -18,13 +18,15 @@ package org.apache.streampark.console.core.bean; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import java.io.Serializable; -@Data +@Getter +@Setter @JsonIgnoreProperties(ignoreUnknown = true) public class AlertLarkParams implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkRobotResponse.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkRobotResponse.java index 26ede3aca0..c08d4f6c76 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkRobotResponse.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertLarkRobotResponse.java @@ -18,11 +18,13 @@ package org.apache.streampark.console.core.bean; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; @NoArgsConstructor -@Data +@Getter +@Setter public class AlertLarkRobotResponse { @JsonProperty("Extra") diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertProbeMsg.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertProbeMsg.java index 8fdb93c887..ab6516f5c2 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertProbeMsg.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertProbeMsg.java @@ -19,13 +19,15 @@ import org.apache.streampark.console.core.enums.FlinkAppStateEnum; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.util.Set; @NoArgsConstructor -@Data +@Getter +@Setter public class AlertProbeMsg { private Set alertId; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java index 2dec8a1bf2..697dc15261 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertTemplate.java @@ -24,14 +24,16 @@ import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import java.io.Serializable; import java.util.Date; import java.util.TimeZone; -@Data +@Getter +@Setter @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertWeComParams.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertWeComParams.java index 8e3c20fdbc..7c255027ef 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertWeComParams.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AlertWeComParams.java @@ -18,13 +18,15 @@ package org.apache.streampark.console.core.bean; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import java.io.Serializable; -@Data +@Getter +@Setter @JsonIgnoreProperties(ignoreUnknown = true) public class AlertWeComParams implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppBuildDockerResolvedDetail.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppBuildDockerResolvedDetail.java index a6456def66..2d8506b41c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppBuildDockerResolvedDetail.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppBuildDockerResolvedDetail.java @@ -22,7 +22,8 @@ import org.apache.streampark.flink.packer.pipeline.DockerPushSnapshot; import org.apache.streampark.flink.packer.pipeline.DockerResolvedSnapshot; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.experimental.Accessors; import javax.annotation.Nullable; @@ -33,7 +34,8 @@ import java.util.stream.Collectors; /** View for DockerResolveProgress */ -@Data +@Getter +@Setter @Accessors(chain = true) public class AppBuildDockerResolvedDetail { @@ -55,7 +57,8 @@ public static AppBuildDockerResolvedDetail of(@Nullable DockerResolvedSnapshot s .setPush(ImagePush.of(snapshot.push())); } - @Data + @Getter + @Setter @Accessors(chain = true) public static class ImagePull { @@ -83,7 +86,8 @@ public static ImagePull of(DockerPullSnapshot snapshot) { } } - @Data + @Getter + @Setter @Accessors(chain = true) public static class ImageBuild { @@ -104,7 +108,8 @@ public static ImageBuild of(DockerBuildSnapshot snapshot) { } } - @Data + @Getter + @Setter @Accessors(chain = true) public static class ImagePush { @@ -132,7 +137,8 @@ public static ImagePush of(DockerPushSnapshot snapshot) { } } - @Data + @Getter + @Setter @Accessors(chain = true) public static class ImageLayer { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppControl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppControl.java index 289768412d..d85db72a96 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppControl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/AppControl.java @@ -17,10 +17,12 @@ package org.apache.streampark.console.core.bean; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.experimental.Accessors; -@Data +@Getter +@Setter @Accessors(chain = true) public class AppControl { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/DockerConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/DockerConfig.java index c802f99c7c..e0deb0ed94 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/DockerConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/DockerConfig.java @@ -20,7 +20,8 @@ import org.apache.streampark.console.core.entity.Setting; import org.apache.streampark.console.core.service.SettingService; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.Arrays; @@ -33,7 +34,8 @@ *

This class also provides a static factory method to create an DockerConfig object from a map * of settings. */ -@Data +@Getter +@Setter @Slf4j public class DockerConfig { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java index 64e506221a..484c735954 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/EmailConfig.java @@ -19,7 +19,8 @@ import org.apache.streampark.console.core.service.SettingService; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; /** @@ -29,7 +30,8 @@ *

This class also provides a static factory method to create an EmailConfig object from a map of * settings. */ -@Data +@Getter +@Setter @Slf4j public class EmailConfig { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkCatalogParams.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkCatalogParams.java index cb12ad4c5f..e1ea94d253 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkCatalogParams.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkCatalogParams.java @@ -23,7 +23,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -32,7 +33,8 @@ import java.io.Serializable; import java.util.Date; -@Data +@Getter +@Setter @Slf4j public class FlinkCatalogParams implements Serializable { @@ -94,7 +96,8 @@ public static FlinkCatalogParams of(FlinkCatalog flinkCatalog) { return flinkCatalogParams; } - @Data + @Getter + @Setter public static class FlinkJDBCCatalog implements Serializable { @NotBlank @@ -114,7 +117,8 @@ public static class FlinkJDBCCatalog implements Serializable { private String baseUrl; } - @Data + @Getter + @Setter public static class FlinkHiveCatalog implements Serializable { @NotBlank @@ -173,7 +177,8 @@ public void setHadoopConfDir(String hadoopConfDir) { } } - @Data + @Getter + @Setter public static class FlinkPaimonCatalog implements Serializable { @NotBlank diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnector.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnector.java index 99989fa5ce..5bc388779c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnector.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkConnector.java @@ -17,11 +17,13 @@ package org.apache.streampark.console.core.bean; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.Map; -@Data +@Getter +@Setter public class FlinkConnector { private String className; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkTaskItem.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkTaskItem.java index c99cebc720..3f742aaffa 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkTaskItem.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/FlinkTaskItem.java @@ -17,11 +17,13 @@ package org.apache.streampark.console.core.bean; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; -@Data +@Getter +@Setter public class FlinkTaskItem implements Serializable { /** appId */ diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java index 702036711e..058dc2785c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenConfig.java @@ -24,7 +24,8 @@ import org.apache.commons.lang3.StringUtils; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.Map; @@ -32,7 +33,8 @@ * This class represents the Maven configuration for the application. It provides methods to * retrieve the various Maven configuration options. */ -@Data +@Getter +@Setter public class MavenConfig { /** File path for Maven settings. */ diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java index c83abf6f0d..e10e80e6ef 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/MavenPom.java @@ -19,11 +19,13 @@ import org.apache.commons.lang3.StringUtils; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.Objects; -@Data +@Getter +@Setter public class MavenPom { private String groupId; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/ResponseResult.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/ResponseResult.java index 13ed4a991c..8e6281a2d2 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/ResponseResult.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/ResponseResult.java @@ -17,9 +17,11 @@ package org.apache.streampark.console.core.bean; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter public class ResponseResult { private int status; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/RobotResponse.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/RobotResponse.java index d76e996b51..f26b80da61 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/RobotResponse.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/RobotResponse.java @@ -17,10 +17,12 @@ package org.apache.streampark.console.core.bean; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; /** The robot alarm response of DingTalk And WeCom */ -@Data +@Getter +@Setter public class RobotResponse { private Integer errcode; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/SparkTaskItem.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/SparkTaskItem.java index c681a7f8c8..78aaf79337 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/SparkTaskItem.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/bean/SparkTaskItem.java @@ -17,11 +17,13 @@ package org.apache.streampark.console.core.bean; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; -@Data +@Getter +@Setter public class SparkTaskItem implements Serializable { /** appId */ diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java index 081440f0a3..f9deeccd8e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/component/FlinkCheckpointProcessor.java @@ -31,7 +31,8 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -219,7 +220,8 @@ public long getDuration(Long currentTimestamp) { } /** Util class for checkpoint key. */ - @Data + @Getter + @Setter public static class CheckPointKey { private Long appId; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/config/ConsoleConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/config/ConsoleConfig.java index 1b0bf03adb..6f17c038c7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/config/ConsoleConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/config/ConsoleConfig.java @@ -23,7 +23,8 @@ import org.apache.commons.lang3.StringUtils; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -34,7 +35,8 @@ import java.time.Duration; -@Data +@Getter +@Setter @Validated @Configuration @ConfigurationProperties(prefix = "server") diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkApplicationController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkApplicationController.java index 8474cf698f..e9de555f3e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkApplicationController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkApplicationController.java @@ -26,12 +26,12 @@ import org.apache.streampark.console.core.annotation.Permission; import org.apache.streampark.console.core.entity.ApplicationLog; import org.apache.streampark.console.core.entity.FlinkApplication; -import org.apache.streampark.console.core.entity.FlinkApplicationBackUp; +import org.apache.streampark.console.core.entity.FlinkApplicationBackup; import org.apache.streampark.console.core.enums.AppExistsStateEnum; import org.apache.streampark.console.core.service.ResourceService; 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.FlinkApplicationBackupService; import org.apache.streampark.console.core.service.application.FlinkApplicationInfoService; import org.apache.streampark.console.core.service.application.FlinkApplicationManageService; @@ -67,7 +67,7 @@ public class FlinkApplicationController { private FlinkApplicationInfoService applicationInfoService; @Autowired - private FlinkApplicationBackUpService backUpService; + private FlinkApplicationBackupService backUpService; @Autowired private ApplicationLogService applicationLogService; @@ -208,8 +208,8 @@ public RestResponse getMain(FlinkApplication application) { @PostMapping("backups") @Permission(app = "#backUp.appId", team = "#backUp.teamId") - public RestResponse backups(FlinkApplicationBackUp backUp, RestRequest request) { - IPage backups = backUpService.getPage(backUp, request); + public RestResponse backups(FlinkApplicationBackup backUp, RestRequest request) { + IPage backups = backUpService.getPage(backUp, request); return RestResponse.success(backups); } @@ -238,7 +238,7 @@ public RestResponse delete(FlinkApplication app) throws InternalException { @Permission(app = "#backUp.appId") @PostMapping("delete/backup") - public RestResponse deleteBackup(FlinkApplicationBackUp backUp) throws InternalException { + public RestResponse deleteBackup(FlinkApplicationBackup backUp) throws InternalException { Boolean deleted = backUpService.removeById(backUp.getId()); return RestResponse.success(deleted); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkConfigController.java similarity index 98% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkConfigController.java index 7622e92f28..3d0edb57a3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/ConfigController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkConfigController.java @@ -42,7 +42,7 @@ @Validated @RestController @RequestMapping("flink/conf") -public class ConfigController { +public class FlinkConfigController { @Autowired private FlinkApplicationConfigService applicationConfigService; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkBuildPipelineController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPipelineController.java similarity index 85% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkBuildPipelineController.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPipelineController.java index 04f0d420e8..b4e4aa2d51 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkBuildPipelineController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/FlinkPipelineController.java @@ -20,8 +20,8 @@ import org.apache.streampark.console.base.domain.RestResponse; import org.apache.streampark.console.core.annotation.Permission; import org.apache.streampark.console.core.bean.AppBuildDockerResolvedDetail; -import org.apache.streampark.console.core.entity.AppBuildPipeline; -import org.apache.streampark.console.core.service.application.AppBuildPipeService; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; +import org.apache.streampark.console.core.service.application.FlinkApplicationBuildPipelineService; import org.apache.streampark.flink.packer.pipeline.DockerResolvedSnapshot; import org.apache.streampark.flink.packer.pipeline.PipelineTypeEnum; @@ -42,10 +42,10 @@ @Validated @RestController @RequestMapping("flink/pipe") -public class FlinkBuildPipelineController { +public class FlinkPipelineController { @Autowired - private AppBuildPipeService appBuildPipeService; + private FlinkApplicationBuildPipelineService appBuildPipeService; @Permission(app = "#appId") @PostMapping("build") @@ -66,8 +66,8 @@ public RestResponse buildApplication(Long appId, boolean forceBuild) throws Exce @RequiresPermissions("app:view") public RestResponse getBuildProgressDetail(Long appId) { Map details = new HashMap<>(0); - Optional pipeline = appBuildPipeService.getCurrentBuildPipeline(appId); - details.put("pipeline", pipeline.map(AppBuildPipeline::toView).orElse(null)); + Optional pipeline = appBuildPipeService.getCurrentBuildPipeline(appId); + details.put("pipeline", pipeline.map(ApplicationBuildPipeline::toView).orElse(null)); if (pipeline.isPresent() && PipelineTypeEnum.FLINK_NATIVE_K8S_APPLICATION == pipeline.get().getPipeType()) { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkApplicationController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkApplicationController.java index e0849291f6..0d9e87d4a4 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkApplicationController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkApplicationController.java @@ -24,12 +24,12 @@ import org.apache.streampark.console.base.exception.InternalException; import org.apache.streampark.console.core.annotation.AppChangeEvent; import org.apache.streampark.console.core.entity.ApplicationLog; -import org.apache.streampark.console.core.entity.FlinkApplicationBackUp; +import org.apache.streampark.console.core.entity.FlinkApplicationBackup; import org.apache.streampark.console.core.entity.SparkApplication; import org.apache.streampark.console.core.enums.AppExistsStateEnum; import org.apache.streampark.console.core.service.ResourceService; import org.apache.streampark.console.core.service.application.ApplicationLogService; -import org.apache.streampark.console.core.service.application.FlinkApplicationBackUpService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBackupService; import org.apache.streampark.console.core.service.application.SparkApplicationActionService; import org.apache.streampark.console.core.service.application.SparkApplicationInfoService; import org.apache.streampark.console.core.service.application.SparkApplicationManageService; @@ -66,7 +66,7 @@ public class SparkApplicationController { private SparkApplicationInfoService applicationInfoService; @Autowired - private FlinkApplicationBackUpService backUpService; + private FlinkApplicationBackupService backUpService; @Autowired private ApplicationLogService applicationLogService; @@ -196,8 +196,8 @@ public RestResponse readConf(SparkApplication app) throws IOException { } @PostMapping("backups") - public RestResponse backups(FlinkApplicationBackUp backUp, RestRequest request) { - IPage backups = backUpService.getPage(backUp, request); + public RestResponse backups(FlinkApplicationBackup backUp, RestRequest request) { + IPage backups = backUpService.getPage(backUp, request); return RestResponse.success(backups); } @@ -222,7 +222,7 @@ public RestResponse delete(SparkApplication app) throws InternalException { } @PostMapping("delete/bak") - public RestResponse deleteBak(FlinkApplicationBackUp backUp) throws InternalException { + public RestResponse deleteBak(FlinkApplicationBackup backUp) throws InternalException { Boolean deleted = backUpService.removeById(backUp.getId()); return RestResponse.success(deleted); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkBuildPipelineController.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkPipelineController.java similarity index 86% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkBuildPipelineController.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkPipelineController.java index 2efc0668b0..a04fbc0156 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkBuildPipelineController.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/controller/SparkPipelineController.java @@ -19,8 +19,8 @@ import org.apache.streampark.console.base.domain.RestResponse; import org.apache.streampark.console.core.annotation.Permission; -import org.apache.streampark.console.core.entity.AppBuildPipeline; -import org.apache.streampark.console.core.service.application.SparkAppBuildPipeService; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; +import org.apache.streampark.console.core.service.application.SparkAplicationBuildPipelineService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -39,10 +39,10 @@ @Validated @RestController @RequestMapping("spark/pipe") -public class SparkBuildPipelineController { +public class SparkPipelineController { @Autowired - private SparkAppBuildPipeService appBuildPipeService; + private SparkAplicationBuildPipelineService appBuildPipeService; /** * Release application building pipeline. @@ -74,8 +74,8 @@ public RestResponse buildApplication(Long appId, boolean forceBuild) { @Permission(app = "#appId") public RestResponse getBuildProgressDetail(Long appId) { Map details = new HashMap<>(0); - Optional pipeline = appBuildPipeService.getCurrentBuildPipeline(appId); - details.put("pipeline", pipeline.map(AppBuildPipeline::toView).orElse(null)); + Optional pipeline = appBuildPipeService.getCurrentBuildPipeline(appId); + details.put("pipeline", pipeline.map(ApplicationBuildPipeline::toView).orElse(null)); return RestResponse.success(details); } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java index 993a582b8d..00c857bc2b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AlertConfig.java @@ -25,12 +25,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.core.JsonProcessingException; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_alert_config") @Slf4j diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java index 6239fa2a80..9d5e9862c5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Application.java @@ -20,13 +20,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.io.Serializable; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_app") @Slf4j public class Application implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AppBuildPipeline.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationBuildPipeline.java similarity index 91% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AppBuildPipeline.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationBuildPipeline.java index 8d9c983bf1..a8bd2df79d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/AppBuildPipeline.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationBuildPipeline.java @@ -37,8 +37,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; @@ -57,12 +58,13 @@ * corresponding ApplicationBuildPipeline record. */ @TableName("t_app_build_pipe") -@Data +@Getter +@Setter @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor @Slf4j -public class AppBuildPipeline { +public class ApplicationBuildPipeline { @TableId(type = IdType.INPUT) private Long appId; @@ -100,7 +102,7 @@ public PipelineTypeEnum getPipeType() { } @JsonIgnore - public AppBuildPipeline setPipeType(@Nonnull PipelineTypeEnum pipeType) { + public ApplicationBuildPipeline setPipeType(@Nonnull PipelineTypeEnum pipeType) { this.pipeTypeCode = pipeType.getCode(); return this; } @@ -112,7 +114,7 @@ public PipelineStatusEnum getPipelineStatus() { } @JsonIgnore - public AppBuildPipeline setPipeStatus(@Nonnull PipelineStatusEnum pipeStatus) { + public ApplicationBuildPipeline setPipeStatus(@Nonnull PipelineStatusEnum pipeStatus) { this.pipeStatusCode = pipeStatus.getCode(); return this; } @@ -135,7 +137,7 @@ public Map getStepStatus() { } @JsonIgnore - public AppBuildPipeline setStepStatus(@Nonnull Map stepStatus) { + public ApplicationBuildPipeline setStepStatus(@Nonnull Map stepStatus) { try { this.stepStatusJson = JacksonUtils.write(stepStatus); } catch (JsonProcessingException e) { @@ -169,7 +171,7 @@ public Map getStepStatusTimestamp() { } @JsonIgnore - public AppBuildPipeline setStepStatusTimestamp(@Nonnull Map stepStatusSt) { + public ApplicationBuildPipeline setStepStatusTimestamp(@Nonnull Map stepStatusSt) { try { this.stepStatusTimestampJson = JacksonUtils.write(stepStatusSt); } catch (JsonProcessingException e) { @@ -198,7 +200,7 @@ public PipeError getError() { } @JsonIgnore - public AppBuildPipeline setError(@Nonnull PipeError error) { + public ApplicationBuildPipeline setError(@Nonnull PipeError error) { try { this.errorJson = JacksonUtils.write(error); } catch (JsonProcessingException e) { @@ -208,7 +210,7 @@ public AppBuildPipeline setError(@Nonnull PipeError error) { } @JsonIgnore - public AppBuildPipeline setBuildResult(@Nonnull R result) { + public ApplicationBuildPipeline setBuildResult(@Nonnull R result) { try { this.buildResultJson = JacksonUtils.write(result); } catch (JsonProcessingException e) { @@ -250,13 +252,13 @@ public R getBuildResult() { } /** Initialize from BuildPipeline */ - public static AppBuildPipeline initFromPipeline(@Nonnull BuildPipeline pipeline) { + public static ApplicationBuildPipeline initFromPipeline(@Nonnull BuildPipeline pipeline) { return fromPipeSnapshot(pipeline.snapshot()); } /** Create object from PipeSnapshot */ - public static AppBuildPipeline fromPipeSnapshot(@Nonnull PipelineSnapshot snapshot) { - return new AppBuildPipeline() + public static ApplicationBuildPipeline fromPipeSnapshot(@Nonnull PipelineSnapshot snapshot) { + return new ApplicationBuildPipeline() .setPipeType(snapshot.pipeType()) .setPipeStatus(snapshot.pipeStatus()) .setTotalStep(snapshot.allSteps()) @@ -273,7 +275,8 @@ public View toView() { } /** View object of AppBuildPipeline */ - @Data + @Getter + @Setter @Accessors(chain = true) @NoArgsConstructor public static class View { @@ -291,7 +294,7 @@ public static class View { private String errorStack; private Date updateTime; - public static View of(@Nonnull AppBuildPipeline pipe) { + public static View of(@Nonnull ApplicationBuildPipeline pipe) { // combine step info Map stepDesc = pipe.getPipeType().getSteps(); Map stepStatus = pipe.getStepStatus(); @@ -329,7 +332,8 @@ public static View of(@Nonnull AppBuildPipeline pipe) { } } - @Data + @Getter + @Setter @Accessors(chain = true) @NoArgsConstructor public static class Step { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java index 574a320f17..fc217c2572 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationLog.java @@ -20,12 +20,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_app_log") @Slf4j public class ApplicationLog { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/DistributedTask.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/DistributedTask.java index 01ac7b9ccf..a70be2bd84 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/DistributedTask.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/DistributedTask.java @@ -23,12 +23,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.io.Serializable; -@Data +@Getter +@Setter @TableName("t_distributed_task") @Slf4j public class DistributedTask implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ExternalLink.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ExternalLink.java index 984d0b211f..80c4c96218 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ExternalLink.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ExternalLink.java @@ -23,12 +23,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_external_link") public class ExternalLink extends BaseEntity { 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 9182879c50..49557c51e1 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 @@ -48,7 +48,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; import lombok.Getter; import lombok.Setter; import lombok.SneakyThrows; @@ -61,7 +60,8 @@ import java.util.Objects; import java.util.Optional; -@Data +@Getter +@Setter @TableName("t_flink_app") @Slf4j public class FlinkApplication extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationBackUp.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationBackup.java similarity index 93% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationBackUp.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationBackup.java index 1376ac46fc..c30785abb0 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationBackUp.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationBackup.java @@ -22,15 +22,17 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_flink_app_backup") @Slf4j -public class FlinkApplicationBackUp { +public class FlinkApplicationBackup { @TableId(type = IdType.AUTO) private Long id; @@ -49,10 +51,10 @@ public class FlinkApplicationBackUp { private transient String teamId; - public FlinkApplicationBackUp() { + public FlinkApplicationBackup() { } - public FlinkApplicationBackUp(FlinkApplication application) { + public FlinkApplicationBackup(FlinkApplication application) { this.appId = application.getId(); this.sqlId = application.getSqlId(); this.configId = application.getConfigId(); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationConfig.java index 9b8f582513..68b953f530 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkApplicationConfig.java @@ -29,7 +29,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; @@ -40,7 +41,8 @@ import java.util.Map; import java.util.stream.Collectors; -@Data +@Getter +@Setter @TableName("t_flink_config") @Slf4j public class FlinkApplicationConfig { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCatalog.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCatalog.java index f9e2b6d412..9fdc8342c7 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCatalog.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCatalog.java @@ -27,7 +27,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.core.JsonProcessingException; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -35,7 +36,8 @@ import java.util.Date; /** catalog store */ -@Data +@Getter +@Setter @TableName("t_flink_catalog") @Slf4j public class FlinkCatalog implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java index 21c3428c14..800a6e2b2d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkCluster.java @@ -39,7 +39,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -52,7 +53,8 @@ import java.util.concurrent.TimeUnit; @Slf4j -@Data +@Getter +@Setter @TableName("t_flink_cluster") public class FlinkCluster implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEffective.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEffective.java index bfb806441f..c1226ece9e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEffective.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEffective.java @@ -22,12 +22,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_flink_effective") @Slf4j public class FlinkEffective { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java index c047817619..b700bdf670 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java @@ -30,7 +30,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.File; import java.io.Serializable; @@ -39,7 +40,8 @@ import java.util.Map; import java.util.Properties; -@Data +@Getter +@Setter @TableName("t_flink_env") public class FlinkEnv implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSavepoint.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSavepoint.java index fef55eea0d..fb9a5e7ead 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSavepoint.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSavepoint.java @@ -20,12 +20,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_flink_savepoint") @Slf4j public class FlinkSavepoint { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java index c01e0e97a1..15952ed754 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkSql.java @@ -25,13 +25,15 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.Base64; import java.util.Date; import java.util.Objects; -@Data +@Getter +@Setter @TableName("t_flink_sql") public class FlinkSql { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java index 44b824eee7..06b141c40a 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Message.java @@ -22,11 +22,13 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_message") public class Message { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java index 542e90a612..95b59e1f4e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Resource.java @@ -26,13 +26,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_resource") public class Resource extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Setting.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Setting.java index 9b23fc9c9a..02d2c5bd68 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Setting.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Setting.java @@ -22,12 +22,14 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.io.Serializable; -@Data +@Getter +@Setter @TableName("t_setting") @Slf4j public class Setting implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplication.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplication.java index 7d58641368..fe4c53b8b9 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplication.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplication.java @@ -45,7 +45,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -54,7 +55,8 @@ import java.util.Map; import java.util.Objects; -@Data +@Getter +@Setter @TableName("t_spark_app") @Slf4j public class SparkApplication extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationBackUp.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationBackup.java similarity index 92% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationBackUp.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationBackup.java index dc16c8061e..a9d5933a26 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationBackUp.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationBackup.java @@ -22,15 +22,17 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_spark_app_backup") @Slf4j -public class SparkApplicationBackUp { +public class SparkApplicationBackup { @TableId(type = IdType.AUTO) private Long id; @@ -51,10 +53,10 @@ public class SparkApplicationBackUp { private transient boolean backup; - public SparkApplicationBackUp() { + public SparkApplicationBackup() { } - public SparkApplicationBackUp(SparkApplication application) { + public SparkApplicationBackup(SparkApplication application) { this.appId = application.getId(); this.sqlId = application.getSqlId(); this.configId = application.getConfigId(); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationConfig.java index 3bb6228255..371ad145eb 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationConfig.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkApplicationConfig.java @@ -26,7 +26,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; @@ -35,7 +36,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -@Data +@Getter +@Setter @TableName("t_spark_config") @Slf4j public class SparkApplicationConfig { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEffective.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEffective.java index a85f60d6fe..dabce65199 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEffective.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEffective.java @@ -22,12 +22,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import java.util.Date; -@Data +@Getter +@Setter @TableName("t_spark_effective") @Slf4j public class SparkEffective { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEnv.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEnv.java index 83a28234c6..e5c8bfd7c1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEnv.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkEnv.java @@ -29,7 +29,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.File; import java.io.Serializable; @@ -38,7 +39,8 @@ import java.util.HashMap; import java.util.Map; -@Data +@Getter +@Setter @TableName("t_spark_env") public class SparkEnv implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkSql.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkSql.java index 4ea78ea440..fe39c57b7d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkSql.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/SparkSql.java @@ -25,13 +25,15 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.util.Base64; import java.util.Date; import java.util.Objects; -@Data +@Getter +@Setter @TableName("t_spark_sql") public class SparkSql { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java index 3821e10e5a..1a20768d86 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Variable.java @@ -23,14 +23,16 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_variable") public class Variable extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java index bd4368bb94..a55d58204d 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/YarnQueue.java @@ -25,10 +25,12 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_yarn_queue") public class YarnQueue extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationBuildPipelineMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationBuildPipelineMapper.java index 92fc1067db..e3c468f4d2 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationBuildPipelineMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/ApplicationBuildPipelineMapper.java @@ -17,9 +17,9 @@ package org.apache.streampark.console.core.mapper; -import org.apache.streampark.console.core.entity.AppBuildPipeline; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -public interface ApplicationBuildPipelineMapper extends BaseMapper { +public interface ApplicationBuildPipelineMapper extends BaseMapper { } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationBackUpMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationBackupMapper.java similarity index 90% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationBackUpMapper.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationBackupMapper.java index 208f82eb66..e767a5dc72 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationBackUpMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/FlinkApplicationBackupMapper.java @@ -17,9 +17,9 @@ package org.apache.streampark.console.core.mapper; -import org.apache.streampark.console.core.entity.FlinkApplicationBackUp; +import org.apache.streampark.console.core.entity.FlinkApplicationBackup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -public interface FlinkApplicationBackUpMapper extends BaseMapper { +public interface FlinkApplicationBackupMapper extends BaseMapper { } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationBackUpMapper.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationBackUpMapper.java index 5bf946c826..6bc6d242fc 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationBackUpMapper.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SparkApplicationBackUpMapper.java @@ -17,9 +17,9 @@ package org.apache.streampark.console.core.mapper; -import org.apache.streampark.console.core.entity.SparkApplicationBackUp; +import org.apache.streampark.console.core.entity.SparkApplicationBackup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -public interface SparkApplicationBackUpMapper extends BaseMapper { +public interface SparkApplicationBackUpMapper extends BaseMapper { } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/CheckPoints.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/CheckPoints.java index 418eae019a..f34ac65b45 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/CheckPoints.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/CheckPoints.java @@ -22,7 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; import java.util.ArrayList; @@ -30,7 +31,8 @@ import java.util.List; import java.util.Objects; -@Data +@Getter +@Setter public class CheckPoints implements Serializable { private List history; @@ -45,7 +47,8 @@ public List getLatestCheckpoint() { return latest.getLatestCheckpoint(); } - @Data + @Getter + @Setter public static class CheckPoint implements Serializable { private Long id; @@ -93,21 +96,32 @@ public String getPath() { } } - @Data + @Getter + @Setter public static class Latest implements Serializable { private CheckPoint completed; private CheckPoint savepoint; + private CheckPoint failed; @JsonIgnore public List getLatestCheckpoint() { List checkPoints = new ArrayList<>(); - if (Objects.nonNull(completed)) { + if (completed != null) { checkPoints.add(completed); } - if (Objects.nonNull(savepoint)) { + if (savepoint != null) { checkPoints.add(savepoint); } + if (failed != null) { + if (completed == null) { + checkPoints.add(failed); + } else { + if (failed.getId() > completed.getId()) { + checkPoints.add(failed); + } + } + } return checkPoints; } } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/JobsOverview.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/JobsOverview.java index c79df123b5..3f03098818 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/JobsOverview.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/JobsOverview.java @@ -18,17 +18,20 @@ package org.apache.streampark.console.core.metrics.flink; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; import java.util.List; -@Data +@Getter +@Setter public class JobsOverview implements Serializable { private List jobs; - @Data + @Getter + @Setter public static class Job implements Serializable { @JsonProperty("jid") @@ -51,7 +54,8 @@ public static class Job implements Serializable { private Task tasks; } - @Data + @Getter + @Setter public static class Task implements Serializable { private int total; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/Overview.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/Overview.java index 7aa13adfc5..ec30eb1513 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/Overview.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/flink/Overview.java @@ -18,9 +18,11 @@ package org.apache.streampark.console.core.metrics.flink; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter public class Overview { private Integer taskmanagers; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/Job.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/Job.java index be28f66316..31c7326c1b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/Job.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/Job.java @@ -18,14 +18,16 @@ package org.apache.streampark.console.core.metrics.spark; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; import java.util.List; import scala.collection.Map; -@Data +@Getter +@Setter public class Job implements Serializable { @JsonProperty("jobId") diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkApplicationSummary.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkApplicationSummary.java index 2c595ffb79..f55dd168f2 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkApplicationSummary.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkApplicationSummary.java @@ -18,11 +18,13 @@ package org.apache.streampark.console.core.metrics.spark; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; -@Data +@Getter +@Setter @AllArgsConstructor public class SparkApplicationSummary implements Serializable { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkExecutor.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkExecutor.java index 12e0c5e220..359a344f9c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkExecutor.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/spark/SparkExecutor.java @@ -17,11 +17,13 @@ package org.apache.streampark.console.core.metrics.spark; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; -@Data +@Getter +@Setter public class SparkExecutor implements Serializable { private Long memoryUsed; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/yarn/YarnAppInfo.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/yarn/YarnAppInfo.java index 517d97f103..f8ca56334c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/yarn/YarnAppInfo.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/metrics/yarn/YarnAppInfo.java @@ -18,14 +18,17 @@ package org.apache.streampark.console.core.metrics.yarn; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter public class YarnAppInfo { private App app; - @Data + @Getter + @Setter @JsonIgnoreProperties(ignoreUnknown = true) public static class App { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/QuickStartRunner.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/QuickStartRunner.java index 0e04a1ab93..554cbc4e44 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/QuickStartRunner.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/runner/QuickStartRunner.java @@ -27,7 +27,7 @@ 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.application.AppBuildPipeService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBuildPipelineService; import org.apache.streampark.console.core.service.application.FlinkApplicationManageService; import lombok.extern.slf4j.Slf4j; @@ -57,9 +57,9 @@ public class QuickStartRunner implements ApplicationRunner { private FlinkApplicationManageService applicationManageService; @Autowired - private AppBuildPipeService appBuildPipeService; + private FlinkApplicationBuildPipelineService appBuildPipeService; - private static Long defaultId = 100000L; + private static final Long defaultId = 100000L; @Override public void run(ApplicationArguments args) throws Exception { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBackUpService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBackupService.java similarity index 89% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBackUpService.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBackupService.java index 29cc0de3cb..eb2cfbe81e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBackUpService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBackupService.java @@ -20,14 +20,14 @@ import org.apache.streampark.console.base.domain.RestRequest; import org.apache.streampark.console.base.exception.InternalException; import org.apache.streampark.console.core.entity.FlinkApplication; -import org.apache.streampark.console.core.entity.FlinkApplicationBackUp; +import org.apache.streampark.console.core.entity.FlinkApplicationBackup; import org.apache.streampark.console.core.entity.FlinkSql; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** Interface representing a service for application backup operations. */ -public interface FlinkApplicationBackUpService extends IService { +public interface FlinkApplicationBackupService extends IService { /** * Deletes an object specified by the given ID. @@ -47,20 +47,20 @@ public interface FlinkApplicationBackUpService extends IService getPage(FlinkApplicationBackUp bakParam, RestRequest request); + IPage getPage(FlinkApplicationBackup bakParam, RestRequest request); /** * Rolls back the changes made by the specified application backup. * * @param bakParam The ApplicationBackUp object representing the backup to roll back. */ - void rollback(FlinkApplicationBackUp bakParam); + void rollback(FlinkApplicationBackup bakParam); /** * Revoke the given application. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/AppBuildPipeService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBuildPipelineService.java similarity index 91% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/AppBuildPipeService.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBuildPipelineService.java index a4cdacc3d7..5aa96f7b2b 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/AppBuildPipeService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/FlinkApplicationBuildPipelineService.java @@ -17,7 +17,7 @@ package org.apache.streampark.console.core.service.application; -import org.apache.streampark.console.core.entity.AppBuildPipeline; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; import org.apache.streampark.flink.packer.pipeline.DockerResolvedSnapshot; import org.apache.streampark.flink.packer.pipeline.PipelineStatusEnum; @@ -30,7 +30,7 @@ import java.util.Optional; /** Applications can be built asynchronously, can manage pipeline and get info */ -public interface AppBuildPipeService extends IService { +public interface FlinkApplicationBuildPipelineService extends IService { /** * Build application. This is an async call method. @@ -47,7 +47,7 @@ public interface AppBuildPipeService extends IService { * @param appId application id * @return ApplicationBuildPipeline instance */ - Optional getCurrentBuildPipeline(@Nonnull Long appId); + Optional getCurrentBuildPipeline(@Nonnull Long appId); /** * Get Docker resolved snapshot of specified application. diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkAppBuildPipeService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkAplicationBuildPipelineService.java similarity index 90% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkAppBuildPipeService.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkAplicationBuildPipelineService.java index 25ea3cb11d..07d1e7daf3 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkAppBuildPipeService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkAplicationBuildPipelineService.java @@ -17,7 +17,7 @@ package org.apache.streampark.console.core.service.application; -import org.apache.streampark.console.core.entity.AppBuildPipeline; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; import org.apache.streampark.flink.packer.pipeline.PipelineStatusEnum; import com.baomidou.mybatisplus.extension.service.IService; @@ -29,7 +29,7 @@ import java.util.Optional; /** Applications can be built asynchronously, can manage pipeline and get info */ -public interface SparkAppBuildPipeService extends IService { +public interface SparkAplicationBuildPipelineService extends IService { /** * Build application. This is an async call method. @@ -46,7 +46,7 @@ public interface SparkAppBuildPipeService extends IService { * @param appId application id * @return ApplicationBuildPipeline instance */ - Optional getCurrentBuildPipeline(@Nonnull Long appId); + Optional getCurrentBuildPipeline(@Nonnull Long appId); /** * Whether the application can currently start a new building progress diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkApplicationBackUpService.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkApplicationBackupService.java similarity index 89% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkApplicationBackUpService.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkApplicationBackupService.java index 5b46fc53d8..d15e4485e1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkApplicationBackUpService.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/SparkApplicationBackupService.java @@ -20,14 +20,14 @@ import org.apache.streampark.console.base.domain.RestRequest; import org.apache.streampark.console.base.exception.InternalException; import org.apache.streampark.console.core.entity.SparkApplication; -import org.apache.streampark.console.core.entity.SparkApplicationBackUp; +import org.apache.streampark.console.core.entity.SparkApplicationBackup; import org.apache.streampark.console.core.entity.SparkSql; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** Interface representing a service for application backup operations. */ -public interface SparkApplicationBackUpService extends IService { +public interface SparkApplicationBackupService extends IService { /** * Deletes an object specified by the given ID. @@ -47,20 +47,20 @@ public interface SparkApplicationBackUpService extends IService getPage(SparkApplicationBackUp bakParam, RestRequest request); + IPage getPage(SparkApplicationBackup bakParam, RestRequest request); /** * Rolls back the changes made by the specified application backup. * * @param bakParam The SparkApplicationBackUp object representing the backup to roll back. */ - void rollback(SparkApplicationBackUp bakParam); + void rollback(SparkApplicationBackup bakParam); /** * Revoke the given application. 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 bd62eb99f2..d645570f94 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 @@ -37,7 +37,7 @@ 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.AppBuildPipeline; +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; @@ -63,10 +63,10 @@ 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.AppBuildPipeService; 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.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; @@ -139,7 +139,7 @@ public class FlinkApplicationActionServiceImpl private Executor executorService; @Autowired - private FlinkApplicationBackUpService backUpService; + private FlinkApplicationBackupService backUpService; @Autowired private FlinkApplicationManageService applicationManageService; @@ -169,7 +169,7 @@ public class FlinkApplicationActionServiceImpl private FlinkK8sWatcher k8SFlinkTrackMonitor; @Autowired - private AppBuildPipeService appBuildPipeService; + private FlinkApplicationBuildPipelineService appBuildPipeService; @Autowired private FlinkClusterService flinkClusterService; @@ -429,7 +429,7 @@ public void start(FlinkApplication appParam, boolean auto) throws Exception { "[StreamPark] The same task name is already running in the yarn queue"); } - AppBuildPipeline buildPipeline = appBuildPipeService.getById(application.getId()); + ApplicationBuildPipeline buildPipeline = appBuildPipeService.getById(application.getId()); AssertUtils.notNull(buildPipeline); FlinkEnv flinkEnv = flinkEnvService.getByIdOrDefault(application.getVersionId()); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackUpServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java similarity index 83% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackUpServiceImpl.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java index b3c0982d38..aa344b1431 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackUpServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBackupServiceImpl.java @@ -23,15 +23,15 @@ import org.apache.streampark.console.base.exception.InternalException; import org.apache.streampark.console.base.mybatis.pager.MybatisPager; import org.apache.streampark.console.core.entity.FlinkApplication; -import org.apache.streampark.console.core.entity.FlinkApplicationBackUp; +import org.apache.streampark.console.core.entity.FlinkApplicationBackup; import org.apache.streampark.console.core.entity.FlinkApplicationConfig; import org.apache.streampark.console.core.entity.FlinkSql; import org.apache.streampark.console.core.enums.EffectiveTypeEnum; import org.apache.streampark.console.core.enums.ReleaseStateEnum; -import org.apache.streampark.console.core.mapper.FlinkApplicationBackUpMapper; +import org.apache.streampark.console.core.mapper.FlinkApplicationBackupMapper; import org.apache.streampark.console.core.service.FlinkEffectiveService; import org.apache.streampark.console.core.service.FlinkSqlService; -import org.apache.streampark.console.core.service.application.FlinkApplicationBackUpService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBackupService; import org.apache.streampark.console.core.service.application.FlinkApplicationConfigService; import org.apache.streampark.console.core.service.application.FlinkApplicationManageService; @@ -49,11 +49,11 @@ @Slf4j @Service @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class FlinkApplicationBackUpServiceImpl +public class FlinkApplicationBackupServiceImpl extends - ServiceImpl + ServiceImpl implements - FlinkApplicationBackUpService { + FlinkApplicationBackupService { @Autowired private FlinkApplicationManageService applicationManageService; @@ -68,15 +68,15 @@ public class FlinkApplicationBackUpServiceImpl private FlinkSqlService flinkSqlService; @Override - public IPage getPage(FlinkApplicationBackUp bakParam, RestRequest request) { - Page page = MybatisPager.getPage(request); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(FlinkApplicationBackUp::getAppId, bakParam.getAppId()); + public IPage getPage(FlinkApplicationBackup bakParam, RestRequest request) { + Page page = MybatisPager.getPage(request); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(FlinkApplicationBackup::getAppId, bakParam.getAppId()); return this.baseMapper.selectPage(page, queryWrapper); } @Override - public void rollback(FlinkApplicationBackUp bakParam) { + public void rollback(FlinkApplicationBackup bakParam) { FlinkApplication application = applicationManageService.getById(bakParam.getAppId()); @@ -133,15 +133,15 @@ public void rollback(FlinkApplicationBackUp bakParam) { @Override public void revoke(FlinkApplication appParam) { - Page page = new Page<>(); + Page page = new Page<>(); page.setCurrent(0).setSize(1).setSearchCount(false); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(FlinkApplicationBackUp::getAppId, appParam.getId()) - .orderByDesc(FlinkApplicationBackUp::getCreateTime); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(FlinkApplicationBackup::getAppId, appParam.getId()) + .orderByDesc(FlinkApplicationBackup::getCreateTime); - Page backUpPages = baseMapper.selectPage(page, queryWrapper); + Page backUpPages = baseMapper.selectPage(page, queryWrapper); if (!backUpPages.getRecords().isEmpty()) { - FlinkApplicationBackUp backup = backUpPages.getRecords().get(0); + FlinkApplicationBackup backup = backUpPages.getRecords().get(0); String path = backup.getPath(); appParam.getFsOperator().move(path, appParam.getWorkspace().APP_WORKSPACE()); super.removeById(backup.getId()); @@ -152,8 +152,8 @@ public void revoke(FlinkApplication appParam) { public void remove(FlinkApplication appParam) { try { baseMapper.delete( - new LambdaQueryWrapper() - .eq(FlinkApplicationBackUp::getAppId, appParam.getId())); + new LambdaQueryWrapper() + .eq(FlinkApplicationBackup::getAppId, appParam.getId())); appParam .getFsOperator() .delete( @@ -169,10 +169,10 @@ public void remove(FlinkApplication appParam) { @Override public void rollbackFlinkSql(FlinkApplication appParam, FlinkSql flinkSqlParam) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(FlinkApplicationBackUp::getAppId, appParam.getId()) - .eq(FlinkApplicationBackUp::getSqlId, flinkSqlParam.getId()); - FlinkApplicationBackUp backUp = baseMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(FlinkApplicationBackup::getAppId, appParam.getId()) + .eq(FlinkApplicationBackup::getSqlId, flinkSqlParam.getId()); + FlinkApplicationBackup backUp = baseMapper.selectOne(queryWrapper); ApiAlertException.throwIfNull( backUp, "Application backup can't be null. Rollback flink sql failed."); // rollback config and sql @@ -182,7 +182,7 @@ public void rollbackFlinkSql(FlinkApplication appParam, FlinkSql flinkSqlParam) @Override public Boolean removeById(Long id) throws InternalException { - FlinkApplicationBackUp backUp = getById(id); + FlinkApplicationBackup backUp = getById(id); try { FlinkApplication application = applicationManageService.getById(backUp.getAppId()); application.getFsOperator().delete(backUp.getPath()); @@ -215,7 +215,7 @@ public void backup(FlinkApplication appParam, FlinkSql flinkSqlParam) { version = config.getVersion(); } - FlinkApplicationBackUp applicationBackUp = new FlinkApplicationBackUp(appParam); + FlinkApplicationBackup applicationBackUp = new FlinkApplicationBackup(appParam); applicationBackUp.setVersion(version); this.save(applicationBackUp); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkAppBuildPipeServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java similarity index 95% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkAppBuildPipeServiceImpl.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java index 462892af12..fcd6008cc1 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkAppBuildPipeServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/FlinkApplicationBuildPipelineServiceImpl.java @@ -31,7 +31,7 @@ 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.AppBuildPipeline; +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; @@ -50,10 +50,10 @@ 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.AppBuildPipeService; 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.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; @@ -116,11 +116,11 @@ @Service @Slf4j @Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class) -public class FlinkAppBuildPipeServiceImpl +public class FlinkApplicationBuildPipelineServiceImpl extends - ServiceImpl + ServiceImpl implements - AppBuildPipeService { + FlinkApplicationBuildPipelineService { @Autowired private FlinkEnvService flinkEnvService; @@ -129,7 +129,7 @@ public class FlinkAppBuildPipeServiceImpl private FlinkSqlService flinkSqlService; @Autowired - private FlinkApplicationBackUpService backUpService; + private FlinkApplicationBackupService backUpService; @Autowired private SettingService settingService; @@ -219,7 +219,7 @@ public boolean buildApplication(@Nonnull Long appId, boolean forceBuild) { @Override public void onStart(PipelineSnapshot snapshot) { - AppBuildPipeline buildPipeline = AppBuildPipeline.fromPipeSnapshot(snapshot) + ApplicationBuildPipeline buildPipeline = ApplicationBuildPipeline.fromPipeSnapshot(snapshot) .setAppId(app.getId()); saveEntity(buildPipeline); @@ -300,14 +300,14 @@ public void onStart(PipelineSnapshot snapshot) { @Override public void onStepStateChange(PipelineSnapshot snapshot) { - AppBuildPipeline buildPipeline = AppBuildPipeline.fromPipeSnapshot(snapshot) + ApplicationBuildPipeline buildPipeline = ApplicationBuildPipeline.fromPipeSnapshot(snapshot) .setAppId(app.getId()); saveEntity(buildPipeline); } @Override public void onFinish(PipelineSnapshot snapshot, BuildResult result) { - AppBuildPipeline buildPipeline = AppBuildPipeline.fromPipeSnapshot(snapshot) + ApplicationBuildPipeline buildPipeline = ApplicationBuildPipeline.fromPipeSnapshot(snapshot) .setAppId(app.getId()) .setBuildResult(result); saveEntity(buildPipeline); @@ -373,7 +373,8 @@ public void onFinish(PipelineSnapshot snapshot, BuildResult result) { registerDockerProgressWatcher(pipeline, app); } // save pipeline instance snapshot to db before release it. - AppBuildPipeline buildPipeline = AppBuildPipeline.initFromPipeline(pipeline).setAppId(app.getId()); + ApplicationBuildPipeline buildPipeline = + ApplicationBuildPipeline.initFromPipeline(pipeline).setAppId(app.getId()); boolean saved = saveEntity(buildPipeline); DOCKER_PULL_PG_SNAPSHOTS.invalidate(app.getId()); DOCKER_BUILD_PG_SNAPSHOTS.invalidate(app.getId()); @@ -606,7 +607,7 @@ private String retrieveFlinkUserJar(FlinkEnv flinkEnv, FlinkApplication app) { } @Override - public Optional getCurrentBuildPipeline(@Nonnull Long appId) { + public Optional getCurrentBuildPipeline(@Nonnull Long appId) { return Optional.ofNullable(getById(appId)); } @@ -630,21 +631,21 @@ public Map listAppIdPipelineStatusMap(List appId if (CollectionUtils.isEmpty(appIds)) { return new HashMap<>(); } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .in(AppBuildPipeline::getAppId, appIds); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .in(ApplicationBuildPipeline::getAppId, appIds); - List appBuildPipelines = baseMapper.selectList(queryWrapper); + List appBuildPipelines = baseMapper.selectList(queryWrapper); if (CollectionUtils.isEmpty(appBuildPipelines)) { return new HashMap<>(); } return appBuildPipelines.stream() - .collect(Collectors.toMap(AppBuildPipeline::getAppId, AppBuildPipeline::getPipelineStatus)); + .collect(Collectors.toMap(ApplicationBuildPipeline::getAppId, ApplicationBuildPipeline::getPipelineStatus)); } @Override public void removeByAppId(Long appId) { baseMapper.delete( - new LambdaQueryWrapper().eq(AppBuildPipeline::getAppId, appId)); + new LambdaQueryWrapper().eq(ApplicationBuildPipeline::getAppId, appId)); } /** @@ -653,8 +654,8 @@ public void removeByAppId(Long appId) { * @param pipe application build pipeline * @return value after the save or update */ - public boolean saveEntity(AppBuildPipeline pipe) { - AppBuildPipeline old = getById(pipe.getAppId()); + public boolean saveEntity(ApplicationBuildPipeline pipe) { + ApplicationBuildPipeline old = getById(pipe.getAppId()); if (old == null) { return save(pipe); } 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 6ddbf4b23d..2e84467755 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 @@ -50,10 +50,10 @@ 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.AppBuildPipeService; 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.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; @@ -111,7 +111,7 @@ public class FlinkApplicationManageServiceImpl extends ServiceImpl + ServiceImpl implements - SparkApplicationBackUpService { + SparkApplicationBackupService { @Autowired private SparkApplicationManageService applicationManageService; @@ -68,15 +68,15 @@ public class SparkApplicationBackUpServiceImpl private SparkSqlService sparkSqlService; @Override - public IPage getPage(SparkApplicationBackUp bakParam, RestRequest request) { - Page page = MybatisPager.getPage(request); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(SparkApplicationBackUp::getAppId, bakParam.getAppId()); + public IPage getPage(SparkApplicationBackup bakParam, RestRequest request) { + Page page = MybatisPager.getPage(request); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(SparkApplicationBackup::getAppId, bakParam.getAppId()); return this.baseMapper.selectPage(page, queryWrapper); } @Override - public void rollback(SparkApplicationBackUp bakParam) { + public void rollback(SparkApplicationBackup bakParam) { SparkApplication application = applicationManageService.getById(bakParam.getAppId()); @@ -133,15 +133,15 @@ public void rollback(SparkApplicationBackUp bakParam) { @Override public void revoke(SparkApplication appParam) { - Page page = new Page<>(); + Page page = new Page<>(); page.setCurrent(0).setSize(1).setSearchCount(false); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(SparkApplicationBackUp::getAppId, appParam.getId()) - .orderByDesc(SparkApplicationBackUp::getCreateTime); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(SparkApplicationBackup::getAppId, appParam.getId()) + .orderByDesc(SparkApplicationBackup::getCreateTime); - Page backUpPages = baseMapper.selectPage(page, queryWrapper); + Page backUpPages = baseMapper.selectPage(page, queryWrapper); if (!backUpPages.getRecords().isEmpty()) { - SparkApplicationBackUp backup = backUpPages.getRecords().get(0); + SparkApplicationBackup backup = backUpPages.getRecords().get(0); String path = backup.getPath(); appParam.getFsOperator().move(path, appParam.getWorkspace().APP_WORKSPACE()); super.removeById(backup.getId()); @@ -152,8 +152,8 @@ public void revoke(SparkApplication appParam) { public void remove(SparkApplication appParam) { try { baseMapper.delete( - new LambdaQueryWrapper() - .eq(SparkApplicationBackUp::getAppId, appParam.getId())); + new LambdaQueryWrapper() + .eq(SparkApplicationBackup::getAppId, appParam.getId())); appParam .getFsOperator() .delete( @@ -169,10 +169,10 @@ public void remove(SparkApplication appParam) { @Override public void rollbackSparkSql(SparkApplication appParam, SparkSql sparkSqlParam) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(SparkApplicationBackUp::getAppId, appParam.getId()) - .eq(SparkApplicationBackUp::getSqlId, sparkSqlParam.getId()); - SparkApplicationBackUp backUp = baseMapper.selectOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(SparkApplicationBackup::getAppId, appParam.getId()) + .eq(SparkApplicationBackup::getSqlId, sparkSqlParam.getId()); + SparkApplicationBackup backUp = baseMapper.selectOne(queryWrapper); ApiAlertException.throwIfNull( backUp, "Application backup can't be null. Rollback spark sql failed."); // rollback config and sql @@ -182,7 +182,7 @@ public void rollbackSparkSql(SparkApplication appParam, SparkSql sparkSqlParam) @Override public Boolean removeById(Long id) throws InternalException { - SparkApplicationBackUp backUp = getById(id); + SparkApplicationBackup backUp = getById(id); try { SparkApplication application = applicationManageService.getById(backUp.getAppId()); application.getFsOperator().delete(backUp.getPath()); @@ -215,7 +215,7 @@ public void backup(SparkApplication appParam, SparkSql sparkSqlParam) { version = config.getVersion(); } - SparkApplicationBackUp applicationBackUp = new SparkApplicationBackUp(appParam); + SparkApplicationBackup applicationBackUp = new SparkApplicationBackup(appParam); applicationBackUp.setVersion(version); this.save(applicationBackUp); diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkAppBuildPipeServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java similarity index 94% rename from streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkAppBuildPipeServiceImpl.java rename to streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java index 167652d220..2642dd94c9 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkAppBuildPipeServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationBuildPipelineServiceImpl.java @@ -29,7 +29,7 @@ import org.apache.streampark.console.base.util.JacksonUtils; import org.apache.streampark.console.base.util.WebUtils; import org.apache.streampark.console.core.bean.Dependency; -import org.apache.streampark.console.core.entity.AppBuildPipeline; +import org.apache.streampark.console.core.entity.ApplicationBuildPipeline; import org.apache.streampark.console.core.entity.ApplicationLog; import org.apache.streampark.console.core.entity.Message; import org.apache.streampark.console.core.entity.Resource; @@ -49,7 +49,7 @@ import org.apache.streampark.console.core.service.SparkEnvService; import org.apache.streampark.console.core.service.SparkSqlService; import org.apache.streampark.console.core.service.application.ApplicationLogService; -import org.apache.streampark.console.core.service.application.SparkAppBuildPipeService; +import org.apache.streampark.console.core.service.application.SparkAplicationBuildPipelineService; import org.apache.streampark.console.core.service.application.SparkApplicationConfigService; import org.apache.streampark.console.core.service.application.SparkApplicationInfoService; import org.apache.streampark.console.core.service.application.SparkApplicationManageService; @@ -96,11 +96,11 @@ @Service @Slf4j @Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class) -public class SparkAppBuildPipeServiceImpl +public class SparkApplicationBuildPipelineServiceImpl extends - ServiceImpl + ServiceImpl implements - SparkAppBuildPipeService { + SparkAplicationBuildPipelineService { @Autowired private SparkEnvService sparkEnvService; @@ -185,7 +185,7 @@ public boolean buildApplication(@Nonnull Long appId, boolean forceBuild) { @Override public void onStart(PipelineSnapshot snapshot) { - AppBuildPipeline buildPipeline = AppBuildPipeline.fromPipeSnapshot(snapshot) + ApplicationBuildPipeline buildPipeline = ApplicationBuildPipeline.fromPipeSnapshot(snapshot) .setAppId(app.getId()); saveEntity(buildPipeline); @@ -266,14 +266,14 @@ public void onStart(PipelineSnapshot snapshot) { @Override public void onStepStateChange(PipelineSnapshot snapshot) { - AppBuildPipeline buildPipeline = AppBuildPipeline.fromPipeSnapshot(snapshot) + ApplicationBuildPipeline buildPipeline = ApplicationBuildPipeline.fromPipeSnapshot(snapshot) .setAppId(app.getId()); saveEntity(buildPipeline); } @Override public void onFinish(PipelineSnapshot snapshot, BuildResult result) { - AppBuildPipeline buildPipeline = AppBuildPipeline.fromPipeSnapshot(snapshot) + ApplicationBuildPipeline buildPipeline = ApplicationBuildPipeline.fromPipeSnapshot(snapshot) .setAppId(app.getId()) .setBuildResult(result); saveEntity(buildPipeline); @@ -327,7 +327,8 @@ public void onFinish(PipelineSnapshot snapshot, BuildResult result) { } }); // save pipeline instance snapshot to db before release it. - AppBuildPipeline buildPipeline = AppBuildPipeline.initFromPipeline(pipeline).setAppId(app.getId()); + ApplicationBuildPipeline buildPipeline = + ApplicationBuildPipeline.initFromPipeline(pipeline).setAppId(app.getId()); boolean saved = saveEntity(buildPipeline); // async release pipeline executorService.submit((Runnable) pipeline::launch); @@ -429,7 +430,7 @@ private String retrieveSparkUserJar(SparkEnv sparkEnv, SparkApplication app) { } @Override - public Optional getCurrentBuildPipeline(@Nonnull Long appId) { + public Optional getCurrentBuildPipeline(@Nonnull Long appId) { return Optional.ofNullable(getById(appId)); } @@ -445,21 +446,21 @@ public Map listAppIdPipelineStatusMap(List appId if (CollectionUtils.isEmpty(appIds)) { return new HashMap<>(); } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .in(AppBuildPipeline::getAppId, appIds); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .in(ApplicationBuildPipeline::getAppId, appIds); - List appBuildPipelines = baseMapper.selectList(queryWrapper); + List appBuildPipelines = baseMapper.selectList(queryWrapper); if (CollectionUtils.isEmpty(appBuildPipelines)) { return new HashMap<>(); } return appBuildPipelines.stream() - .collect(Collectors.toMap(AppBuildPipeline::getAppId, AppBuildPipeline::getPipelineStatus)); + .collect(Collectors.toMap(ApplicationBuildPipeline::getAppId, ApplicationBuildPipeline::getPipelineStatus)); } @Override public void removeByAppId(Long appId) { baseMapper.delete( - new LambdaQueryWrapper().eq(AppBuildPipeline::getAppId, appId)); + new LambdaQueryWrapper().eq(ApplicationBuildPipeline::getAppId, appId)); } /** @@ -468,8 +469,8 @@ public void removeByAppId(Long appId) { * @param pipe application build pipeline * @return value after the save or update */ - public boolean saveEntity(AppBuildPipeline pipe) { - AppBuildPipeline old = getById(pipe.getAppId()); + public boolean saveEntity(ApplicationBuildPipeline pipe) { + ApplicationBuildPipeline old = getById(pipe.getAppId()); if (old == null) { return save(pipe); } diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java index c138ce428a..a998f447ce 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/application/impl/SparkApplicationManageServiceImpl.java @@ -45,10 +45,10 @@ import org.apache.streampark.console.core.service.SparkEffectiveService; import org.apache.streampark.console.core.service.SparkSqlService; import org.apache.streampark.console.core.service.YarnQueueService; -import org.apache.streampark.console.core.service.application.AppBuildPipeService; 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.SparkApplicationBackUpService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBuildPipelineService; +import org.apache.streampark.console.core.service.application.SparkApplicationBackupService; import org.apache.streampark.console.core.service.application.SparkApplicationConfigService; import org.apache.streampark.console.core.service.application.SparkApplicationManageService; import org.apache.streampark.console.core.util.ServiceHelper; @@ -101,7 +101,7 @@ public class SparkApplicationManageServiceImpl private ApplicationService applicationService; @Autowired - private SparkApplicationBackUpService backUpService; + private SparkApplicationBackupService backUpService; @Autowired private SparkApplicationConfigService configService; @@ -116,7 +116,7 @@ public class SparkApplicationManageServiceImpl private SparkEffectiveService effectiveService; @Autowired - private AppBuildPipeService appBuildPipeService; + private FlinkApplicationBuildPipelineService appBuildPipeService; @Autowired private YarnQueueService yarnQueueService; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java index 45048e5e26..842c0017c8 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/FlinkSqlServiceImpl.java @@ -31,7 +31,7 @@ import org.apache.streampark.console.core.service.FlinkEffectiveService; import org.apache.streampark.console.core.service.FlinkEnvService; import org.apache.streampark.console.core.service.FlinkSqlService; -import org.apache.streampark.console.core.service.application.FlinkApplicationBackUpService; +import org.apache.streampark.console.core.service.application.FlinkApplicationBackupService; import org.apache.streampark.flink.core.FlinkSqlValidationResult; import org.apache.streampark.flink.proxy.FlinkShimsProxy; @@ -61,7 +61,7 @@ public class FlinkSqlServiceImpl extends ServiceImpl private FlinkEffectiveService effectiveService; @Autowired - private FlinkApplicationBackUpService backUpService; + private FlinkApplicationBackupService backUpService; @Autowired private FlinkEnvService flinkEnvService; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java index cf157007f8..1a70349837 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SparkSqlServiceImpl.java @@ -31,7 +31,7 @@ import org.apache.streampark.console.core.service.SparkEffectiveService; import org.apache.streampark.console.core.service.SparkEnvService; import org.apache.streampark.console.core.service.SparkSqlService; -import org.apache.streampark.console.core.service.application.SparkApplicationBackUpService; +import org.apache.streampark.console.core.service.application.SparkApplicationBackupService; import org.apache.streampark.spark.client.proxy.SparkShimsProxy; import org.apache.streampark.spark.core.util.SparkSqlValidationResult; @@ -61,7 +61,7 @@ public class SparkSqlServiceImpl extends ServiceImpl private SparkEffectiveService effectiveService; @Autowired - private SparkApplicationBackUpService backUpService; + private SparkApplicationBackupService backUpService; @Autowired private SparkEnvService sparkEnvService; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java index b75848b661..8f81eeedb6 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/ApplicationBackUpCleanTask.java @@ -17,8 +17,8 @@ package org.apache.streampark.console.core.task; -import org.apache.streampark.console.core.entity.FlinkApplicationBackUp; -import org.apache.streampark.console.core.service.application.FlinkApplicationBackUpService; +import org.apache.streampark.console.core.entity.FlinkApplicationBackup; +import org.apache.streampark.console.core.service.application.FlinkApplicationBackupService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,7 +31,7 @@ @RequiredArgsConstructor public class ApplicationBackUpCleanTask { - private final FlinkApplicationBackUpService backUpService; + private final FlinkApplicationBackupService backUpService; @Value("${streampark.backup-clean.max-backup-num:5}") public Integer maxBackupNum; @@ -40,15 +40,15 @@ public class ApplicationBackUpCleanTask { public void backUpClean() { log.info("Start to clean application backup"); // select all application backup which count > maxBackupNum group by app_id - backUpService.lambdaQuery().groupBy(FlinkApplicationBackUp::getAppId) + backUpService.lambdaQuery().groupBy(FlinkApplicationBackup::getAppId) .having("count(*) > " + maxBackupNum).list().stream() - .map(FlinkApplicationBackUp::getAppId) + .map(FlinkApplicationBackup::getAppId) .forEach( appId -> { // order by create_time desc and skip first maxBackupNum records and delete // others - backUpService.lambdaQuery().eq(FlinkApplicationBackUp::getAppId, appId) - .orderByDesc(FlinkApplicationBackUp::getCreateTime).list() + backUpService.lambdaQuery().eq(FlinkApplicationBackup::getAppId, appId) + .orderByDesc(FlinkApplicationBackup::getCreateTime).list() .stream() .skip(maxBackupNum) .forEach( diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/AccessToken.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/AccessToken.java index d178711111..3e1db096a5 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/AccessToken.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/AccessToken.java @@ -22,15 +22,17 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_access_token") public class AccessToken extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java index 83f37d27d6..f6d975fa4c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Member.java @@ -22,11 +22,13 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; @TableName("t_member") -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) public class Member extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Menu.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Menu.java index 5bf14b67d6..2c13045c89 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Menu.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Menu.java @@ -22,13 +22,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_menu") public class Menu extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java index 3d3944fda9..88c2f3161e 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Role.java @@ -22,13 +22,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_role") public class Role extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/RoleMenu.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/RoleMenu.java index 4f9ec47b03..f9a0ef18f2 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/RoleMenu.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/RoleMenu.java @@ -20,12 +20,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import java.io.Serializable; @TableName("t_role_menu") -@Data +@Getter +@Setter public class RoleMenu implements Serializable { private static final long serialVersionUID = 1L; diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java index 53f2f83e10..2524cdbccc 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/Team.java @@ -22,12 +22,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.Size; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_team") public class Team extends BaseEntity { diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java index e10e8d1b5b..df5d04ef7c 100644 --- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java +++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/system/entity/User.java @@ -25,8 +25,9 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; @@ -34,7 +35,8 @@ import java.util.Date; -@Data +@Getter +@Setter @EqualsAndHashCode(callSuper = true) @TableName("t_user") public class User extends BaseEntity {