From 8724facd661642fb0b2835417f51a37737f0b220 Mon Sep 17 00:00:00 2001 From: Zhiguo Wu Date: Thu, 1 Aug 2024 10:13:15 +0800 Subject: [PATCH] BIGTOP-4176: Rename ORM entities (#31) --- .../AuditLog.java => po/AuditLogPO.java} | 4 +- .../BaseEntity.java => po/BasePO.java} | 4 +- .../Cluster.java => po/ClusterPO.java} | 6 +- .../Component.java => po/ComponentPO.java} | 8 +- .../HostComponentPO.java} | 8 +- .../dao/{entity/Host.java => po/HostPO.java} | 6 +- .../dao/{entity/Job.java => po/JobPO.java} | 10 +- .../dao/{entity/Repo.java => po/RepoPO.java} | 6 +- .../ServiceConfigPO.java} | 12 +- .../Service.java => po/ServicePO.java} | 6 +- .../Setting.java => po/SettingPO.java} | 4 +- .../{entity/Stack.java => po/StackPO.java} | 4 +- .../{entity/Stage.java => po/StagePO.java} | 12 +- .../dao/{entity/Task.java => po/TaskPO.java} | 10 +- .../TypeConfig.java => po/TypeConfigPO.java} | 6 +- .../dao/{entity/User.java => po/UserPO.java} | 4 +- .../dao/repository/AuditLogRepository.java | 4 +- .../dao/repository/ClusterRepository.java | 6 +- .../dao/repository/ComponentRepository.java | 12 +- .../repository/HostComponentRepository.java | 21 ++-- .../dao/repository/HostRepository.java | 16 +-- .../manager/dao/repository/JobRepository.java | 10 +- .../dao/repository/RepoRepository.java | 8 +- .../repository/ServiceConfigRepository.java | 22 ++-- .../dao/repository/ServiceRepository.java | 12 +- .../dao/repository/SettingRepository.java | 4 +- .../dao/repository/StackRepository.java | 6 +- .../dao/repository/StageRepository.java | 8 +- .../dao/repository/TaskRepository.java | 14 +-- .../dao/repository/TypeConfigRepository.java | 4 +- .../dao/repository/UserRepository.java | 6 +- .../manager/server/aop/AuditAspect.java | 22 ++-- .../job/factory/AbstractJobFactory.java | 66 +++++------ .../command/job/factory/JobFactory.java | 4 +- .../cluster/ClusterCreateJobFactory.java | 5 +- .../job/factory/host/HostAddJobFactory.java | 5 +- .../service/AbstractServiceJobFactory.java | 44 +++---- .../service/ServiceInstallJobFactory.java | 6 +- .../command/job/runner/AbstractJobRunner.java | 50 ++++---- .../server/command/job/runner/JobRunner.java | 6 +- .../server/command/job/runner/JobRunners.java | 8 +- .../cluster/ClusterCreateJobRunner.java | 30 ++--- .../job/runner/host/HostAddJobRunner.java | 2 +- .../service/ServiceInstallJobRunner.java | 59 +++++----- .../job/validator/ClusterCreateValidator.java | 4 +- .../job/validator/ClusterHostValidator.java | 9 +- .../job/validator/HostAddValidator.java | 9 +- .../validator/RequiredServicesValidator.java | 15 +-- .../job/validator/ServiceHostValidator.java | 4 +- .../command/job/validator/StackValidator.java | 6 +- .../scheduler/DefaultJobScheduler.java | 6 +- .../command/scheduler/JobScheduler.java | 6 +- .../stage/factory/AbstractStageFactory.java | 12 +- .../command/stage/factory/StageFactory.java | 4 +- .../AbstractComponentStageFactory.java | 48 ++++---- .../config/CacheDistributeStageFactory.java | 38 +++--- .../factory/host/HostCheckStageFactory.java | 42 +++---- .../stage/runner/AbstractStageRunner.java | 60 +++++----- .../command/stage/runner/StageRunner.java | 20 ++-- .../command/stage/runner/StageRunners.java | 8 +- .../ComponentInstallStageRunner.java | 24 ++-- .../component/ComponentStartStageRunner.java | 22 ++-- .../component/ComponentStopStageRunner.java | 24 ++-- .../config/CacheDistributeStageRunner.java | 108 +++++++++--------- .../model/converter/ClusterConverter.java | 16 +-- .../model/converter/ComponentConverter.java | 20 ++-- .../converter/HostComponentConverter.java | 18 +-- .../server/model/converter/HostConverter.java | 10 +- .../server/model/converter/JobConverter.java | 9 +- .../server/model/converter/RepoConverter.java | 14 +-- .../converter/ServiceConfigConverter.java | 9 +- .../model/converter/ServiceConverter.java | 14 +-- .../model/converter/StackConverter.java | 4 +- .../model/converter/StageConverter.java | 5 +- .../server/model/converter/TaskConverter.java | 4 +- .../model/converter/TypeConfigConverter.java | 12 +- .../server/model/converter/UserConverter.java | 4 +- .../manager/server/model/vo/PageVO.java | 5 +- .../scheduler/ComponentStatusScheduler.java | 54 ++++----- .../server/scheduler/HostInfoScheduler.java | 36 +++--- .../service/impl/ClusterServiceImpl.java | 59 +++++----- .../service/impl/CommandServiceImpl.java | 8 +- .../service/impl/ComponentServiceImpl.java | 10 +- .../service/impl/ConfigServiceImpl.java | 74 ++++++------ .../impl/HostComponentServiceImpl.java | 18 +-- .../server/service/impl/HostServiceImpl.java | 48 ++++---- .../server/service/impl/JobServiceImpl.java | 40 +++---- .../server/service/impl/LoginServiceImpl.java | 10 +- .../service/impl/ServiceServiceImpl.java | 72 ++++++------ .../service/impl/TaskLogServiceImpl.java | 10 +- .../server/service/impl/UserServiceImpl.java | 14 +-- .../server/stack/StackInitializer.java | 14 +-- 92 files changed, 833 insertions(+), 817 deletions(-) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/AuditLog.java => po/AuditLogPO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/BaseEntity.java => po/BasePO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Cluster.java => po/ClusterPO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Component.java => po/ComponentPO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/HostComponent.java => po/HostComponentPO.java} (93%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Host.java => po/HostPO.java} (96%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Job.java => po/JobPO.java} (92%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Repo.java => po/RepoPO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/ServiceConfig.java => po/ServiceConfigPO.java} (91%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Service.java => po/ServicePO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Setting.java => po/SettingPO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Stack.java => po/StackPO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Stage.java => po/StagePO.java} (92%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/Task.java => po/TaskPO.java} (95%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/TypeConfig.java => po/TypeConfigPO.java} (94%) rename bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/{entity/User.java => po/UserPO.java} (95%) diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/AuditLog.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/AuditLogPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/AuditLog.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/AuditLogPO.java index c597fce6..61366579 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/AuditLog.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/AuditLogPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -41,7 +41,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class AuditLog extends BaseEntity { +public class AuditLogPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "audit_log_generator") diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/BaseEntity.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/BasePO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/BaseEntity.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/BasePO.java index cbd3e026..819f0c6a 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/BaseEntity.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/BasePO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; @@ -34,7 +34,7 @@ @Data @MappedSuperclass @EntityListeners(AuditingEntityListener.class) -public abstract class BaseEntity { +public abstract class BasePO { @CreatedDate @Column(name = "create_time", updatable = false) diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Cluster.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ClusterPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Cluster.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ClusterPO.java index e24348c5..5e6015b8 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Cluster.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ClusterPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import org.apache.bigtop.manager.common.enums.MaintainState; @@ -53,7 +53,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Cluster extends BaseEntity { +public class ClusterPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "cluster_generator") @@ -86,5 +86,5 @@ public class Cluster extends BaseEntity { @ManyToOne @JoinColumn(name = "stack_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Stack stack; + private StackPO stackPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Component.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ComponentPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Component.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ComponentPO.java index a2411c4a..d5e530a8 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Component.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ComponentPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -57,7 +57,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Component extends BaseEntity { +public class ComponentPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "component_generator") @@ -86,9 +86,9 @@ public class Component extends BaseEntity { @ManyToOne @JoinColumn(name = "service_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Service service; + private ServicePO servicePO; @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/HostComponent.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostComponentPO.java similarity index 93% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/HostComponent.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostComponentPO.java index 95841850..74fe6afe 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/HostComponent.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostComponentPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import org.apache.bigtop.manager.common.enums.MaintainState; @@ -50,7 +50,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class HostComponent extends BaseEntity { +public class HostComponentPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "host_component_generator") @@ -62,9 +62,9 @@ public class HostComponent extends BaseEntity { @ManyToOne @JoinColumn(name = "host_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Host host; + private HostPO hostPO; @ManyToOne @JoinColumn(name = "component_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Component component; + private ComponentPO componentPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Host.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostPO.java similarity index 96% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Host.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostPO.java index 3ef8a012..36df7fe9 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Host.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/HostPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import org.apache.bigtop.manager.common.enums.MaintainState; @@ -49,7 +49,7 @@ }, indexes = {@Index(name = "idx_host_cluster_id", columnList = "cluster_id")}) @TableGenerator(name = "host_generator", table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Host extends BaseEntity { +public class HostPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "host_generator") @@ -91,5 +91,5 @@ public class Host extends BaseEntity { @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Job.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/JobPO.java similarity index 92% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Job.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/JobPO.java index e161f891..f7ffceb8 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Job.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/JobPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import org.apache.bigtop.manager.common.enums.JobState; @@ -49,7 +49,7 @@ name = "\"job\"", indexes = {@Index(name = "idx_job_cluster_id", columnList = "cluster_id")}) @TableGenerator(name = "job_generator", table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Job extends BaseEntity { +public class JobPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "job_generator") @@ -69,9 +69,9 @@ public class Job extends BaseEntity { @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; @ToString.Exclude - @OneToMany(mappedBy = "job") - private List stages; + @OneToMany(mappedBy = "jobPO") + private List stagePOList; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Repo.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/RepoPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Repo.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/RepoPO.java index e1cf8097..4f502bfe 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Repo.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/RepoPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -47,7 +47,7 @@ }, indexes = {@Index(name = "idx_repo_cluster_id", columnList = "cluster_id")}) @TableGenerator(name = "repo_generator", table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Repo extends BaseEntity { +public class RepoPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "repo_generator") @@ -71,5 +71,5 @@ public class Repo extends BaseEntity { @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfig.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ServiceConfigPO.java similarity index 91% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfig.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ServiceConfigPO.java index 7048fd19..fe8856d6 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/ServiceConfig.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ServiceConfigPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -51,7 +51,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class ServiceConfig extends BaseEntity { +public class ServiceConfigPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "service_config_generator") @@ -68,14 +68,14 @@ public class ServiceConfig extends BaseEntity { private Boolean selected; @ToString.Exclude - @OneToMany(mappedBy = "serviceConfig") - private List configs; + @OneToMany(mappedBy = "serviceConfigPO") + private List configs; @ManyToOne @JoinColumn(name = "service_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Service service; + private ServicePO servicePO; @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Service.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ServicePO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Service.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ServicePO.java index eca5499e..e0b26e92 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Service.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/ServicePO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -51,7 +51,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Service extends BaseEntity { +public class ServicePO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "service_generator") @@ -84,5 +84,5 @@ public class Service extends BaseEntity { @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Setting.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/SettingPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Setting.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/SettingPO.java index 609f3bce..dac01817 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Setting.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/SettingPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -41,7 +41,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Setting extends BaseEntity { +public class SettingPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "settings_generator") diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stack.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StackPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stack.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StackPO.java index fad9c22e..0f8211ac 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stack.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StackPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -41,7 +41,7 @@ columnNames = {"stack_name", "stack_version"}) }) @TableGenerator(name = "stack_generator", table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Stack extends BaseEntity { +public class StackPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "stack_generator") diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stage.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StagePO.java similarity index 92% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stage.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StagePO.java index 9f9a4478..7678a392 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Stage.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/StagePO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import org.apache.bigtop.manager.common.enums.JobState; @@ -52,7 +52,7 @@ @Index(name = "idx_stage_job_id", columnList = "job_id") }) @TableGenerator(name = "stage_generator", table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Stage extends BaseEntity { +public class StagePO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "stage_generator") @@ -81,13 +81,13 @@ public class Stage extends BaseEntity { @ManyToOne @JoinColumn(name = "job_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Job job; + private JobPO jobPO; @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; @ToString.Exclude - @OneToMany(mappedBy = "stage") - private List tasks; + @OneToMany(mappedBy = "stagePO") + private List taskPOList; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Task.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TaskPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Task.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TaskPO.java index fb505d12..26f44e75 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/Task.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TaskPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import org.apache.bigtop.manager.common.enums.Command; import org.apache.bigtop.manager.common.enums.JobState; @@ -51,7 +51,7 @@ @Index(name = "idx_task_stage_id", columnList = "stage_id") }) @TableGenerator(name = "task_generator", table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class Task extends BaseEntity { +public class TaskPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "task_generator") @@ -109,13 +109,13 @@ public class Task extends BaseEntity { @ManyToOne @JoinColumn(name = "job_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Job job; + private JobPO jobPO; @ManyToOne @JoinColumn(name = "stage_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Stage stage; + private StagePO stagePO; @ManyToOne @JoinColumn(name = "cluster_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private Cluster cluster; + private ClusterPO clusterPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/TypeConfig.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TypeConfigPO.java similarity index 94% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/TypeConfig.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TypeConfigPO.java index a1cd5478..919060cb 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/TypeConfig.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/TypeConfigPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,7 +45,7 @@ table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class TypeConfig extends BaseEntity { +public class TypeConfigPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "type_config_generator") @@ -62,5 +62,5 @@ public class TypeConfig extends BaseEntity { @ManyToOne @JoinColumn(name = "service_config_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) - private ServiceConfig serviceConfig; + private ServiceConfigPO serviceConfigPO; } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/User.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/UserPO.java similarity index 95% rename from bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/User.java rename to bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/UserPO.java index 6ea1c6ea..d5684280 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/entity/User.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/po/UserPO.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.bigtop.manager.dao.entity; +package org.apache.bigtop.manager.dao.po; import lombok.Data; import lombok.EqualsAndHashCode; @@ -34,7 +34,7 @@ @Entity @Table(name = "\"user\"") @TableGenerator(name = "user_generator", table = "sequence", pkColumnName = "seq_name", valueColumnName = "seq_count") -public class User extends BaseEntity { +public class UserPO extends BasePO { @Id @GeneratedValue(strategy = GenerationType.TABLE, generator = "user_generator") diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/AuditLogRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/AuditLogRepository.java index 5b3f8482..7564a4e7 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/AuditLogRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/AuditLogRepository.java @@ -18,8 +18,8 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.AuditLog; +import org.apache.bigtop.manager.dao.po.AuditLogPO; import org.springframework.data.jpa.repository.JpaRepository; -public interface AuditLogRepository extends JpaRepository {} +public interface AuditLogRepository extends JpaRepository {} diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ClusterRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ClusterRepository.java index 922b8362..fceb8bff 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ClusterRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ClusterRepository.java @@ -18,13 +18,13 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Cluster; +import org.apache.bigtop.manager.dao.po.ClusterPO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; -public interface ClusterRepository extends JpaRepository { +public interface ClusterRepository extends JpaRepository { - Optional findByClusterName(String clusterName); + Optional findByClusterName(String clusterName); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ComponentRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ComponentRepository.java index 9566c2b7..074f5b6b 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ComponentRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ComponentRepository.java @@ -18,19 +18,19 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Component; +import org.apache.bigtop.manager.dao.po.ComponentPO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface ComponentRepository extends JpaRepository { +public interface ComponentRepository extends JpaRepository { - Component findByClusterIdAndComponentName(Long clusterId, String componentName); + ComponentPO findByClusterPOIdAndComponentName(Long clusterId, String componentName); - List findAllByClusterIdAndComponentNameIn(Long clusterId, List componentNames); + List findAllByClusterPOIdAndComponentNameIn(Long clusterId, List componentNames); - List findAllByClusterId(Long clusterId); + List findAllByClusterPOId(Long clusterId); - List findAllByClusterIdAndServiceServiceNameIn(Long clusterId, List serviceNames); + List findAllByClusterPOIdAndServicePOServiceNameIn(Long clusterId, List serviceNames); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostComponentRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostComponentRepository.java index 1e7bd49f..4b677252 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostComponentRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostComponentRepository.java @@ -18,29 +18,30 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.HostComponent; +import org.apache.bigtop.manager.dao.po.HostComponentPO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface HostComponentRepository extends JpaRepository { +public interface HostComponentRepository extends JpaRepository { - List findAllByComponentClusterIdAndComponentComponentName(Long clusterId, String componentName); + List findAllByComponentPOClusterPOIdAndComponentPOComponentName( + Long clusterId, String componentName); - HostComponent findByComponentClusterIdAndComponentComponentNameAndHostHostname( + HostComponentPO findByComponentPOClusterPOIdAndComponentPOComponentNameAndHostPOHostname( Long clusterId, String componentName, String hostnames); - List findAllByComponentClusterIdAndComponentComponentNameAndHostHostnameIn( + List findAllByComponentPOClusterPOIdAndComponentPOComponentNameAndHostPOHostnameIn( Long clusterId, String componentName, List hostnames); - List findAllByComponentClusterId(Long clusterId); + List findAllByComponentPOClusterPOId(Long clusterId); - HostComponent findByComponentComponentNameAndHostHostname(String componentName, String hostName); + HostComponentPO findByComponentPOComponentNameAndHostPOHostname(String componentName, String hostName); - List findAllByComponentClusterIdAndHostId(Long clusterId, Long componentId); + List findAllByComponentPOClusterPOIdAndHostPOId(Long clusterId, Long componentId); - List findAllByComponentClusterIdAndComponentServiceId(Long clusterId, Long serviceId); + List findAllByComponentPOClusterPOIdAndComponentPOServicePOId(Long clusterId, Long serviceId); - List findAllByComponentServiceId(Long serviceId); + List findAllByComponentPOServicePOId(Long serviceId); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostRepository.java index 6ce99ae4..49db05eb 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/HostRepository.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Host; +import org.apache.bigtop.manager.dao.po.HostPO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -27,17 +27,17 @@ import java.util.Collection; import java.util.List; -public interface HostRepository extends JpaRepository { +public interface HostRepository extends JpaRepository { - Host findByHostname(String hostname); + HostPO findByHostname(String hostname); - List findAllByHostnameIn(Collection hostnames); + List findAllByHostnameIn(Collection hostnames); - List findAllByClusterIdAndHostnameIn(Long clusterId, Collection hostnames); + List findAllByClusterPOIdAndHostnameIn(Long clusterId, Collection hostnames); - List findAllByClusterId(Long clusterId); + List findAllByClusterPOId(Long clusterId); - Page findAllByClusterId(Long clusterId, Pageable pageable); + Page findAllByClusterPOId(Long clusterId, Pageable pageable); - List findAllByClusterClusterName(String clusterName); + List findAllByClusterPOClusterName(String clusterName); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/JobRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/JobRepository.java index 44d4f1fc..7aafcf3c 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/JobRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/JobRepository.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -26,11 +26,11 @@ import java.util.List; -public interface JobRepository extends JpaRepository { +public interface JobRepository extends JpaRepository { - Page findAllByClusterIsNull(Pageable pageable); + Page findAllByClusterPOIsNull(Pageable pageable); - Page findAllByClusterId(Long clusterId, Pageable pageable); + Page findAllByClusterPOId(Long clusterId, Pageable pageable); - List findAllByClusterId(Long clusterId); + List findAllByClusterPOId(Long clusterId); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoRepository.java index ef8f0911..39d629f5 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/RepoRepository.java @@ -18,14 +18,14 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Repo; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.RepoPO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface RepoRepository extends JpaRepository { +public interface RepoRepository extends JpaRepository { - List findAllByCluster(Cluster cluster); + List findAllByClusterPO(ClusterPO clusterPO); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRepository.java index 663e6bcb..12ff2e4d 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceConfigRepository.java @@ -18,9 +18,9 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Service; -import org.apache.bigtop.manager.dao.entity.ServiceConfig; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ServiceConfigPO; +import org.apache.bigtop.manager.dao.po.ServicePO; import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; @@ -30,20 +30,20 @@ import java.util.List; -public interface ServiceConfigRepository extends JpaRepository { +public interface ServiceConfigRepository extends JpaRepository { - List findAllByCluster(Cluster cluster); + List findAllByClusterPO(ClusterPO clusterPO); - List findAllByCluster(Cluster cluster, Sort sort); + List findAllByClusterPO(ClusterPO clusterPO, Sort sort); - List findAllByClusterAndService(Cluster cluster, Service service); + List findAllByClusterPOAndServicePO(ClusterPO clusterPO, ServicePO servicePO); - ServiceConfig findByClusterAndServiceAndSelectedIsTrue(Cluster cluster, Service service); + ServiceConfigPO findByClusterPOAndServicePOAndSelectedIsTrue(ClusterPO clusterPO, ServicePO servicePO); - List findAllByClusterAndSelectedIsTrue(Cluster cluster); + List findAllByClusterPOAndSelectedIsTrue(ClusterPO clusterPO); @Transactional @Modifying - @Query("UPDATE ServiceConfig s SET s.selected = false WHERE s.cluster = :cluster AND s.service = :service") - void setAllSelectedToFalseByClusterAndService(Cluster cluster, Service service); + @Query("UPDATE ServiceConfigPO s SET s.selected = false WHERE s.clusterPO = :cluster AND s.servicePO = :service") + void setAllSelectedToFalseByClusterAndService(ClusterPO clusterPO, ServicePO servicePO); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceRepository.java index fb84d831..f84df78c 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/ServiceRepository.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Service; +import org.apache.bigtop.manager.dao.po.ServicePO; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -26,13 +26,13 @@ import java.util.List; -public interface ServiceRepository extends JpaRepository { +public interface ServiceRepository extends JpaRepository { - List findAllByClusterId(Long clusterId); + List findAllByClusterPOId(Long clusterId); - Page findAllByClusterId(Long clusterId, Pageable pageable); + Page findAllByClusterPOId(Long clusterId, Pageable pageable); - Service findByClusterIdAndServiceName(Long clusterId, String serviceName); + ServicePO findByClusterPOIdAndServiceName(Long clusterId, String serviceName); - List findByClusterIdAndServiceNameIn(Long clusterId, List serviceNames); + List findByClusterPOIdAndServiceNameIn(Long clusterId, List serviceNames); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/SettingRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/SettingRepository.java index ac1671e9..67cfbd62 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/SettingRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/SettingRepository.java @@ -18,8 +18,8 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Setting; +import org.apache.bigtop.manager.dao.po.SettingPO; import org.springframework.data.jpa.repository.JpaRepository; -public interface SettingRepository extends JpaRepository {} +public interface SettingRepository extends JpaRepository {} diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackRepository.java index 5096738b..797e2d54 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StackRepository.java @@ -18,11 +18,11 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Stack; +import org.apache.bigtop.manager.dao.po.StackPO; import org.springframework.data.jpa.repository.JpaRepository; -public interface StackRepository extends JpaRepository { +public interface StackRepository extends JpaRepository { - Stack findByStackNameAndStackVersion(String stackName, String stackVersion); + StackPO findByStackNameAndStackVersion(String stackName, String stackVersion); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StageRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StageRepository.java index c11ffd6e..d37128e4 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StageRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/StageRepository.java @@ -18,14 +18,14 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.Job; -import org.apache.bigtop.manager.dao.entity.Stage; +import org.apache.bigtop.manager.dao.po.JobPO; +import org.apache.bigtop.manager.dao.po.StagePO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface StageRepository extends JpaRepository { +public interface StageRepository extends JpaRepository { - List findByJob(Job job); + List findByJobPO(JobPO jobPO); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TaskRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TaskRepository.java index b8f0bb8d..045ee6d5 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TaskRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TaskRepository.java @@ -19,20 +19,20 @@ package org.apache.bigtop.manager.dao.repository; import org.apache.bigtop.manager.common.enums.JobState; -import org.apache.bigtop.manager.dao.entity.Stage; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.StagePO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface TaskRepository extends JpaRepository { +public interface TaskRepository extends JpaRepository { - List findByStage(Stage stage); + List findByStagePO(StagePO stagePO); - List findAllByJobId(Long jobId); + List findAllByJobPOId(Long jobId); - List findAllByJobIdAndState(Long jobId, JobState state); + List findAllByJobPOIdAndState(Long jobId, JobState state); - List findAllByJobIdAndHostnameAndState(Long jobId, String hostname, JobState state); + List findAllByJobPOIdAndHostnameAndState(Long jobId, String hostname, JobState state); } diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TypeConfigRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TypeConfigRepository.java index 90145cfa..ea03ead9 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TypeConfigRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/TypeConfigRepository.java @@ -18,8 +18,8 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.TypeConfig; +import org.apache.bigtop.manager.dao.po.TypeConfigPO; import org.springframework.data.jpa.repository.JpaRepository; -public interface TypeConfigRepository extends JpaRepository {} +public interface TypeConfigRepository extends JpaRepository {} diff --git a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/UserRepository.java b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/UserRepository.java index 996a9f77..ee55af28 100644 --- a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/UserRepository.java +++ b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/repository/UserRepository.java @@ -18,11 +18,11 @@ */ package org.apache.bigtop.manager.dao.repository; -import org.apache.bigtop.manager.dao.entity.User; +import org.apache.bigtop.manager.dao.po.UserPO; import org.springframework.data.jpa.repository.JpaRepository; -public interface UserRepository extends JpaRepository { +public interface UserRepository extends JpaRepository { - User findByUsername(String username); + UserPO findByUsername(String username); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java index 55473219..4471f734 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/aop/AuditAspect.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.aop; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.AuditLog; +import org.apache.bigtop.manager.dao.po.AuditLogPO; import org.apache.bigtop.manager.dao.repository.AuditLogRepository; import org.apache.bigtop.manager.server.holder.SessionUserHolder; @@ -51,8 +51,8 @@ public class AuditAspect { @Before(value = POINT_CUT) public void before(JoinPoint joinPoint) { MethodSignature ms = (MethodSignature) joinPoint.getSignature(); - AuditLog auditLog = new AuditLog(); - auditLog.setUserId(SessionUserHolder.getUserId()); + AuditLogPO auditLogPO = new AuditLogPO(); + auditLogPO.setUserId(SessionUserHolder.getUserId()); ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); if (attributes != null) { @@ -79,17 +79,17 @@ public void before(JoinPoint joinPoint) { operationDesc = operation.description(); } - auditLog.setUri(uri); - auditLog.setTagName(apiName); - auditLog.setTagDesc(apiDesc); - auditLog.setOperationSummary(operationSummary); - auditLog.setOperationDesc(operationDesc); - auditLog.setArgs(JsonUtils.writeAsString(joinPoint.getArgs())); + auditLogPO.setUri(uri); + auditLogPO.setTagName(apiName); + auditLogPO.setTagDesc(apiDesc); + auditLogPO.setOperationSummary(operationSummary); + auditLogPO.setOperationDesc(operationDesc); + auditLogPO.setArgs(JsonUtils.writeAsString(joinPoint.getArgs())); - log.debug("auditLog: {}", auditLog); + log.debug("auditLog: {}", auditLogPO); log.debug("request method：{}.{}", joinPoint.getSignature().getDeclaringTypeName(), methodName); - auditLogRepository.save(auditLog); + auditLogRepository.save(auditLogPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/AbstractJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/AbstractJobFactory.java index 1d6203a3..dc7641f8 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/AbstractJobFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/AbstractJobFactory.java @@ -20,10 +20,10 @@ import org.apache.bigtop.manager.common.enums.JobState; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Job; -import org.apache.bigtop.manager.dao.entity.Stage; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.JobPO; +import org.apache.bigtop.manager.dao.po.StagePO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.JobRepository; import org.apache.bigtop.manager.dao.repository.StageRepository; @@ -49,14 +49,14 @@ public abstract class AbstractJobFactory implements JobFactory { protected JobContext jobContext; - protected Cluster cluster; + protected ClusterPO clusterPO; - protected Job job; + protected JobPO jobPO; - protected List stages = new ArrayList<>(); + protected List stagePOList = new ArrayList<>(); @Override - public Job createJob(JobContext jobContext) { + public JobPO createJob(JobContext jobContext) { this.jobContext = jobContext; // Create and init job @@ -68,40 +68,40 @@ public Job createJob(JobContext jobContext) { // Save job saveJob(); - return this.job; + return this.jobPO; } protected abstract void createStagesAndTasks(); private void initJob() { Long clusterId = jobContext.getCommandDTO().getClusterId(); - this.cluster = clusterId == null ? new Cluster() : clusterRepository.getReferenceById(clusterId); - - this.job = new Job(); - job.setName(jobContext.getCommandDTO().getContext()); - job.setState(JobState.PENDING); - job.setCluster(cluster.getId() == null ? null : cluster); - job.setContext(JsonUtils.writeAsString(jobContext)); - job.setStages(stages); + this.clusterPO = clusterId == null ? new ClusterPO() : clusterRepository.getReferenceById(clusterId); + + this.jobPO = new JobPO(); + jobPO.setName(jobContext.getCommandDTO().getContext()); + jobPO.setState(JobState.PENDING); + jobPO.setClusterPO(clusterPO.getId() == null ? null : clusterPO); + jobPO.setContext(JsonUtils.writeAsString(jobContext)); + jobPO.setStagePOList(stagePOList); } protected void saveJob() { - jobRepository.save(job); - - for (int i = 0; i < job.getStages().size(); i++) { - Stage stage = job.getStages().get(i); - stage.setCluster(cluster.getId() == null ? null : cluster); - stage.setJob(job); - stage.setOrder(i + 1); - stage.setState(JobState.PENDING); - stageRepository.save(stage); - - for (Task task : stage.getTasks()) { - task.setCluster(cluster.getId() == null ? null : cluster); - task.setJob(job); - task.setStage(stage); - task.setState(JobState.PENDING); - taskRepository.save(task); + jobRepository.save(jobPO); + + for (int i = 0; i < jobPO.getStagePOList().size(); i++) { + StagePO stagePO = jobPO.getStagePOList().get(i); + stagePO.setClusterPO(clusterPO.getId() == null ? null : clusterPO); + stagePO.setJobPO(jobPO); + stagePO.setOrder(i + 1); + stagePO.setState(JobState.PENDING); + stageRepository.save(stagePO); + + for (TaskPO taskPO : stagePO.getTaskPOList()) { + taskPO.setClusterPO(clusterPO.getId() == null ? null : clusterPO); + taskPO.setJobPO(jobPO); + taskPO.setStagePO(stagePO); + taskPO.setState(JobState.PENDING); + taskRepository.save(taskPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/JobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/JobFactory.java index 91fe692d..89e3953d 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/JobFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/JobFactory.java @@ -18,12 +18,12 @@ */ package org.apache.bigtop.manager.server.command.job.factory; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; import org.apache.bigtop.manager.server.command.CommandIdentifier; public interface JobFactory { CommandIdentifier getCommandIdentifier(); - Job createJob(JobContext jobContext); + JobPO createJob(JobContext jobContext); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/cluster/ClusterCreateJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/cluster/ClusterCreateJobFactory.java index 009bfeb4..1eaf5f01 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/cluster/ClusterCreateJobFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/cluster/ClusterCreateJobFactory.java @@ -44,7 +44,8 @@ public CommandIdentifier getCommandIdentifier() { @Override public void createStagesAndTasks() { StageContext stageContext = StageContext.fromPayload(JsonUtils.writeAsString(jobContext.getCommandDTO())); - stages.add(StageFactories.getStageFactory(StageType.HOST_CHECK).createStage(stageContext)); - stages.add(StageFactories.getStageFactory(StageType.CACHE_DISTRIBUTE).createStage(stageContext)); + stagePOList.add(StageFactories.getStageFactory(StageType.HOST_CHECK).createStage(stageContext)); + stagePOList.add( + StageFactories.getStageFactory(StageType.CACHE_DISTRIBUTE).createStage(stageContext)); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/host/HostAddJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/host/HostAddJobFactory.java index 59a2910b..99645e54 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/host/HostAddJobFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/host/HostAddJobFactory.java @@ -43,7 +43,8 @@ public CommandIdentifier getCommandIdentifier() { public void createStagesAndTasks() { StageContext stageContext = StageContext.fromPayload(JsonUtils.writeAsString(jobContext.getCommandDTO())); - stages.add(StageFactories.getStageFactory(StageType.HOST_CHECK).createStage(stageContext)); - stages.add(StageFactories.getStageFactory(StageType.CACHE_DISTRIBUTE).createStage(stageContext)); + stagePOList.add(StageFactories.getStageFactory(StageType.HOST_CHECK).createStage(stageContext)); + stagePOList.add( + StageFactories.getStageFactory(StageType.CACHE_DISTRIBUTE).createStage(stageContext)); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/AbstractServiceJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/AbstractServiceJobFactory.java index a31538c4..666c3b55 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/AbstractServiceJobFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/AbstractServiceJobFactory.java @@ -21,9 +21,9 @@ import org.apache.bigtop.manager.common.constants.ComponentCategories; import org.apache.bigtop.manager.common.enums.Command; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Component; -import org.apache.bigtop.manager.dao.entity.Host; -import org.apache.bigtop.manager.dao.entity.HostComponent; +import org.apache.bigtop.manager.dao.po.ComponentPO; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.HostPO; import org.apache.bigtop.manager.dao.repository.ComponentRepository; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; import org.apache.bigtop.manager.server.command.job.factory.AbstractJobFactory; @@ -64,8 +64,8 @@ public abstract class AbstractServiceJobFactory extends AbstractJobFactory { protected DAG dag; protected void initAttrs() { - stackName = cluster.getStack().getStackName(); - stackVersion = cluster.getStack().getStackVersion(); + stackName = clusterPO.getStackPO().getStackName(); + stackVersion = clusterPO.getStackPO().getStackVersion(); dag = StackUtils.getStackDagMap().get(StackUtils.fullStackName(stackName, stackVersion)); } @@ -103,10 +103,10 @@ protected List getTodoListForCommand(Command command) { protected List getComponentNames() { List serviceNames = getServiceNames(); - List components = - componentRepository.findAllByClusterIdAndServiceServiceNameIn(cluster.getId(), serviceNames); + List componentPOList = + componentRepository.findAllByClusterPOIdAndServicePOServiceNameIn(clusterPO.getId(), serviceNames); - return components.stream().map(Component::getComponentName).toList(); + return componentPOList.stream().map(ComponentPO::getComponentName).toList(); } protected String findServiceNameByComponentName(String componentName) { @@ -132,15 +132,15 @@ protected Boolean isSlaveComponent(String componentName) { } protected List findHostnamesByComponentName(String componentName) { - List hostComponents = - hostComponentRepository.findAllByComponentClusterIdAndComponentComponentName( - cluster.getId(), componentName); - if (hostComponents == null) { + List hostComponentPOList = + hostComponentRepository.findAllByComponentPOClusterPOIdAndComponentPOComponentName( + clusterPO.getId(), componentName); + if (hostComponentPOList == null) { return new ArrayList<>(); } else { - return hostComponents.stream() - .map(HostComponent::getHost) - .map(Host::getHostname) + return hostComponentPOList.stream() + .map(HostComponentPO::getHostPO) + .map(HostPO::getHostname) .toList(); } } @@ -149,7 +149,8 @@ protected void createCacheStage() { StageContext stageContext = StageContext.fromPayload(JsonUtils.writeAsString(jobContext.getCommandDTO())); stageContext.setStackName(stackName); stageContext.setStackVersion(stackVersion); - stages.add(StageFactories.getStageFactory(StageType.CACHE_DISTRIBUTE).createStage(stageContext)); + stagePOList.add( + StageFactories.getStageFactory(StageType.CACHE_DISTRIBUTE).createStage(stageContext)); } protected void createInstallStages() { @@ -165,7 +166,7 @@ protected void createInstallStages() { } StageContext stageContext = createStageContext(serviceName, componentName, hostnames); - stages.add( + stagePOList.add( StageFactories.getStageFactory(StageType.COMPONENT_INSTALL).createStage(stageContext)); } } @@ -188,7 +189,8 @@ protected void createStartStages() { } StageContext stageContext = createStageContext(serviceName, componentName, hostnames); - stages.add(StageFactories.getStageFactory(StageType.COMPONENT_START).createStage(stageContext)); + stagePOList.add( + StageFactories.getStageFactory(StageType.COMPONENT_START).createStage(stageContext)); } } @@ -210,7 +212,8 @@ protected void createStopStages() { } StageContext stageContext = createStageContext(serviceName, componentName, hostnames); - stages.add(StageFactories.getStageFactory(StageType.COMPONENT_STOP).createStage(stageContext)); + stagePOList.add( + StageFactories.getStageFactory(StageType.COMPONENT_STOP).createStage(stageContext)); } } @@ -232,7 +235,8 @@ protected void createCheckStages() { } StageContext stageContext = createStageContext(serviceName, componentName, List.of(hostnames.get(0))); - stages.add(StageFactories.getStageFactory(StageType.COMPONENT_CHECK).createStage(stageContext)); + stagePOList.add( + StageFactories.getStageFactory(StageType.COMPONENT_CHECK).createStage(stageContext)); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/ServiceInstallJobFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/ServiceInstallJobFactory.java index 916436e2..31d28777 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/ServiceInstallJobFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/factory/service/ServiceInstallJobFactory.java @@ -84,10 +84,10 @@ protected List findHostnamesByComponentName(String componentName) { if (componentHost.getComponentName().equals(componentName)) { List hostnames = new ArrayList<>(componentHost.getHostnames()); List existHostnames = hostComponentRepository - .findAllByComponentClusterIdAndComponentComponentNameAndHostHostnameIn( - cluster.getId(), componentName, hostnames) + .findAllByComponentPOClusterPOIdAndComponentPOComponentNameAndHostPOHostnameIn( + clusterPO.getId(), componentName, hostnames) .stream() - .map(hostComponent -> hostComponent.getHost().getHostname()) + .map(hostComponent -> hostComponent.getHostPO().getHostname()) .toList(); hostnames.removeAll(existHostnames); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/AbstractJobRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/AbstractJobRunner.java index 86188f93..4acd7ec3 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/AbstractJobRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/AbstractJobRunner.java @@ -19,9 +19,9 @@ package org.apache.bigtop.manager.server.command.job.runner; import org.apache.bigtop.manager.common.enums.JobState; -import org.apache.bigtop.manager.dao.entity.Job; -import org.apache.bigtop.manager.dao.entity.Stage; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.JobPO; +import org.apache.bigtop.manager.dao.po.StagePO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.JobRepository; import org.apache.bigtop.manager.dao.repository.StageRepository; import org.apache.bigtop.manager.dao.repository.TaskRepository; @@ -46,13 +46,13 @@ public abstract class AbstractJobRunner implements JobRunner { @Resource private TaskRepository taskRepository; - protected Job job; + protected JobPO jobPO; protected JobContext jobContext; @Override - public void setJob(Job job) { - this.job = job; + public void setJob(JobPO jobPO) { + this.jobPO = jobPO; } @Override @@ -65,17 +65,17 @@ public void run() { beforeRun(); // Sort stage - List stages = job.getStages(); - stages.sort(Comparator.comparingInt(Stage::getOrder)); + List stagePOList = jobPO.getStagePOList(); + stagePOList.sort(Comparator.comparingInt(StagePO::getOrder)); boolean success = true; - LinkedBlockingQueue queue = new LinkedBlockingQueue<>(stages); + LinkedBlockingQueue queue = new LinkedBlockingQueue<>(stagePOList); while (!queue.isEmpty()) { - Stage stage = queue.poll(); - StageRunner runner = StageRunners.getStageRunner(stage); + StagePO stagePO = queue.poll(); + StageRunner runner = StageRunners.getStageRunner(stagePO); runner.run(); - if (stage.getState() == JobState.FAILED) { + if (stagePO.getState() == JobState.FAILED) { success = false; break; } @@ -90,29 +90,29 @@ public void run() { @Override public void beforeRun() { - job.setState(JobState.PROCESSING); - jobRepository.save(job); + jobPO.setState(JobState.PROCESSING); + jobRepository.save(jobPO); } @Override public void onSuccess() { - job.setState(JobState.SUCCESSFUL); - jobRepository.save(job); + jobPO.setState(JobState.SUCCESSFUL); + jobRepository.save(jobPO); } @Override public void onFailure() { - job.setState(JobState.FAILED); - jobRepository.save(job); + jobPO.setState(JobState.FAILED); + jobRepository.save(jobPO); - for (Stage stage : job.getStages()) { - if (stage.getState() == JobState.PENDING) { - stage.setState(JobState.CANCELED); - stageRepository.save(stage); + for (StagePO stagePO : jobPO.getStagePOList()) { + if (stagePO.getState() == JobState.PENDING) { + stagePO.setState(JobState.CANCELED); + stageRepository.save(stagePO); - for (Task task : stage.getTasks()) { - task.setState(JobState.CANCELED); - taskRepository.save(task); + for (TaskPO taskPO : stagePO.getTaskPOList()) { + taskPO.setState(JobState.CANCELED); + taskRepository.save(taskPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunner.java index 563016d3..c0f10b73 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunner.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.command.job.runner; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.command.job.factory.JobContext; @@ -38,9 +38,9 @@ public interface JobRunner { /** * Set the job that this runner will manage. * - * @param job The job to be managed by this runner. + * @param jobPO The job to be managed by this runner. */ - void setJob(Job job); + void setJob(JobPO jobPO); /** * Set the context for the job. The context may contain additional information necessary for running the job. diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunners.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunners.java index 2a94427f..73f3474b 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunners.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/JobRunners.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.command.job.runner; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.command.job.factory.JobContext; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; @@ -40,12 +40,12 @@ public class JobRunners { private static final Map JOB_RUNNERS = new HashMap<>(); - public static JobRunner getJobRunner(Job job) { + public static JobRunner getJobRunner(JobPO jobPO) { if (!LOADED.get()) { load(); } - JobContext jobContext = JsonUtils.readFromString(job.getContext(), JobContext.class); + JobContext jobContext = JsonUtils.readFromString(jobPO.getContext(), JobContext.class); CommandDTO commandDTO = jobContext.getCommandDTO(); CommandIdentifier identifier = new CommandIdentifier(commandDTO.getCommandLevel(), commandDTO.getCommand()); if (!JOB_RUNNERS.containsKey(identifier)) { @@ -57,7 +57,7 @@ public static JobRunner getJobRunner(Job job) { String beanName = JOB_RUNNERS.get(identifier); JobRunner runner = SpringContextHolder.getApplicationContext().getBean(beanName, JobRunner.class); - runner.setJob(job); + runner.setJob(jobPO); runner.setJobContext(jobContext); return runner; diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/cluster/ClusterCreateJobRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/cluster/ClusterCreateJobRunner.java index afa9ddef..09a8d71c 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/cluster/ClusterCreateJobRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/cluster/ClusterCreateJobRunner.java @@ -20,9 +20,9 @@ import org.apache.bigtop.manager.common.enums.Command; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Stage; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.StagePO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.JobRepository; import org.apache.bigtop.manager.dao.repository.StageRepository; @@ -82,25 +82,25 @@ public void onSuccess() { super.onSuccess(); CommandDTO commandDTO = getCommandDTO(); - Cluster cluster = clusterRepository + ClusterPO clusterPO = clusterRepository .findByClusterName(commandDTO.getClusterCommand().getClusterName()) - .orElse(new Cluster()); + .orElse(new ClusterPO()); // Update cluster state to installed - cluster.setState(MaintainState.INSTALLED); - clusterRepository.save(cluster); + clusterPO.setState(MaintainState.INSTALLED); + clusterRepository.save(clusterPO); // Link job to cluster after cluster successfully added - job.setCluster(cluster); - jobRepository.save(job); + jobPO.setClusterPO(clusterPO); + jobRepository.save(jobPO); - for (Stage stage : job.getStages()) { - stage.setCluster(cluster); - stageRepository.save(stage); + for (StagePO stagePO : jobPO.getStagePOList()) { + stagePO.setClusterPO(clusterPO); + stageRepository.save(stagePO); - for (Task task : stage.getTasks()) { - task.setCluster(cluster); - taskRepository.save(task); + for (TaskPO taskPO : stagePO.getTaskPOList()) { + taskPO.setClusterPO(clusterPO); + taskRepository.save(taskPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/host/HostAddJobRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/host/HostAddJobRunner.java index c108ebf5..95e5dbae 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/host/HostAddJobRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/host/HostAddJobRunner.java @@ -56,6 +56,6 @@ public void onSuccess() { List hostnames = hostCommands.stream().map(HostCommandDTO::getHostname).toList(); - hostService.batchSave(job.getCluster().getId(), hostnames); + hostService.batchSave(jobPO.getClusterPO().getId(), hostnames); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/service/ServiceInstallJobRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/service/ServiceInstallJobRunner.java index 5916db4d..e54c79f0 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/service/ServiceInstallJobRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/runner/service/ServiceInstallJobRunner.java @@ -20,11 +20,11 @@ import org.apache.bigtop.manager.common.enums.Command; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Component; -import org.apache.bigtop.manager.dao.entity.Host; -import org.apache.bigtop.manager.dao.entity.HostComponent; -import org.apache.bigtop.manager.dao.entity.Service; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ComponentPO; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.HostPO; +import org.apache.bigtop.manager.dao.po.ServicePO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.ComponentRepository; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; @@ -90,53 +90,54 @@ public void beforeRun() { // Persist service, component and hostComponent metadata to database for (ServiceCommandDTO serviceCommand : serviceCommands) { String serviceName = serviceCommand.getServiceName(); - Service service = serviceRepository.findByClusterIdAndServiceName(clusterId, serviceName); - upsertService(service, serviceCommand); + ServicePO servicePO = serviceRepository.findByClusterPOIdAndServiceName(clusterId, serviceName); + upsertService(servicePO, serviceCommand); } } - private void upsertService(Service service, ServiceCommandDTO serviceCommand) { + private void upsertService(ServicePO servicePO, ServiceCommandDTO serviceCommand) { CommandDTO commandDTO = getCommandDTO(); Long clusterId = commandDTO.getClusterId(); String serviceName = serviceCommand.getServiceName(); - Cluster cluster = clusterRepository.getReferenceById(clusterId); + ClusterPO clusterPO = clusterRepository.getReferenceById(clusterId); - String stackName = cluster.getStack().getStackName(); - String stackVersion = cluster.getStack().getStackVersion(); + String stackName = clusterPO.getStackPO().getStackName(); + String stackVersion = clusterPO.getStackPO().getStackVersion(); // 1. Persist service - if (service == null) { + if (servicePO == null) { ServiceDTO serviceDTO = StackUtils.getServiceDTO(stackName, stackVersion, serviceName); - service = ServiceConverter.INSTANCE.fromDTO2Entity(serviceDTO, cluster); - service = serviceRepository.save(service); + servicePO = ServiceConverter.INSTANCE.fromDTO2PO(serviceDTO, clusterPO); + servicePO = serviceRepository.save(servicePO); } // 2. Update configs - configService.upsert(clusterId, service.getId(), serviceCommand.getConfigs()); + configService.upsert(clusterId, servicePO.getId(), serviceCommand.getConfigs()); for (ComponentHostDTO componentHostDTO : serviceCommand.getComponentHosts()) { String componentName = componentHostDTO.getComponentName(); // 3. Persist component - Component component = componentRepository.findByClusterIdAndComponentName(clusterId, componentName); - if (component == null) { + ComponentPO componentPO = componentRepository.findByClusterPOIdAndComponentName(clusterId, componentName); + if (componentPO == null) { ComponentDTO componentDTO = StackUtils.getComponentDTO(stackName, stackVersion, componentName); - component = ComponentConverter.INSTANCE.fromDTO2Entity(componentDTO, service, cluster); - component = componentRepository.save(component); + componentPO = ComponentConverter.INSTANCE.fromDTO2PO(componentDTO, servicePO, clusterPO); + componentPO = componentRepository.save(componentPO); } // 4. Persist hostComponent for (String hostname : componentHostDTO.getHostnames()) { - HostComponent hostComponent = - hostComponentRepository.findByComponentComponentNameAndHostHostname(componentName, hostname); - if (hostComponent == null) { - Host host = hostRepository.findByHostname(hostname); - - hostComponent = new HostComponent(); - hostComponent.setHost(host); - hostComponent.setComponent(component); - hostComponent.setState(MaintainState.UNINSTALLED); - hostComponentRepository.save(hostComponent); + HostComponentPO hostComponentPO = + hostComponentRepository.findByComponentPOComponentNameAndHostPOHostname( + componentName, hostname); + if (hostComponentPO == null) { + HostPO hostPO = hostRepository.findByHostname(hostname); + + hostComponentPO = new HostComponentPO(); + hostComponentPO.setHostPO(hostPO); + hostComponentPO.setComponentPO(componentPO); + hostComponentPO.setState(MaintainState.UNINSTALLED); + hostComponentRepository.save(hostComponentPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterCreateValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterCreateValidator.java index 9787c5bd..7b0cd084 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterCreateValidator.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterCreateValidator.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.command.job.validator; import org.apache.bigtop.manager.common.enums.Command; -import org.apache.bigtop.manager.dao.entity.Cluster; +import org.apache.bigtop.manager.dao.po.ClusterPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; @@ -49,7 +49,7 @@ public void validate(ValidatorContext context) { ClusterCommandDTO clusterCommand = context.getCommandDTO().getClusterCommand(); String clusterName = clusterCommand.getClusterName(); - Optional clusterOptional = clusterRepository.findByClusterName(clusterName); + Optional clusterOptional = clusterRepository.findByClusterName(clusterName); if (clusterOptional.isPresent()) { throw new ApiException(ApiExceptionEnum.CLUSTER_IS_INSTALLED, clusterName); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterHostValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterHostValidator.java index 586d506b..bc1f9339 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterHostValidator.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ClusterHostValidator.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.command.job.validator; import org.apache.bigtop.manager.common.enums.Command; -import org.apache.bigtop.manager.dao.entity.Host; +import org.apache.bigtop.manager.dao.po.HostPO; import org.apache.bigtop.manager.dao.repository.HostRepository; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; @@ -51,9 +51,10 @@ public void validate(ValidatorContext context) { ClusterCommandDTO clusterCommand = context.getCommandDTO().getClusterCommand(); List hostnames = clusterCommand.getHostnames(); - List hosts = hostRepository.findAllByHostnameIn(hostnames); - if (CollectionUtils.isNotEmpty(hosts)) { - List existsHostnames = hosts.stream().map(Host::getHostname).toList(); + List hostPOList = hostRepository.findAllByHostnameIn(hostnames); + if (CollectionUtils.isNotEmpty(hostPOList)) { + List existsHostnames = + hostPOList.stream().map(HostPO::getHostname).toList(); throw new ApiException(ApiExceptionEnum.HOST_ASSIGNED, String.join(",", existsHostnames)); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/HostAddValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/HostAddValidator.java index c731622b..a8d59b97 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/HostAddValidator.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/HostAddValidator.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.command.job.validator; import org.apache.bigtop.manager.common.enums.Command; -import org.apache.bigtop.manager.dao.entity.Host; +import org.apache.bigtop.manager.dao.po.HostPO; import org.apache.bigtop.manager.dao.repository.HostRepository; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; @@ -51,9 +51,10 @@ public void validate(ValidatorContext context) { .map(HostCommandDTO::getHostname) .toList(); - List hosts = hostRepository.findAllByHostnameIn(hostnames); - if (CollectionUtils.isNotEmpty(hosts)) { - List existsHostnames = hosts.stream().map(Host::getHostname).toList(); + List hostPOList = hostRepository.findAllByHostnameIn(hostnames); + if (CollectionUtils.isNotEmpty(hostPOList)) { + List existsHostnames = + hostPOList.stream().map(HostPO::getHostname).toList(); throw new ApiException(ApiExceptionEnum.HOST_ASSIGNED, String.join(",", existsHostnames)); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/RequiredServicesValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/RequiredServicesValidator.java index 2f96c5fc..7a5f927e 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/RequiredServicesValidator.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/RequiredServicesValidator.java @@ -19,8 +19,8 @@ package org.apache.bigtop.manager.server.command.job.validator; import org.apache.bigtop.manager.common.enums.Command; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Service; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ServicePO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.ServiceRepository; import org.apache.bigtop.manager.server.command.CommandIdentifier; @@ -59,9 +59,9 @@ public void validate(ValidatorContext context) { List serviceCommands = commandDTO.getServiceCommands(); Long clusterId = commandDTO.getClusterId(); - Cluster cluster = clusterRepository.getReferenceById(clusterId); - String stackName = cluster.getStack().getStackName(); - String stackVersion = cluster.getStack().getStackVersion(); + ClusterPO clusterPO = clusterRepository.getReferenceById(clusterId); + String stackName = clusterPO.getStackPO().getStackName(); + String stackVersion = clusterPO.getStackPO().getStackVersion(); List serviceNames = serviceCommands.stream().map(ServiceCommandDTO::getServiceName).toList(); @@ -73,9 +73,10 @@ public void validate(ValidatorContext context) { return; } - List serviceList = serviceRepository.findByClusterIdAndServiceNameIn(clusterId, requiredServices); + List servicePOList = + serviceRepository.findByClusterPOIdAndServiceNameIn(clusterId, requiredServices); List list = - serviceList.stream().map(Service::getServiceName).toList(); + servicePOList.stream().map(ServicePO::getServiceName).toList(); requiredServices.removeAll(list); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ServiceHostValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ServiceHostValidator.java index cc2aadd6..7611e6d9 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ServiceHostValidator.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/ServiceHostValidator.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.command.job.validator; import org.apache.bigtop.manager.common.enums.Command; -import org.apache.bigtop.manager.dao.entity.Host; +import org.apache.bigtop.manager.dao.po.HostPO; import org.apache.bigtop.manager.dao.repository.HostRepository; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; @@ -56,7 +56,7 @@ public void validate(ValidatorContext context) { .flatMap(x -> x.getHostnames().stream()) .collect(Collectors.toSet()); - List hostnames = hostRepository.findAllByHostnameIn(hostnameSet); + List hostnames = hostRepository.findAllByHostnameIn(hostnameSet); if (hostnames.size() != hostnameSet.size()) { throw new ApiException(ApiExceptionEnum.HOST_NOT_FOUND); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/StackValidator.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/StackValidator.java index 80d23af5..498af0f9 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/StackValidator.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/job/validator/StackValidator.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.command.job.validator; import org.apache.bigtop.manager.common.enums.Command; -import org.apache.bigtop.manager.dao.entity.Stack; +import org.apache.bigtop.manager.dao.po.StackPO; import org.apache.bigtop.manager.dao.repository.StackRepository; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; @@ -49,8 +49,8 @@ public void validate(ValidatorContext context) { String stackName = clusterCommand.getStackName(); String stackVersion = clusterCommand.getStackVersion(); - Stack stack = stackRepository.findByStackNameAndStackVersion(stackName, stackVersion); - if (stack == null) { + StackPO stackPO = stackRepository.findByStackNameAndStackVersion(stackName, stackVersion); + if (stackPO == null) { throw new ApiException(ApiExceptionEnum.STACK_NOT_FOUND); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/DefaultJobScheduler.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/DefaultJobScheduler.java index 241dceaa..54ce12ed 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/DefaultJobScheduler.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/DefaultJobScheduler.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.command.scheduler; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; import org.apache.bigtop.manager.server.command.job.runner.JobRunner; import org.apache.bigtop.manager.server.command.job.runner.JobRunners; import org.apache.bigtop.manager.server.holder.SessionUserHolder; @@ -43,12 +43,12 @@ public class DefaultJobScheduler implements JobScheduler { private volatile boolean running = true; @Override - public void submit(Job job) { + public void submit(JobPO jobPO) { Long userId = SessionUserHolder.getUserId(); queue.offer(() -> { try { SessionUserHolder.setUserId(userId); - JobRunner runner = JobRunners.getJobRunner(job); + JobRunner runner = JobRunners.getJobRunner(jobPO); runner.run(); } finally { SessionUserHolder.clear(); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/JobScheduler.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/JobScheduler.java index 84ea00cf..4a808e46 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/JobScheduler.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/scheduler/JobScheduler.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.command.scheduler; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; /** * JobScheduler interface for job management. @@ -28,9 +28,9 @@ public interface JobScheduler { /** * Submits a job to the job scheduler. - * @param job The job to be submitted. + * @param jobPO The job to be submitted. */ - void submit(Job job); + void submit(JobPO jobPO); /** * Starts the job scheduler. diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/AbstractStageFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/AbstractStageFactory.java index d5d965e1..b272e109 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/AbstractStageFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/AbstractStageFactory.java @@ -19,25 +19,25 @@ package org.apache.bigtop.manager.server.command.stage.factory; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Stage; +import org.apache.bigtop.manager.dao.po.StagePO; public abstract class AbstractStageFactory implements StageFactory { protected StageContext context; - protected Stage stage; + protected StagePO stagePO; @Override - public Stage createStage(StageContext context) { + public StagePO createStage(StageContext context) { this.context = context; this.context.setStageType(getStageType()); - this.stage = new Stage(); - this.stage.setContext(JsonUtils.writeAsString(context)); + this.stagePO = new StagePO(); + this.stagePO.setContext(JsonUtils.writeAsString(context)); doCreateStage(); - return this.stage; + return this.stagePO; } protected abstract void doCreateStage(); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/StageFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/StageFactory.java index 1f266e7f..1d4398e1 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/StageFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/StageFactory.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.command.stage.factory; -import org.apache.bigtop.manager.dao.entity.Stage; +import org.apache.bigtop.manager.dao.po.StagePO; /** * Stage factory. @@ -38,5 +38,5 @@ public interface StageFactory { * @param context the stage context * @return the stage */ - Stage createStage(StageContext context); + StagePO createStage(StageContext context); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/component/AbstractComponentStageFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/component/AbstractComponentStageFactory.java index 508f68b0..c6b8136e 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/component/AbstractComponentStageFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/component/AbstractComponentStageFactory.java @@ -24,8 +24,8 @@ import org.apache.bigtop.manager.common.message.entity.pojo.OSSpecificInfo; import org.apache.bigtop.manager.common.message.entity.pojo.ScriptInfo; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.grpc.generated.CommandRequest; import org.apache.bigtop.manager.grpc.generated.CommandType; @@ -46,45 +46,45 @@ public abstract class AbstractComponentStageFactory extends AbstractStageFactory @Resource private ClusterRepository clusterRepository; - protected Cluster cluster; + protected ClusterPO clusterPO; @Override public void doCreateStage() { - cluster = clusterRepository.getReferenceById(context.getClusterId()); + clusterPO = clusterRepository.getReferenceById(context.getClusterId()); Command command = getCommand(); ServiceDTO serviceDTO = context.getServiceDTO(); ComponentDTO componentDTO = context.getComponentDTO(); - stage.setName(command.toCamelCase() + " " + componentDTO.getDisplayName()); - stage.setServiceName(serviceDTO.getServiceName()); - stage.setComponentName(componentDTO.getComponentName()); + stagePO.setName(command.toCamelCase() + " " + componentDTO.getDisplayName()); + stagePO.setServiceName(serviceDTO.getServiceName()); + stagePO.setComponentName(componentDTO.getComponentName()); - List tasks = new ArrayList<>(); + List taskPOList = new ArrayList<>(); for (String hostname : context.getHostnames()) { - Task task = new Task(); + TaskPO taskPO = new TaskPO(); // Required fields - task.setName(stage.getName() + " on " + hostname); - task.setHostname(hostname); - task.setCommand(command); - task.setServiceName(serviceDTO.getServiceName()); - task.setStackName(context.getStackName()); - task.setStackVersion(context.getStackVersion()); + taskPO.setName(stagePO.getName() + " on " + hostname); + taskPO.setHostname(hostname); + taskPO.setCommand(command); + taskPO.setServiceName(serviceDTO.getServiceName()); + taskPO.setStackName(context.getStackName()); + taskPO.setStackVersion(context.getStackVersion()); // Context fields - task.setComponentName(componentDTO.getComponentName()); - task.setServiceUser(serviceDTO.getServiceUser()); - task.setServiceGroup(serviceDTO.getServiceGroup()); - task.setCustomCommands(JsonUtils.writeAsString(componentDTO.getCustomCommands())); - task.setCommandScript(JsonUtils.writeAsString(componentDTO.getCommandScript())); + taskPO.setComponentName(componentDTO.getComponentName()); + taskPO.setServiceUser(serviceDTO.getServiceUser()); + taskPO.setServiceGroup(serviceDTO.getServiceGroup()); + taskPO.setCustomCommands(JsonUtils.writeAsString(componentDTO.getCustomCommands())); + taskPO.setCommandScript(JsonUtils.writeAsString(componentDTO.getCommandScript())); CommandRequest request = getMessage(serviceDTO, componentDTO, hostname, command); - task.setContent(ProtobufUtil.toJson(request)); - tasks.add(task); + taskPO.setContent(ProtobufUtil.toJson(request)); + taskPOList.add(taskPO); } - stage.setTasks(tasks); + stagePO.setTaskPOList(taskPOList); } protected abstract Command getCommand(); @@ -99,7 +99,7 @@ private CommandRequest getMessage( commandPayload.setStackName(context.getStackName()); commandPayload.setStackVersion(context.getStackVersion()); commandPayload.setComponentName(componentDTO.getComponentName()); - commandPayload.setRoot(cluster.getRoot()); + commandPayload.setRoot(clusterPO.getRoot()); commandPayload.setHostname(hostname); commandPayload.setCustomCommands(convertCustomCommandInfo(componentDTO.getCustomCommands())); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/config/CacheDistributeStageFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/config/CacheDistributeStageFactory.java index e0bbb4ba..c29066ad 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/config/CacheDistributeStageFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/config/CacheDistributeStageFactory.java @@ -19,8 +19,8 @@ package org.apache.bigtop.manager.server.command.stage.factory.config; import org.apache.bigtop.manager.common.enums.Command; -import org.apache.bigtop.manager.dao.entity.Host; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.HostPO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.HostRepository; import org.apache.bigtop.manager.server.command.stage.factory.AbstractStageFactory; import org.apache.bigtop.manager.server.command.stage.factory.StageType; @@ -54,30 +54,30 @@ public void doCreateStage() { hostnames.addAll(context.getHostnames()); } else { hostnames.addAll(context.getHostnames() == null ? List.of() : context.getHostnames()); - hostnames.addAll(hostRepository.findAllByClusterId(context.getClusterId()).stream() - .map(Host::getHostname) + hostnames.addAll(hostRepository.findAllByClusterPOId(context.getClusterId()).stream() + .map(HostPO::getHostname) .toList()); } - stage.setName("Distribute Caches"); + stagePO.setName("Distribute Caches"); - List tasks = new ArrayList<>(); + List taskPOList = new ArrayList<>(); hostnames = hostnames.stream().distinct().toList(); for (String hostname : hostnames) { - Task task = new Task(); - task.setName(stage.getName() + " on " + hostname); - task.setStackName(context.getStackName()); - task.setStackVersion(context.getStackVersion()); - task.setHostname(hostname); - task.setServiceName("cluster"); - task.setServiceUser("root"); - task.setServiceGroup("root"); - task.setComponentName("bigtop-manager-agent"); - task.setCommand(Command.CUSTOM); - task.setCustomCommand("cache_host"); - tasks.add(task); + TaskPO taskPO = new TaskPO(); + taskPO.setName(stagePO.getName() + " on " + hostname); + taskPO.setStackName(context.getStackName()); + taskPO.setStackVersion(context.getStackVersion()); + taskPO.setHostname(hostname); + taskPO.setServiceName("cluster"); + taskPO.setServiceUser("root"); + taskPO.setServiceGroup("root"); + taskPO.setComponentName("bigtop-manager-agent"); + taskPO.setCommand(Command.CUSTOM); + taskPO.setCustomCommand("cache_host"); + taskPOList.add(taskPO); } - stage.setTasks(tasks); + stagePO.setTaskPOList(taskPOList); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/host/HostCheckStageFactory.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/host/HostCheckStageFactory.java index 895ed7a2..e92b2b9b 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/host/HostCheckStageFactory.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/factory/host/HostCheckStageFactory.java @@ -21,8 +21,8 @@ import org.apache.bigtop.manager.common.enums.Command; import org.apache.bigtop.manager.common.message.entity.payload.HostCheckPayload; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.grpc.generated.CommandRequest; import org.apache.bigtop.manager.grpc.generated.CommandType; @@ -54,36 +54,36 @@ public StageType getStageType() { @Override public void doCreateStage() { if (context.getClusterId() != null) { - Cluster cluster = clusterRepository.getReferenceById(context.getClusterId()); + ClusterPO clusterPO = clusterRepository.getReferenceById(context.getClusterId()); - context.setStackName(cluster.getStack().getStackName()); - context.setStackVersion(cluster.getStack().getStackVersion()); + context.setStackName(clusterPO.getStackPO().getStackName()); + context.setStackVersion(clusterPO.getStackPO().getStackVersion()); } // Create stages - stage.setName("Check Hosts"); + stagePO.setName("Check Hosts"); - List tasks = new ArrayList<>(); + List taskPOList = new ArrayList<>(); for (String hostname : context.getHostnames()) { - Task task = new Task(); - task.setName(stage.getName() + " on " + hostname); - task.setStackName(context.getStackName()); - task.setStackVersion(context.getStackVersion()); - task.setHostname(hostname); - task.setServiceName("cluster"); - task.setServiceUser("root"); - task.setServiceGroup("root"); - task.setComponentName("bigtop-manager-agent"); - task.setCommand(Command.CUSTOM); - task.setCustomCommand("check_host"); + TaskPO taskPO = new TaskPO(); + taskPO.setName(stagePO.getName() + " on " + hostname); + taskPO.setStackName(context.getStackName()); + taskPO.setStackVersion(context.getStackVersion()); + taskPO.setHostname(hostname); + taskPO.setServiceName("cluster"); + taskPO.setServiceUser("root"); + taskPO.setServiceGroup("root"); + taskPO.setComponentName("bigtop-manager-agent"); + taskPO.setCommand(Command.CUSTOM); + taskPO.setCustomCommand("check_host"); CommandRequest request = createMessage(hostname); - task.setContent(ProtobufUtil.toJson(request)); + taskPO.setContent(ProtobufUtil.toJson(request)); - tasks.add(task); + taskPOList.add(taskPO); } - stage.setTasks(tasks); + stagePO.setTaskPOList(taskPOList); } private CommandRequest createMessage(String hostname) { diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/AbstractStageRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/AbstractStageRunner.java index 30145da8..59b46503 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/AbstractStageRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/AbstractStageRunner.java @@ -20,8 +20,8 @@ import org.apache.bigtop.manager.common.constants.MessageConstants; import org.apache.bigtop.manager.common.enums.JobState; -import org.apache.bigtop.manager.dao.entity.Stage; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.StagePO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.StageRepository; import org.apache.bigtop.manager.dao.repository.TaskRepository; import org.apache.bigtop.manager.grpc.generated.CommandReply; @@ -47,13 +47,13 @@ public abstract class AbstractStageRunner implements StageRunner { @Resource protected TaskRepository taskRepository; - protected Stage stage; + protected StagePO stagePO; protected StageContext stageContext; @Override - public void setStage(Stage stage) { - this.stage = stage; + public void setStage(StagePO stagePO) { + this.stagePO = stagePO; } @Override @@ -66,28 +66,28 @@ public void run() { beforeRun(); List> futures = new ArrayList<>(); - for (Task task : stage.getTasks()) { - beforeRunTask(task); + for (TaskPO taskPO : stagePO.getTaskPOList()) { + beforeRunTask(taskPO); - CommandRequest protoRequest = ProtobufUtil.fromJson(task.getContent(), CommandRequest.class); + CommandRequest protoRequest = ProtobufUtil.fromJson(taskPO.getContent(), CommandRequest.class); CommandRequest.Builder builder = CommandRequest.newBuilder(protoRequest); - builder.setTaskId(task.getId()); - builder.setStageId(stage.getId()); - builder.setJobId(stage.getJob().getId()); + builder.setTaskId(taskPO.getId()); + builder.setStageId(stagePO.getId()); + builder.setJobId(stagePO.getJobPO().getId()); CommandRequest request = builder.build(); futures.add(CompletableFuture.supplyAsync(() -> { CommandServiceGrpc.CommandServiceBlockingStub stub = GrpcClient.getBlockingStub( - task.getHostname(), CommandServiceGrpc.CommandServiceBlockingStub.class); + taskPO.getHostname(), CommandServiceGrpc.CommandServiceBlockingStub.class); CommandReply reply = stub.exec(request); - log.info("Execute task {} completed: {}", task.getId(), reply); + log.info("Execute task {} completed: {}", taskPO.getId(), reply); boolean taskSuccess = reply != null && reply.getCode() == MessageConstants.SUCCESS_CODE; if (taskSuccess) { - onTaskSuccess(task); + onTaskSuccess(taskPO); } else { - onTaskFailure(task); + onTaskFailure(taskPO); } return taskSuccess; @@ -115,37 +115,37 @@ public void run() { @Override public void beforeRun() { - stage.setState(JobState.PROCESSING); - stageRepository.save(stage); + stagePO.setState(JobState.PROCESSING); + stageRepository.save(stagePO); } @Override public void onSuccess() { - stage.setState(JobState.SUCCESSFUL); - stageRepository.save(stage); + stagePO.setState(JobState.SUCCESSFUL); + stageRepository.save(stagePO); } @Override public void onFailure() { - stage.setState(JobState.FAILED); - stageRepository.save(stage); + stagePO.setState(JobState.FAILED); + stageRepository.save(stagePO); } @Override - public void beforeRunTask(Task task) { - task.setState(JobState.PROCESSING); - taskRepository.save(task); + public void beforeRunTask(TaskPO taskPO) { + taskPO.setState(JobState.PROCESSING); + taskRepository.save(taskPO); } @Override - public void onTaskSuccess(Task task) { - task.setState(JobState.SUCCESSFUL); - taskRepository.save(task); + public void onTaskSuccess(TaskPO taskPO) { + taskPO.setState(JobState.SUCCESSFUL); + taskRepository.save(taskPO); } @Override - public void onTaskFailure(Task task) { - task.setState(JobState.FAILED); - taskRepository.save(task); + public void onTaskFailure(TaskPO taskPO) { + taskPO.setState(JobState.FAILED); + taskRepository.save(taskPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunner.java index e9d93057..84790395 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunner.java @@ -18,8 +18,8 @@ */ package org.apache.bigtop.manager.server.command.stage.runner; -import org.apache.bigtop.manager.dao.entity.Stage; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.StagePO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.server.command.stage.factory.StageContext; import org.apache.bigtop.manager.server.command.stage.factory.StageType; @@ -39,9 +39,9 @@ public interface StageRunner { /** * Set the stage that this runner will manage. * - * @param stage The stage to be managed by this runner. + * @param stagePO The stage to be managed by this runner. */ - void setStage(Stage stage); + void setStage(StagePO stagePO); /** * Set the context for the stage. The context may contain additional information necessary for running the stage. @@ -73,21 +73,21 @@ public interface StageRunner { /** * Method to be called before running a task in the stage. Can be used for task-specific setup and preparation. * - * @param task The task that is about to be run. + * @param taskPO The task that is about to be run. */ - void beforeRunTask(Task task); + void beforeRunTask(TaskPO taskPO); /** * Method to be called after a task in the stage has successfully run. Can be used for task-specific cleanup and finalization. * - * @param task The task that has been successfully run. + * @param taskPO The task that has been successfully run. */ - void onTaskSuccess(Task task); + void onTaskSuccess(TaskPO taskPO); /** * Method to be called if a task in the stage fails to run. Can be used for task-specific error handling and recovery. * - * @param task The task that has failed to run. + * @param taskPO The task that has failed to run. */ - void onTaskFailure(Task task); + void onTaskFailure(TaskPO taskPO); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunners.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunners.java index 1d03cbee..add659d9 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunners.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/StageRunners.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.command.stage.runner; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Stage; +import org.apache.bigtop.manager.dao.po.StagePO; import org.apache.bigtop.manager.server.command.stage.factory.StageContext; import org.apache.bigtop.manager.server.command.stage.factory.StageType; import org.apache.bigtop.manager.server.holder.SpringContextHolder; @@ -37,17 +37,17 @@ public class StageRunners { private static final Map STAGE_RUNNERS = new HashMap<>(); - public static StageRunner getStageRunner(Stage stage) { + public static StageRunner getStageRunner(StagePO stagePO) { if (!LOADED.get()) { load(); } - StageContext stageContext = JsonUtils.readFromString(stage.getContext(), StageContext.class); + StageContext stageContext = JsonUtils.readFromString(stagePO.getContext(), StageContext.class); StageType stageType = stageContext.getStageType(); String beanName = STAGE_RUNNERS.get(stageType); StageRunner runner = SpringContextHolder.getApplicationContext().getBean(beanName, StageRunner.class); - runner.setStage(stage); + runner.setStage(stagePO); runner.setStageContext(stageContext); return runner; diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentInstallStageRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentInstallStageRunner.java index 5a4d5fce..c2a15fac 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentInstallStageRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentInstallStageRunner.java @@ -19,8 +19,8 @@ package org.apache.bigtop.manager.server.command.stage.runner.component; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.HostComponent; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; import org.apache.bigtop.manager.server.command.stage.factory.StageType; import org.apache.bigtop.manager.server.command.stage.runner.AbstractStageRunner; @@ -46,16 +46,16 @@ public StageType getStageType() { } @Override - public void onTaskSuccess(Task task) { - super.onTaskSuccess(task); - - Long clusterId = task.getCluster().getId(); - String componentName = task.getComponentName(); - String hostname = task.getHostname(); - HostComponent hostComponent = - hostComponentRepository.findByComponentClusterIdAndComponentComponentNameAndHostHostname( + public void onTaskSuccess(TaskPO taskPO) { + super.onTaskSuccess(taskPO); + + Long clusterId = taskPO.getClusterPO().getId(); + String componentName = taskPO.getComponentName(); + String hostname = taskPO.getHostname(); + HostComponentPO hostComponentPO = + hostComponentRepository.findByComponentPOClusterPOIdAndComponentPOComponentNameAndHostPOHostname( clusterId, componentName, hostname); - hostComponent.setState(MaintainState.INSTALLED); - hostComponentRepository.save(hostComponent); + hostComponentPO.setState(MaintainState.INSTALLED); + hostComponentRepository.save(hostComponentPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStartStageRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStartStageRunner.java index 744de774..b070c321 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStartStageRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStartStageRunner.java @@ -19,8 +19,8 @@ package org.apache.bigtop.manager.server.command.stage.runner.component; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.HostComponent; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; import org.apache.bigtop.manager.server.command.stage.factory.StageType; import org.apache.bigtop.manager.server.command.stage.runner.AbstractStageRunner; @@ -46,17 +46,17 @@ public StageType getStageType() { } @Override - public void onTaskSuccess(Task task) { - super.onTaskSuccess(task); + public void onTaskSuccess(TaskPO taskPO) { + super.onTaskSuccess(taskPO); - Long clusterId = task.getCluster().getId(); - String componentName = task.getComponentName(); - String hostname = task.getHostname(); - HostComponent hostComponent = - hostComponentRepository.findByComponentClusterIdAndComponentComponentNameAndHostHostname( + Long clusterId = taskPO.getClusterPO().getId(); + String componentName = taskPO.getComponentName(); + String hostname = taskPO.getHostname(); + HostComponentPO hostComponentPO = + hostComponentRepository.findByComponentPOClusterPOIdAndComponentPOComponentNameAndHostPOHostname( clusterId, componentName, hostname); - hostComponent.setState(MaintainState.STARTED); - hostComponentRepository.save(hostComponent); + hostComponentPO.setState(MaintainState.STARTED); + hostComponentRepository.save(hostComponentPO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStopStageRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStopStageRunner.java index 1d9c2791..9ebfbf45 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStopStageRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/component/ComponentStopStageRunner.java @@ -19,8 +19,8 @@ package org.apache.bigtop.manager.server.command.stage.runner.component; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.HostComponent; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; import org.apache.bigtop.manager.server.command.stage.factory.StageType; import org.apache.bigtop.manager.server.command.stage.runner.AbstractStageRunner; @@ -46,16 +46,16 @@ public StageType getStageType() { } @Override - public void onTaskSuccess(Task task) { - super.onTaskSuccess(task); - - Long clusterId = task.getCluster().getId(); - String componentName = task.getComponentName(); - String hostname = task.getHostname(); - HostComponent hostComponent = - hostComponentRepository.findByComponentClusterIdAndComponentComponentNameAndHostHostname( + public void onTaskSuccess(TaskPO taskPO) { + super.onTaskSuccess(taskPO); + + Long clusterId = taskPO.getClusterPO().getId(); + String componentName = taskPO.getComponentName(); + String hostname = taskPO.getHostname(); + HostComponentPO hostComponentPO = + hostComponentRepository.findByComponentPOClusterPOIdAndComponentPOComponentNameAndHostPOHostname( clusterId, componentName, hostname); - hostComponent.setState(MaintainState.STOPPED); - hostComponentRepository.save(hostComponent); + hostComponentPO.setState(MaintainState.STOPPED); + hostComponentRepository.save(hostComponentPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/config/CacheDistributeStageRunner.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/config/CacheDistributeStageRunner.java index 9ea07088..a4cc566a 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/config/CacheDistributeStageRunner.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/command/stage/runner/config/CacheDistributeStageRunner.java @@ -24,16 +24,16 @@ import org.apache.bigtop.manager.common.message.entity.pojo.ComponentInfo; import org.apache.bigtop.manager.common.message.entity.pojo.RepoInfo; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Component; -import org.apache.bigtop.manager.dao.entity.Host; -import org.apache.bigtop.manager.dao.entity.HostComponent; -import org.apache.bigtop.manager.dao.entity.Repo; -import org.apache.bigtop.manager.dao.entity.Service; -import org.apache.bigtop.manager.dao.entity.ServiceConfig; -import org.apache.bigtop.manager.dao.entity.Setting; -import org.apache.bigtop.manager.dao.entity.Task; -import org.apache.bigtop.manager.dao.entity.TypeConfig; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ComponentPO; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.HostPO; +import org.apache.bigtop.manager.dao.po.RepoPO; +import org.apache.bigtop.manager.dao.po.ServiceConfigPO; +import org.apache.bigtop.manager.dao.po.ServicePO; +import org.apache.bigtop.manager.dao.po.SettingPO; +import org.apache.bigtop.manager.dao.po.TaskPO; +import org.apache.bigtop.manager.dao.po.TypeConfigPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.ComponentRepository; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; @@ -122,106 +122,108 @@ public StageType getStageType() { } @Override - public void beforeRunTask(Task task) { - super.beforeRunTask(task); + public void beforeRunTask(TaskPO taskPO) { + super.beforeRunTask(taskPO); // Generate task content before execute - updateTask(task); + updateTask(taskPO); } - private void updateTask(Task task) { + private void updateTask(TaskPO taskPO) { if (stageContext.getClusterId() == null) { genEmptyCaches(); } else { genCaches(); } - CommandRequest request = getMessage(task.getHostname()); - task.setContent(ProtobufUtil.toJson(request)); + CommandRequest request = getMessage(taskPO.getHostname()); + taskPO.setContent(ProtobufUtil.toJson(request)); - taskRepository.save(task); + taskRepository.save(taskPO); } private void genCaches() { - Cluster cluster = clusterRepository.getReferenceById(stageContext.getClusterId()); + ClusterPO clusterPO = clusterRepository.getReferenceById(stageContext.getClusterId()); - Long clusterId = cluster.getId(); - String clusterName = cluster.getClusterName(); - String stackName = cluster.getStack().getStackName(); - String stackVersion = cluster.getStack().getStackVersion(); + Long clusterId = clusterPO.getId(); + String clusterName = clusterPO.getClusterName(); + String stackName = clusterPO.getStackPO().getStackName(); + String stackVersion = clusterPO.getStackPO().getStackVersion(); - List services = serviceRepository.findAllByClusterId(clusterId); - List serviceConfigList = serviceConfigRepository.findAllByClusterAndSelectedIsTrue(cluster); - List hostComponents = hostComponentRepository.findAllByComponentClusterId(clusterId); - List repos = repoRepository.findAllByCluster(cluster); - Iterable settings = settingRepository.findAll(); - List hostList = hostRepository.findAllByClusterId(clusterId); + List servicePOList = serviceRepository.findAllByClusterPOId(clusterId); + List serviceConfigPOList = + serviceConfigRepository.findAllByClusterPOAndSelectedIsTrue(clusterPO); + List hostComponentPOList = hostComponentRepository.findAllByComponentPOClusterPOId(clusterId); + List repoPOList = repoRepository.findAllByClusterPO(clusterPO); + Iterable settings = settingRepository.findAll(); + List hostPOList = hostRepository.findAllByClusterPOId(clusterId); clusterInfo = new ClusterInfo(); clusterInfo.setClusterName(clusterName); clusterInfo.setStackName(stackName); clusterInfo.setStackVersion(stackVersion); - clusterInfo.setUserGroup(cluster.getUserGroup()); - clusterInfo.setRepoTemplate(cluster.getRepoTemplate()); - clusterInfo.setRoot(cluster.getRoot()); - clusterInfo.setPackages(List.of(cluster.getPackages().split(","))); + clusterInfo.setUserGroup(clusterPO.getUserGroup()); + clusterInfo.setRepoTemplate(clusterPO.getRepoTemplate()); + clusterInfo.setRoot(clusterPO.getRoot()); + clusterInfo.setPackages(List.of(clusterPO.getPackages().split(","))); serviceConfigMap = new HashMap<>(); - for (ServiceConfig serviceConfig : serviceConfigList) { - for (TypeConfig typeConfig : serviceConfig.getConfigs()) { + for (ServiceConfigPO serviceConfigPO : serviceConfigPOList) { + for (TypeConfigPO typeConfigPO : serviceConfigPO.getConfigs()) { List properties = - JsonUtils.readFromString(typeConfig.getPropertiesJson(), new TypeReference<>() {}); + JsonUtils.readFromString(typeConfigPO.getPropertiesJson(), new TypeReference<>() {}); String configMapStr = JsonUtils.writeAsString(StackConfigUtils.extractConfigMap(properties)); - if (serviceConfigMap.containsKey(serviceConfig.getService().getServiceName())) { + if (serviceConfigMap.containsKey(serviceConfigPO.getServicePO().getServiceName())) { serviceConfigMap - .get(serviceConfig.getService().getServiceName()) - .put(typeConfig.getTypeName(), configMapStr); + .get(serviceConfigPO.getServicePO().getServiceName()) + .put(typeConfigPO.getTypeName(), configMapStr); } else { Map hashMap = new HashMap<>(); - hashMap.put(typeConfig.getTypeName(), configMapStr); - serviceConfigMap.put(serviceConfig.getService().getServiceName(), hashMap); + hashMap.put(typeConfigPO.getTypeName(), configMapStr); + serviceConfigMap.put(serviceConfigPO.getServicePO().getServiceName(), hashMap); } } } hostMap = new HashMap<>(); - hostComponents.forEach(x -> { - if (hostMap.containsKey(x.getComponent().getComponentName())) { - hostMap.get(x.getComponent().getComponentName()).add(x.getHost().getHostname()); + hostComponentPOList.forEach(x -> { + if (hostMap.containsKey(x.getComponentPO().getComponentName())) { + hostMap.get(x.getComponentPO().getComponentName()) + .add(x.getHostPO().getHostname()); } else { Set set = new HashSet<>(); - set.add(x.getHost().getHostname()); - hostMap.put(x.getComponent().getComponentName(), set); + set.add(x.getHostPO().getHostname()); + hostMap.put(x.getComponentPO().getComponentName(), set); } - hostMap.get(x.getComponent().getComponentName()).add(x.getHost().getHostname()); + hostMap.get(x.getComponentPO().getComponentName()).add(x.getHostPO().getHostname()); }); - Set hostNameSet = hostList.stream().map(Host::getHostname).collect(Collectors.toSet()); + Set hostNameSet = hostPOList.stream().map(HostPO::getHostname).collect(Collectors.toSet()); hostMap.put(ALL_HOST_KEY, hostNameSet); repoList = new ArrayList<>(); - repos.forEach(repo -> { - RepoInfo repoInfo = RepoConverter.INSTANCE.fromEntity2Message(repo); + repoPOList.forEach(repoPO -> { + RepoInfo repoInfo = RepoConverter.INSTANCE.fromPO2Message(repoPO); repoList.add(repoInfo); }); userMap = new HashMap<>(); - services.forEach(x -> userMap.put(x.getServiceUser(), Set.of(x.getServiceGroup()))); + servicePOList.forEach(x -> userMap.put(x.getServiceUser(), Set.of(x.getServiceGroup()))); settingsMap = new HashMap<>(); settings.forEach(x -> settingsMap.put(x.getTypeName(), x.getConfigData())); componentInfoMap = new HashMap<>(); - List componentList = componentRepository.findAll(); - componentList.forEach(c -> { + List componentPOList = componentRepository.findAll(); + componentPOList.forEach(c -> { ComponentInfo componentInfo = new ComponentInfo(); componentInfo.setComponentName(c.getComponentName()); componentInfo.setCommandScript(c.getCommandScript()); componentInfo.setDisplayName(c.getDisplayName()); componentInfo.setCategory(c.getCategory()); componentInfo.setCustomCommands(c.getCustomCommands()); - componentInfo.setServiceName(c.getService().getServiceName()); + componentInfo.setServiceName(c.getServicePO().getServiceName()); componentInfoMap.put(c.getComponentName(), componentInfo); }); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ClusterConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ClusterConverter.java index 3482a191..635181e4 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ClusterConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ClusterConverter.java @@ -18,8 +18,8 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Stack; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.StackPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.ClusterDTO; import org.apache.bigtop.manager.server.model.dto.StackDTO; @@ -41,12 +41,12 @@ public interface ClusterConverter { ClusterDTO fromCommand2DTO(ClusterCommandDTO clusterCommandDTO); - Cluster fromDTO2Entity(ClusterDTO clusterDTO); + ClusterPO fromDTO2PO(ClusterDTO clusterDTO); - @Mapping(target = "stackName", source = "cluster.stack.stackName") - @Mapping(target = "stackVersion", source = "cluster.stack.stackVersion") - ClusterVO fromEntity2VO(Cluster cluster); + @Mapping(target = "stackName", source = "stackPO.stackName") + @Mapping(target = "stackVersion", source = "stackPO.stackVersion") + ClusterVO fromEntity2VO(ClusterPO clusterPO); - @Mapping(target = "stack", expression = "java(stack)") - Cluster fromDTO2Entity(ClusterDTO clusterDTO, StackDTO stackDTO, @Context Stack stack); + @Mapping(target = "stackPO", expression = "java(stackPO)") + ClusterPO fromDTO2PO(ClusterDTO clusterDTO, StackDTO stackDTO, @Context StackPO stackPO); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ComponentConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ComponentConverter.java index cf408259..d630b2a0 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ComponentConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ComponentConverter.java @@ -18,9 +18,9 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Component; -import org.apache.bigtop.manager.dao.entity.Service; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ComponentPO; +import org.apache.bigtop.manager.dao.po.ServicePO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.ComponentDTO; import org.apache.bigtop.manager.server.model.vo.ComponentVO; @@ -43,9 +43,9 @@ public interface ComponentConverter { @Mapping(target = "commandScript", source = "commandScript", qualifiedByName = "obj2Json") @Mapping(target = "customCommands", source = "customCommands", qualifiedByName = "obj2Json") @Mapping(target = "quickLink", source = "quickLink", qualifiedByName = "obj2Json") - @Mapping(target = "service", expression = "java(service)") - @Mapping(target = "cluster", expression = "java(cluster)") - Component fromDTO2Entity(ComponentDTO componentDTO, @Context Service service, @Context Cluster cluster); + @Mapping(target = "servicePO", expression = "java(servicePO)") + @Mapping(target = "clusterPO", expression = "java(clusterPO)") + ComponentPO fromDTO2PO(ComponentDTO componentDTO, @Context ServicePO servicePO, @Context ClusterPO clusterPO); ComponentVO fromDTO2VO(ComponentDTO componentDTO); @@ -54,9 +54,9 @@ public interface ComponentConverter { @Mapping(target = "componentName", source = "name") ComponentDTO fromModel2DTO(ComponentModel componentModel); - @Mapping(target = "serviceName", source = "service.serviceName") - @Mapping(target = "clusterName", source = "cluster.clusterName") - ComponentVO fromEntity2VO(Component component); + @Mapping(target = "serviceName", source = "servicePO.serviceName") + @Mapping(target = "clusterName", source = "clusterPO.clusterName") + ComponentVO fromPO2VO(ComponentPO componentPO); - List fromEntity2VO(List components); + List fromPO2VO(List componentPOList); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostComponentConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostComponentConverter.java index c8050f10..1ed9df1a 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostComponentConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostComponentConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.HostComponent; +import org.apache.bigtop.manager.dao.po.HostComponentPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.vo.HostComponentVO; @@ -33,13 +33,13 @@ public interface HostComponentConverter { HostComponentConverter INSTANCE = Mappers.getMapper(HostComponentConverter.class); - @Mapping(target = "componentName", source = "component.componentName") - @Mapping(target = "displayName", source = "component.displayName") - @Mapping(target = "category", source = "component.category") - @Mapping(target = "serviceName", source = "component.service.serviceName") - @Mapping(target = "clusterName", source = "component.cluster.clusterName") - @Mapping(target = "hostname", source = "host.hostname") - HostComponentVO fromEntity2VO(HostComponent hostComponent); + @Mapping(target = "componentName", source = "componentPO.componentName") + @Mapping(target = "displayName", source = "componentPO.displayName") + @Mapping(target = "category", source = "componentPO.category") + @Mapping(target = "serviceName", source = "componentPO.servicePO.serviceName") + @Mapping(target = "clusterName", source = "componentPO.clusterPO.clusterName") + @Mapping(target = "hostname", source = "hostPO.hostname") + HostComponentVO fromPO2VO(HostComponentPO hostComponentPO); - List fromEntity2VO(List hostComponents); + List fromPO2VO(List hostComponentPOList); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostConverter.java index 0b12cf30..175555bc 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/HostConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Host; +import org.apache.bigtop.manager.dao.po.HostPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.HostDTO; import org.apache.bigtop.manager.server.model.req.HostReq; @@ -37,10 +37,10 @@ public interface HostConverter { HostDTO fromReq2DTO(HostReq hostReq); - Host fromDTO2Entity(HostDTO hostDTO); + HostPO fromDTO2PO(HostDTO hostDTO); - @Mapping(target = "clusterName", source = "cluster.clusterName") - HostVO fromEntity2VO(Host host); + @Mapping(target = "clusterName", source = "clusterPO.clusterName") + HostVO fromPO2VO(HostPO hostPO); - List fromEntity2VO(List hosts); + List fromPO2VO(List hostPOList); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/JobConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/JobConverter.java index 6fbb2211..aaac4ded 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/JobConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/JobConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.vo.CommandVO; import org.apache.bigtop.manager.server.model.vo.JobVO; @@ -38,9 +38,10 @@ public interface JobConverter { @Mapping(target = "createTime", source = "createTime", dateFormat = "yyyy-MM-dd HH:mm:ss") @Mapping(target = "updateTime", source = "updateTime", dateFormat = "yyyy-MM-dd HH:mm:ss") - JobVO fromEntity2VO(Job job); + @Mapping(target = "stages", source = "stagePOList") + JobVO fromPO2VO(JobPO jobPO); - List fromEntity2VO(List job); + List fromPO2VO(List jobPO); - CommandVO fromEntity2CommandVO(Job job); + CommandVO fromPO2CommandVO(JobPO jobPO); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/RepoConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/RepoConverter.java index a7a5e347..4f1e2100 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/RepoConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/RepoConverter.java @@ -19,8 +19,8 @@ package org.apache.bigtop.manager.server.model.converter; import org.apache.bigtop.manager.common.message.entity.pojo.RepoInfo; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Repo; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.RepoPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.RepoDTO; @@ -36,13 +36,13 @@ public interface RepoConverter { RepoConverter INSTANCE = Mappers.getMapper(RepoConverter.class); - @Mapping(target = "cluster", expression = "java(cluster)") - Repo fromDTO2Entity(RepoDTO repoDTO, @Context Cluster cluster); + @Mapping(target = "clusterPO", expression = "java(clusterPO)") + RepoPO fromDTO2PO(RepoDTO repoDTO, @Context ClusterPO clusterPO); - @Mapping(target = "cluster", expression = "java(cluster)") - List fromDTO2Entity(List repoDTOList, @Context Cluster cluster); + @Mapping(target = "clusterPO", expression = "java(clusterPO)") + List fromDTO2PO(List repoDTOList, @Context ClusterPO clusterPO); - RepoInfo fromEntity2Message(Repo repo); + RepoInfo fromPO2Message(RepoPO repoPO); List fromDTO2Message(List repoDTOs); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConfigConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConfigConverter.java index 58256764..a5a29f43 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConfigConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConfigConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.ServiceConfig; +import org.apache.bigtop.manager.dao.po.ServiceConfigPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.vo.ServiceConfigVO; @@ -35,9 +35,8 @@ public interface ServiceConfigConverter { ServiceConfigConverter INSTANCE = Mappers.getMapper(ServiceConfigConverter.class); - @Mapping(target = "serviceName", source = "service.serviceName") - @Mapping(target = "configs", source = "configs", qualifiedByName = "fromEntity2VO") - ServiceConfigVO fromEntity2VO(ServiceConfig serviceConfig); + @Mapping(target = "serviceName", source = "servicePO.serviceName") + ServiceConfigVO fromPO2VO(ServiceConfigPO serviceConfigPO); - List fromEntity2VO(List serviceConfigs); + List fromPO2VO(List serviceConfigPOList); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConverter.java index ca9b69cd..90550767 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/ServiceConverter.java @@ -18,8 +18,8 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Service; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ServicePO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.ServiceDTO; import org.apache.bigtop.manager.server.model.vo.ServiceVO; @@ -41,8 +41,8 @@ public interface ServiceConverter { @Mapping(target = "osSpecifics", source = "osSpecifics", qualifiedByName = "obj2Json") @Mapping(target = "requiredServices", source = "requiredServices", qualifiedByName = "obj2Json") - @Mapping(target = "cluster", expression = "java(cluster)") - Service fromDTO2Entity(ServiceDTO serviceDTO, @Context Cluster cluster); + @Mapping(target = "clusterPO", expression = "java(clusterPO)") + ServicePO fromDTO2PO(ServiceDTO serviceDTO, @Context ClusterPO clusterPO); ServiceVO fromDTO2VO(ServiceDTO serviceDTO); @@ -56,8 +56,8 @@ public interface ServiceConverter { ServiceDTO fromModel2DTO(ServiceModel serviceModel); @Mapping(target = "requiredServices", source = "requiredServices", qualifiedByName = "json2List") - @Mapping(target = "clusterName", source = "cluster.clusterName") - ServiceVO fromEntity2VO(Service service); + @Mapping(target = "clusterName", source = "clusterPO.clusterName") + ServiceVO fromPO2VO(ServicePO servicePO); - List fromEntity2VO(List services); + List fromPO2VO(List servicePOList); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StackConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StackConverter.java index b28985ae..2db76ccd 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StackConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StackConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Stack; +import org.apache.bigtop.manager.dao.po.StackPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.StackDTO; import org.apache.bigtop.manager.server.model.vo.StackVO; @@ -32,7 +32,7 @@ public interface StackConverter { StackConverter INSTANCE = Mappers.getMapper(StackConverter.class); - StackVO fromEntity2VO(Stack stack); + StackVO fromPO2VO(StackPO stackPO); StackVO fromDTO2VO(StackDTO stackDTO); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StageConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StageConverter.java index 0ceaa1e3..65a43802 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StageConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/StageConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Stage; +import org.apache.bigtop.manager.dao.po.StagePO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.vo.StageVO; @@ -35,5 +35,6 @@ public interface StageConverter { @Mapping(target = "createTime", source = "createTime", dateFormat = "yyyy-MM-dd HH:mm:ss") @Mapping(target = "updateTime", source = "updateTime", dateFormat = "yyyy-MM-dd HH:mm:ss") - StageVO fromEntity2VO(Stage stage); + @Mapping(target = "tasks", source = "taskPOList") + StageVO fromPO2VO(StagePO stagePO); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TaskConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TaskConverter.java index dbd96313..97ab4578 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TaskConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TaskConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.vo.TaskVO; @@ -33,5 +33,5 @@ public interface TaskConverter { @Mapping(target = "createTime", source = "createTime", dateFormat = "yyyy-MM-dd HH:mm:ss") @Mapping(target = "updateTime", source = "updateTime", dateFormat = "yyyy-MM-dd HH:mm:ss") - TaskVO fromEntity2VO(Task task); + TaskVO fromPO2VO(TaskPO taskPO); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TypeConfigConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TypeConfigConverter.java index e9938520..69712797 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TypeConfigConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/TypeConfigConverter.java @@ -18,14 +18,13 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.TypeConfig; +import org.apache.bigtop.manager.dao.po.TypeConfigPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.TypeConfigDTO; import org.apache.bigtop.manager.server.model.vo.TypeConfigVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; -import org.mapstruct.Named; import org.mapstruct.factory.Mappers; import java.util.List; @@ -38,17 +37,16 @@ public interface TypeConfigConverter { TypeConfigConverter INSTANCE = Mappers.getMapper(TypeConfigConverter.class); @Mapping(target = "properties", source = "propertiesJson", qualifiedByName = "json2PropertyDTOList") - TypeConfigDTO fromEntity2DTO(TypeConfig typeConfig); + TypeConfigDTO fromPO2DTO(TypeConfigPO typeConfigPO); - List fromEntity2DTO(List typeConfigs); + List fromPO2DTO(List typeConfigPOList); TypeConfigVO fromDTO2VO(TypeConfigDTO typeConfigDTO); List fromDTO2VO(List typeConfigDTOList); @Mapping(target = "properties", source = "propertiesJson", qualifiedByName = "json2PropertyVOList") - TypeConfigVO fromEntity2VO(TypeConfig typeConfig); + TypeConfigVO fromPO2VO(TypeConfigPO typeConfigPO); - @Named("fromEntity2VO") - List fromEntity2VO(List typeConfigs); + List fromPO2VO(List typeConfigPOList); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/UserConverter.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/UserConverter.java index 828ef219..a7cf141d 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/UserConverter.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/converter/UserConverter.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.model.converter; -import org.apache.bigtop.manager.dao.entity.User; +import org.apache.bigtop.manager.dao.po.UserPO; import org.apache.bigtop.manager.server.config.MapStructSharedConfig; import org.apache.bigtop.manager.server.model.dto.UserDTO; import org.apache.bigtop.manager.server.model.req.UserReq; @@ -35,7 +35,7 @@ public interface UserConverter { @Mapping(target = "createTime", source = "createTime", dateFormat = "yyyy-MM-dd HH:mm:ss") @Mapping(target = "updateTime", source = "updateTime", dateFormat = "yyyy-MM-dd HH:mm:ss") - UserVO fromEntity2VO(User user); + UserVO fromPO2VO(UserPO userPO); UserDTO fromReq2DTO(UserReq userReq); } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PageVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PageVO.java index e2cbef63..cd8cd56d 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PageVO.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/PageVO.java @@ -49,10 +49,11 @@ public static PageVO of(Page page) { if (page.hasContent()) { try { Class clz = (Class) page.getContent().get(0).getClass(); - String className = "org.apache.bigtop.manager.server.model.mapper." + clz.getSimpleName() + "Mapper"; + String className = "org.apache.bigtop.manager.server.model.converter." + + clz.getSimpleName().replace("PO", "") + "Converter"; Class mapper = Class.forName(className); Object o = Mappers.getMapper(mapper); - Method method = o.getClass().getDeclaredMethod("fromEntity2VO", List.class); + Method method = o.getClass().getDeclaredMethod("fromPO2VO", List.class); content = (List) method.invoke(o, page.getContent()); } catch (Exception e) { throw new ServerException(e); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java index 3bd0b6f4..9759865b 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/ComponentStatusScheduler.java @@ -19,12 +19,12 @@ package org.apache.bigtop.manager.server.scheduler; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Component; -import org.apache.bigtop.manager.dao.entity.Host; -import org.apache.bigtop.manager.dao.entity.HostComponent; -import org.apache.bigtop.manager.dao.entity.Service; -import org.apache.bigtop.manager.dao.entity.Stack; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ComponentPO; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.HostPO; +import org.apache.bigtop.manager.dao.po.ServicePO; +import org.apache.bigtop.manager.dao.po.StackPO; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; import org.apache.bigtop.manager.grpc.generated.ComponentStatusReply; import org.apache.bigtop.manager.grpc.generated.ComponentStatusRequest; @@ -50,40 +50,40 @@ public class ComponentStatusScheduler { @Async @Scheduled(fixedDelay = 30, timeUnit = TimeUnit.SECONDS) public void execute() { - List hostComponentList = hostComponentRepository.findAll(); - for (HostComponent hostComponent : hostComponentList) { + List hostComponentPOList = hostComponentRepository.findAll(); + for (HostComponentPO hostComponentPO : hostComponentPOList) { // Only check services which should be in running - if (!List.of(MaintainState.STARTED, MaintainState.STOPPED).contains(hostComponent.getState())) { + if (!List.of(MaintainState.STARTED, MaintainState.STOPPED).contains(hostComponentPO.getState())) { continue; } - Host host = hostComponent.getHost(); - Component component = hostComponent.getComponent(); - Service service = component.getService(); - Cluster cluster = host.getCluster(); - Stack stack = cluster.getStack(); + HostPO hostPO = hostComponentPO.getHostPO(); + ComponentPO componentPO = hostComponentPO.getComponentPO(); + ServicePO servicePO = componentPO.getServicePO(); + ClusterPO clusterPO = hostPO.getClusterPO(); + StackPO stackPO = clusterPO.getStackPO(); ComponentStatusRequest request = ComponentStatusRequest.newBuilder() - .setServiceName(service.getServiceName()) - .setComponentName(component.getComponentName()) - .setCommandScript(component.getCommandScript()) - .setRoot(cluster.getRoot()) - .setStackName(stack.getStackName()) - .setStackVersion(stack.getStackVersion()) + .setServiceName(servicePO.getServiceName()) + .setComponentName(componentPO.getComponentName()) + .setCommandScript(componentPO.getCommandScript()) + .setRoot(clusterPO.getRoot()) + .setStackName(stackPO.getStackName()) + .setStackVersion(stackPO.getStackVersion()) .build(); ComponentStatusServiceGrpc.ComponentStatusServiceBlockingStub blockingStub = GrpcClient.getBlockingStub( - host.getHostname(), ComponentStatusServiceGrpc.ComponentStatusServiceBlockingStub.class); + hostPO.getHostname(), ComponentStatusServiceGrpc.ComponentStatusServiceBlockingStub.class); ComponentStatusReply reply = blockingStub.getComponentStatus(request); // Status 0 means the service is running - if (reply.getStatus() == 0 && hostComponent.getState() == MaintainState.STOPPED) { - hostComponent.setState(MaintainState.STARTED); - hostComponentRepository.save(hostComponent); + if (reply.getStatus() == 0 && hostComponentPO.getState() == MaintainState.STOPPED) { + hostComponentPO.setState(MaintainState.STARTED); + hostComponentRepository.save(hostComponentPO); } - if (reply.getStatus() != 0 && hostComponent.getState() == MaintainState.STARTED) { - hostComponent.setState(MaintainState.STOPPED); - hostComponentRepository.save(hostComponent); + if (reply.getStatus() != 0 && hostComponentPO.getState() == MaintainState.STARTED) { + hostComponentPO.setState(MaintainState.STOPPED); + hostComponentRepository.save(hostComponentPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java index 6561459c..7c0b9377 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/scheduler/HostInfoScheduler.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.scheduler; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.Host; +import org.apache.bigtop.manager.dao.po.HostPO; import org.apache.bigtop.manager.dao.repository.HostRepository; import org.apache.bigtop.manager.grpc.generated.HostInfoReply; import org.apache.bigtop.manager.grpc.generated.HostInfoRequest; @@ -46,35 +46,35 @@ public class HostInfoScheduler { @Async @Scheduled(fixedDelay = 30, timeUnit = TimeUnit.SECONDS) public void execute() { - List hosts = hostRepository.findAll(); - for (Host host : hosts) { - getHostInfo(host); + List hostPOList = hostRepository.findAll(); + for (HostPO hostPO : hostPOList) { + getHostInfo(hostPO); } } - private void getHostInfo(Host host) { - String hostname = host.getHostname(); + private void getHostInfo(HostPO hostPO) { + String hostname = hostPO.getHostname(); try { HostInfoServiceGrpc.HostInfoServiceBlockingStub stub = GrpcClient.getBlockingStub(hostname, HostInfoServiceGrpc.HostInfoServiceBlockingStub.class); HostInfoReply reply = stub.getHostInfo(HostInfoRequest.newBuilder().build()); - host.setArch(reply.getArch()); - host.setAvailableProcessors(reply.getAvailableProcessors()); - host.setIpv4(reply.getIpv4()); - host.setIpv6(reply.getIpv6()); - host.setOs(reply.getOs()); - host.setFreeMemorySize(reply.getFreeMemorySize()); - host.setTotalMemorySize(reply.getTotalMemorySize()); - host.setFreeDisk(reply.getFreeDisk()); - host.setTotalDisk(reply.getTotalDisk()); + hostPO.setArch(reply.getArch()); + hostPO.setAvailableProcessors(reply.getAvailableProcessors()); + hostPO.setIpv4(reply.getIpv4()); + hostPO.setIpv6(reply.getIpv6()); + hostPO.setOs(reply.getOs()); + hostPO.setFreeMemorySize(reply.getFreeMemorySize()); + hostPO.setTotalMemorySize(reply.getTotalMemorySize()); + hostPO.setFreeDisk(reply.getFreeDisk()); + hostPO.setTotalDisk(reply.getTotalDisk()); - host.setState(MaintainState.STARTED); + hostPO.setState(MaintainState.STARTED); } catch (Exception e) { log.error("Error getting host info", e); - host.setState(MaintainState.STOPPED); + hostPO.setState(MaintainState.STOPPED); } - hostRepository.save(host); + hostRepository.save(hostPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java index 6254ed35..74a57605 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ClusterServiceImpl.java @@ -19,9 +19,9 @@ package org.apache.bigtop.manager.server.service.impl; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Repo; -import org.apache.bigtop.manager.dao.entity.Stack; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.RepoPO; +import org.apache.bigtop.manager.dao.po.StackPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.RepoRepository; import org.apache.bigtop.manager.dao.repository.StackRepository; @@ -72,54 +72,55 @@ public List list() { @Override public ClusterVO save(ClusterDTO clusterDTO) { // Save cluster - Stack stack = + StackPO stackPO = stackRepository.findByStackNameAndStackVersion(clusterDTO.getStackName(), clusterDTO.getStackVersion()); StackDTO stackDTO = StackUtils.getStackKeyMap() .get(StackUtils.fullStackName(clusterDTO.getStackName(), clusterDTO.getStackVersion())) .getLeft(); - Cluster cluster = ClusterConverter.INSTANCE.fromDTO2Entity(clusterDTO, stackDTO, stack); - cluster.setSelected(clusterRepository.count() == 0); - cluster.setState(MaintainState.UNINSTALLED); - - Cluster oldCluster = - clusterRepository.findByClusterName(clusterDTO.getClusterName()).orElse(new Cluster()); - if (oldCluster.getId() != null) { - cluster.setId(oldCluster.getId()); + ClusterPO clusterPO = ClusterConverter.INSTANCE.fromDTO2PO(clusterDTO, stackDTO, stackPO); + clusterPO.setSelected(clusterRepository.count() == 0); + clusterPO.setState(MaintainState.UNINSTALLED); + + ClusterPO oldClusterPO = + clusterRepository.findByClusterName(clusterDTO.getClusterName()).orElse(new ClusterPO()); + if (oldClusterPO.getId() != null) { + clusterPO.setId(oldClusterPO.getId()); } - clusterRepository.save(cluster); + clusterRepository.save(clusterPO); - hostService.batchSave(cluster.getId(), clusterDTO.getHostnames()); + hostService.batchSave(clusterPO.getId(), clusterDTO.getHostnames()); // Save repo - List repos = RepoConverter.INSTANCE.fromDTO2Entity(clusterDTO.getRepoInfoList(), cluster); - List oldRepos = repoRepository.findAllByCluster(cluster); - - for (Repo repo : repos) { - for (Repo oldRepo : oldRepos) { - if (oldRepo.getArch().equals(repo.getArch()) && oldRepo.getOs().equals(repo.getOs())) { - repo.setId(oldRepo.getId()); + List repoPOList = RepoConverter.INSTANCE.fromDTO2PO(clusterDTO.getRepoInfoList(), clusterPO); + List oldrepoPOList = repoRepository.findAllByClusterPO(clusterPO); + + for (RepoPO repoPO : repoPOList) { + for (RepoPO oldRepoPO : oldrepoPOList) { + if (oldRepoPO.getArch().equals(repoPO.getArch()) + && oldRepoPO.getOs().equals(repoPO.getOs())) { + repoPO.setId(oldRepoPO.getId()); } } } - repoRepository.saveAll(repos); - return ClusterConverter.INSTANCE.fromEntity2VO(cluster); + repoRepository.saveAll(repoPOList); + return ClusterConverter.INSTANCE.fromEntity2VO(clusterPO); } @Override public ClusterVO get(Long id) { - Cluster cluster = + ClusterPO clusterPO = clusterRepository.findById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.CLUSTER_NOT_FOUND)); - return ClusterConverter.INSTANCE.fromEntity2VO(cluster); + return ClusterConverter.INSTANCE.fromEntity2VO(clusterPO); } @Override public ClusterVO update(Long id, ClusterDTO clusterDTO) { - Cluster cluster = ClusterConverter.INSTANCE.fromDTO2Entity(clusterDTO); - cluster.setId(id); - clusterRepository.save(cluster); + ClusterPO clusterPO = ClusterConverter.INSTANCE.fromDTO2PO(clusterDTO); + clusterPO.setId(id); + clusterRepository.save(clusterPO); - return ClusterConverter.INSTANCE.fromEntity2VO(cluster); + return ClusterConverter.INSTANCE.fromEntity2VO(clusterPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java index 11606093..9eb8037a 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/CommandServiceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.service.impl; -import org.apache.bigtop.manager.dao.entity.Job; +import org.apache.bigtop.manager.dao.po.JobPO; import org.apache.bigtop.manager.server.command.CommandIdentifier; import org.apache.bigtop.manager.server.command.job.factory.JobContext; import org.apache.bigtop.manager.server.command.job.factory.JobFactories; @@ -56,11 +56,11 @@ public CommandVO command(CommandDTO commandDTO) { JobContext jobContext = new JobContext(); jobContext.setCommandDTO(commandDTO); JobFactory jobFactory = JobFactories.getJobFactory(commandIdentifier); - Job job = jobFactory.createJob(jobContext); + JobPO jobPO = jobFactory.createJob(jobContext); // Submit job - jobScheduler.submit(job); + jobScheduler.submit(jobPO); - return JobConverter.INSTANCE.fromEntity2CommandVO(job); + return JobConverter.INSTANCE.fromPO2CommandVO(jobPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java index 2a4ad270..20526c2c 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ComponentServiceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.service.impl; -import org.apache.bigtop.manager.dao.entity.Component; +import org.apache.bigtop.manager.dao.po.ComponentPO; import org.apache.bigtop.manager.dao.repository.ComponentRepository; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; import org.apache.bigtop.manager.server.exception.ApiException; @@ -44,8 +44,8 @@ public class ComponentServiceImpl implements ComponentService { @Override public List list(Long clusterId) { List componentVOList = new ArrayList<>(); - componentRepository.findAllByClusterId(clusterId).forEach(component -> { - ComponentVO componentVO = ComponentConverter.INSTANCE.fromEntity2VO(component); + componentRepository.findAllByClusterPOId(clusterId).forEach(component -> { + ComponentVO componentVO = ComponentConverter.INSTANCE.fromPO2VO(component); componentVOList.add(componentVO); }); @@ -54,9 +54,9 @@ public List list(Long clusterId) { @Override public ComponentVO get(Long id) { - Component component = componentRepository + ComponentPO componentPO = componentRepository .findById(id) .orElseThrow(() -> new ApiException(ApiExceptionEnum.COMPONENT_NOT_FOUND)); - return ComponentConverter.INSTANCE.fromEntity2VO(component); + return ComponentConverter.INSTANCE.fromPO2VO(componentPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java index d80bf959..45a51dac 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ConfigServiceImpl.java @@ -19,10 +19,10 @@ package org.apache.bigtop.manager.server.service.impl; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Service; -import org.apache.bigtop.manager.dao.entity.ServiceConfig; -import org.apache.bigtop.manager.dao.entity.TypeConfig; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ServiceConfigPO; +import org.apache.bigtop.manager.dao.po.ServicePO; +import org.apache.bigtop.manager.dao.po.TypeConfigPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.ServiceConfigRepository; import org.apache.bigtop.manager.dao.repository.ServiceRepository; @@ -59,50 +59,50 @@ public class ConfigServiceImpl implements ConfigService { @Override public List list(Long clusterId) { - Cluster cluster = clusterRepository.getReferenceById(clusterId); + ClusterPO clusterPO = clusterRepository.getReferenceById(clusterId); Sort sort = Sort.by(Sort.Direction.DESC, "version"); - List list = serviceConfigRepository.findAllByCluster(cluster, sort); - return ServiceConfigConverter.INSTANCE.fromEntity2VO(list); + List list = serviceConfigRepository.findAllByClusterPO(clusterPO, sort); + return ServiceConfigConverter.INSTANCE.fromPO2VO(list); } @Override public List latest(Long clusterId) { - Cluster cluster = clusterRepository.getReferenceById(clusterId); - List list = serviceConfigRepository.findAllByClusterAndSelectedIsTrue(cluster); - return ServiceConfigConverter.INSTANCE.fromEntity2VO(list); + ClusterPO clusterPO = clusterRepository.getReferenceById(clusterId); + List list = serviceConfigRepository.findAllByClusterPOAndSelectedIsTrue(clusterPO); + return ServiceConfigConverter.INSTANCE.fromPO2VO(list); } @Override public void upsert(Long clusterId, Long serviceId, List configs) { // Save configs - Cluster cluster = clusterRepository.getReferenceById(clusterId); - Service service = serviceRepository.getReferenceById(serviceId); - ServiceConfig serviceCurrentConfig = findServiceCurrentConfig(cluster, service); + ClusterPO clusterPO = clusterRepository.getReferenceById(clusterId); + ServicePO servicePO = serviceRepository.getReferenceById(serviceId); + ServiceConfigPO serviceCurrentConfig = findServiceCurrentConfig(clusterPO, servicePO); if (serviceCurrentConfig == null) { // Add config for new service - addServiceConfig(cluster, service, configs); + addServiceConfig(clusterPO, servicePO, configs); } else { // Upsert config for existing service - upsertServiceConfig(cluster, service, serviceCurrentConfig, configs); + upsertServiceConfig(clusterPO, servicePO, serviceCurrentConfig, configs); } } - private ServiceConfig findServiceCurrentConfig(Cluster cluster, Service service) { - return serviceConfigRepository.findByClusterAndServiceAndSelectedIsTrue(cluster, service); + private ServiceConfigPO findServiceCurrentConfig(ClusterPO clusterPO, ServicePO servicePO) { + return serviceConfigRepository.findByClusterPOAndServicePOAndSelectedIsTrue(clusterPO, servicePO); } private void upsertServiceConfig( - Cluster cluster, Service service, ServiceConfig currentConfig, List configs) { - List existConfigs = TypeConfigConverter.INSTANCE.fromEntity2DTO(currentConfig.getConfigs()); + ClusterPO clusterPO, ServicePO servicePO, ServiceConfigPO currentConfig, List configs) { + List existConfigs = TypeConfigConverter.INSTANCE.fromPO2DTO(currentConfig.getConfigs()); if (shouldUpdateConfig(existConfigs, configs)) { // Unselect current config currentConfig.setSelected(false); serviceConfigRepository.save(currentConfig); // Create a new config - String configDesc = "Update config for " + service.getServiceName(); + String configDesc = "Update config for " + servicePO.getServiceName(); Integer version = currentConfig.getVersion() + 1; - addServiceConfig(cluster, service, configs, configDesc, version); + addServiceConfig(clusterPO, servicePO, configs, configDesc, version); } } @@ -124,30 +124,30 @@ private Boolean shouldUpdateConfig(List existConfigs, List configs) { - String configDesc = "Initial config for " + service.getServiceName(); + private void addServiceConfig(ClusterPO clusterPO, ServicePO servicePO, List configs) { + String configDesc = "Initial config for " + servicePO.getServiceName(); Integer version = 1; - addServiceConfig(cluster, service, configs, configDesc, version); + addServiceConfig(clusterPO, servicePO, configs, configDesc, version); } private void addServiceConfig( - Cluster cluster, Service service, List configs, String configDesc, Integer version) { - ServiceConfig serviceConfig = new ServiceConfig(); - serviceConfig.setCluster(cluster); - serviceConfig.setService(service); - serviceConfig.setConfigDesc(configDesc); - serviceConfig.setVersion(version); - serviceConfig.setSelected(true); - serviceConfigRepository.save(serviceConfig); + ClusterPO clusterPO, ServicePO servicePO, List configs, String configDesc, Integer version) { + ServiceConfigPO serviceConfigPO = new ServiceConfigPO(); + serviceConfigPO.setClusterPO(clusterPO); + serviceConfigPO.setServicePO(servicePO); + serviceConfigPO.setConfigDesc(configDesc); + serviceConfigPO.setVersion(version); + serviceConfigPO.setSelected(true); + serviceConfigRepository.save(serviceConfigPO); for (TypeConfigDTO typeConfigDTO : configs) { String typeName = typeConfigDTO.getTypeName(); List properties = typeConfigDTO.getProperties(); - TypeConfig typeConfig = new TypeConfig(); - typeConfig.setTypeName(typeName); - typeConfig.setPropertiesJson(JsonUtils.writeAsString(properties)); - typeConfig.setServiceConfig(serviceConfig); - typeConfigRepository.save(typeConfig); + TypeConfigPO typeConfigPO = new TypeConfigPO(); + typeConfigPO.setTypeName(typeName); + typeConfigPO.setPropertiesJson(JsonUtils.writeAsString(properties)); + typeConfigPO.setServiceConfigPO(serviceConfigPO); + typeConfigRepository.save(typeConfigPO); } } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java index 9c7c7d23..72b093e1 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostComponentServiceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.service.impl; -import org.apache.bigtop.manager.dao.entity.HostComponent; +import org.apache.bigtop.manager.dao.po.HostComponentPO; import org.apache.bigtop.manager.dao.repository.ComponentRepository; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; import org.apache.bigtop.manager.dao.repository.HostRepository; @@ -48,21 +48,21 @@ public class HostComponentServiceImpl implements HostComponentService { @Override public List list(Long clusterId) { - List hostComponentList = hostComponentRepository.findAllByComponentClusterId(clusterId); - return HostComponentConverter.INSTANCE.fromEntity2VO(hostComponentList); + List hostComponentPOList = hostComponentRepository.findAllByComponentPOClusterPOId(clusterId); + return HostComponentConverter.INSTANCE.fromPO2VO(hostComponentPOList); } @Override public List listByHost(Long clusterId, Long hostId) { - List hostComponentList = - hostComponentRepository.findAllByComponentClusterIdAndHostId(clusterId, clusterId); - return HostComponentConverter.INSTANCE.fromEntity2VO(hostComponentList); + List hostComponentPOList = + hostComponentRepository.findAllByComponentPOClusterPOIdAndHostPOId(clusterId, clusterId); + return HostComponentConverter.INSTANCE.fromPO2VO(hostComponentPOList); } @Override public List listByService(Long clusterId, Long serviceId) { - List hostComponentList = - hostComponentRepository.findAllByComponentClusterIdAndComponentServiceId(clusterId, serviceId); - return HostComponentConverter.INSTANCE.fromEntity2VO(hostComponentList); + List hostComponentPOList = + hostComponentRepository.findAllByComponentPOClusterPOIdAndComponentPOServicePOId(clusterId, serviceId); + return HostComponentConverter.INSTANCE.fromPO2VO(hostComponentPOList); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java index c219af69..2cdfc979 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/HostServiceImpl.java @@ -19,8 +19,8 @@ package org.apache.bigtop.manager.server.service.impl; import org.apache.bigtop.manager.common.enums.MaintainState; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Host; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.HostPO; import org.apache.bigtop.manager.dao.repository.ClusterRepository; import org.apache.bigtop.manager.dao.repository.HostRepository; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; @@ -55,55 +55,57 @@ public class HostServiceImpl implements HostService { @Override public List list(Long clusterId) { - List hosts = hostRepository.findAllByClusterId(clusterId); - if (CollectionUtils.isEmpty(hosts)) { + List hostPOList = hostRepository.findAllByClusterPOId(clusterId); + if (CollectionUtils.isEmpty(hostPOList)) { throw new ApiException(ApiExceptionEnum.HOST_NOT_FOUND); } - return HostConverter.INSTANCE.fromEntity2VO(hosts); + return HostConverter.INSTANCE.fromPO2VO(hostPOList); } @Override public List batchSave(Long clusterId, List hostnames) { - Cluster cluster = clusterRepository.getReferenceById(clusterId); + ClusterPO clusterPO = clusterRepository.getReferenceById(clusterId); - List hostnameIn = hostRepository.findAllByHostnameIn(hostnames); - List hosts = new ArrayList<>(); + List hostnameIn = hostRepository.findAllByHostnameIn(hostnames); + List hostPOList = new ArrayList<>(); - Map hostInMap = hostnameIn.stream().collect(Collectors.toMap(Host::getHostname, host -> host)); + Map hostInMap = + hostnameIn.stream().collect(Collectors.toMap(HostPO::getHostname, host -> host)); for (String hostname : hostnames) { - Host host = new Host(); - host.setHostname(hostname); - host.setCluster(cluster); - host.setState(MaintainState.INSTALLED); + HostPO hostPO = new HostPO(); + hostPO.setHostname(hostname); + hostPO.setClusterPO(clusterPO); + hostPO.setState(MaintainState.INSTALLED); if (hostInMap.containsKey(hostname)) { - host.setId(hostInMap.get(hostname).getId()); + hostPO.setId(hostInMap.get(hostname).getId()); } - hosts.add(host); + hostPOList.add(hostPO); } - hostRepository.saveAll(hosts); + hostRepository.saveAll(hostPOList); - return HostConverter.INSTANCE.fromEntity2VO(hosts); + return HostConverter.INSTANCE.fromPO2VO(hostPOList); } @Override public HostVO get(Long id) { - Host host = hostRepository.findById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.HOST_NOT_FOUND)); + HostPO hostPO = + hostRepository.findById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.HOST_NOT_FOUND)); - return HostConverter.INSTANCE.fromEntity2VO(host); + return HostConverter.INSTANCE.fromPO2VO(hostPO); } @Override public HostVO update(Long id, HostDTO hostDTO) { - Host host = HostConverter.INSTANCE.fromDTO2Entity(hostDTO); - host.setId(id); - hostRepository.save(host); + HostPO hostPO = HostConverter.INSTANCE.fromDTO2PO(hostDTO); + hostPO.setId(id); + hostRepository.save(hostPO); - return HostConverter.INSTANCE.fromEntity2VO(host); + return HostConverter.INSTANCE.fromPO2VO(hostPO); } @Override diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java index 28ef3ad9..fa9fb930 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/JobServiceImpl.java @@ -19,9 +19,9 @@ package org.apache.bigtop.manager.server.service.impl; import org.apache.bigtop.manager.common.enums.JobState; -import org.apache.bigtop.manager.dao.entity.Job; -import org.apache.bigtop.manager.dao.entity.Stage; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.JobPO; +import org.apache.bigtop.manager.dao.po.StagePO; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.JobRepository; import org.apache.bigtop.manager.dao.repository.StageRepository; import org.apache.bigtop.manager.dao.repository.TaskRepository; @@ -62,11 +62,11 @@ public class JobServiceImpl implements JobService { public PageVO list(Long clusterId) { PageQuery pageQuery = PageUtils.getPageQuery(); Pageable pageable = PageRequest.of(pageQuery.getPageNum(), pageQuery.getPageSize(), pageQuery.getSort()); - Page page; + Page page; if (ClusterUtils.isNoneCluster(clusterId)) { - page = jobRepository.findAllByClusterIsNull(pageable); + page = jobRepository.findAllByClusterPOIsNull(pageable); } else { - page = jobRepository.findAllByClusterId(clusterId, pageable); + page = jobRepository.findAllByClusterPOId(clusterId, pageable); } return PageVO.of(page); @@ -74,31 +74,31 @@ public PageVO list(Long clusterId) { @Override public JobVO get(Long id) { - Job job = jobRepository.getReferenceById(id); - return JobConverter.INSTANCE.fromEntity2VO(job); + JobPO jobPO = jobRepository.getReferenceById(id); + return JobConverter.INSTANCE.fromPO2VO(jobPO); } @Override public JobVO retry(Long id) { - Job job = jobRepository.getReferenceById(id); - if (job.getState() != JobState.FAILED) { + JobPO jobPO = jobRepository.getReferenceById(id); + if (jobPO.getState() != JobState.FAILED) { throw new ApiException(ApiExceptionEnum.JOB_NOT_RETRYABLE); } - for (Stage stage : job.getStages()) { - for (Task task : stage.getTasks()) { - task.setState(JobState.PENDING); - taskRepository.save(task); + for (StagePO stagePO : jobPO.getStagePOList()) { + for (TaskPO taskPO : stagePO.getTaskPOList()) { + taskPO.setState(JobState.PENDING); + taskRepository.save(taskPO); } - stage.setState(JobState.PENDING); - stageRepository.save(stage); + stagePO.setState(JobState.PENDING); + stageRepository.save(stagePO); } - job.setState(JobState.PENDING); - jobRepository.save(job); - jobScheduler.submit(job); + jobPO.setState(JobState.PENDING); + jobRepository.save(jobPO); + jobScheduler.submit(jobPO); - return JobConverter.INSTANCE.fromEntity2VO(job); + return JobConverter.INSTANCE.fromPO2VO(jobPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java index 6fc5de9b..2d8ac259 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/LoginServiceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.service.impl; -import org.apache.bigtop.manager.dao.entity.User; +import org.apache.bigtop.manager.dao.po.UserPO; import org.apache.bigtop.manager.dao.repository.UserRepository; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; import org.apache.bigtop.manager.server.exception.ApiException; @@ -39,16 +39,16 @@ public class LoginServiceImpl implements LoginService { @Override public LoginVO login(LoginDTO loginDTO) { - User user = userRepository.findByUsername(loginDTO.getUsername()); - if (user == null || !loginDTO.getPassword().equalsIgnoreCase(user.getPassword())) { + UserPO userPO = userRepository.findByUsername(loginDTO.getUsername()); + if (userPO == null || !loginDTO.getPassword().equalsIgnoreCase(userPO.getPassword())) { throw new ApiException(ApiExceptionEnum.INCORRECT_USERNAME_OR_PASSWORD); } - if (!user.getStatus()) { + if (!userPO.getStatus()) { throw new ApiException(ApiExceptionEnum.USER_IS_DISABLED); } - String token = JWTUtils.generateToken(user.getId(), user.getUsername()); + String token = JWTUtils.generateToken(userPO.getId(), userPO.getUsername()); LoginVO loginVO = new LoginVO(); loginVO.setToken(token); diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java index 724a1eae..30889a0e 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/ServiceServiceImpl.java @@ -21,13 +21,13 @@ import org.apache.bigtop.manager.common.constants.ComponentCategories; import org.apache.bigtop.manager.common.enums.MaintainState; import org.apache.bigtop.manager.common.utils.JsonUtils; -import org.apache.bigtop.manager.dao.entity.Cluster; -import org.apache.bigtop.manager.dao.entity.Component; -import org.apache.bigtop.manager.dao.entity.Host; -import org.apache.bigtop.manager.dao.entity.HostComponent; -import org.apache.bigtop.manager.dao.entity.Service; -import org.apache.bigtop.manager.dao.entity.ServiceConfig; -import org.apache.bigtop.manager.dao.entity.TypeConfig; +import org.apache.bigtop.manager.dao.po.ClusterPO; +import org.apache.bigtop.manager.dao.po.ComponentPO; +import org.apache.bigtop.manager.dao.po.HostComponentPO; +import org.apache.bigtop.manager.dao.po.HostPO; +import org.apache.bigtop.manager.dao.po.ServiceConfigPO; +import org.apache.bigtop.manager.dao.po.ServicePO; +import org.apache.bigtop.manager.dao.po.TypeConfigPO; import org.apache.bigtop.manager.dao.repository.HostComponentRepository; import org.apache.bigtop.manager.dao.repository.ServiceConfigRepository; import org.apache.bigtop.manager.dao.repository.ServiceRepository; @@ -66,29 +66,29 @@ public class ServiceServiceImpl implements ServiceService { @Override public List list(Long clusterId) { List res = new ArrayList<>(); - List hostComponentList = hostComponentRepository.findAllByComponentClusterId(clusterId); - Map> serviceIdToHostComponent = hostComponentList.stream() - .collect(Collectors.groupingBy(hostComponent -> - hostComponent.getComponent().getService().getId())); - - for (Map.Entry> entry : serviceIdToHostComponent.entrySet()) { - List hostComponents = entry.getValue(); - Service service = hostComponents.get(0).getComponent().getService(); - ServiceVO serviceVO = ServiceConverter.INSTANCE.fromEntity2VO(service); + Map> serviceIdToHostComponent = + hostComponentRepository.findAllByComponentPOClusterPOId(clusterId).stream() + .collect(Collectors.groupingBy(hostComponent -> + hostComponent.getComponentPO().getServicePO().getId())); + + for (Map.Entry> entry : serviceIdToHostComponent.entrySet()) { + List hostComponentPOList = entry.getValue(); + ServicePO servicePO = hostComponentPOList.get(0).getComponentPO().getServicePO(); + ServiceVO serviceVO = ServiceConverter.INSTANCE.fromPO2VO(servicePO); serviceVO.setQuickLinks(new ArrayList<>()); boolean isHealthy = true; boolean isClient = true; - for (HostComponent hostComponent : hostComponents) { - Component component = hostComponent.getComponent(); + for (HostComponentPO hostComponentPO : hostComponentPOList) { + ComponentPO componentPO = hostComponentPO.getComponentPO(); - String quickLink = component.getQuickLink(); + String quickLink = componentPO.getQuickLink(); if (StringUtils.isNotBlank(quickLink)) { - QuickLinkVO quickLinkVO = resolveQuickLink(hostComponent, quickLink); + QuickLinkVO quickLinkVO = resolveQuickLink(hostComponentPO, quickLink); serviceVO.getQuickLinks().add(quickLinkVO); } - String category = component.getCategory(); + String category = componentPO.getCategory(); if (!category.equalsIgnoreCase(ComponentCategories.CLIENT)) { isClient = false; } @@ -96,7 +96,7 @@ public List list(Long clusterId) { MaintainState expectedState = category.equalsIgnoreCase(ComponentCategories.CLIENT) ? MaintainState.INSTALLED : MaintainState.STARTED; - if (!hostComponent.getState().equals(expectedState)) { + if (!hostComponentPO.getState().equals(expectedState)) { isHealthy = false; } } @@ -111,40 +111,40 @@ public List list(Long clusterId) { @Override public ServiceVO get(Long id) { - Service service = serviceRepository.findById(id).orElse(new Service()); - return ServiceConverter.INSTANCE.fromEntity2VO(service); + ServicePO servicePO = serviceRepository.findById(id).orElse(new ServicePO()); + return ServiceConverter.INSTANCE.fromPO2VO(servicePO); } - private QuickLinkVO resolveQuickLink(HostComponent hostComponent, String quickLinkJson) { + private QuickLinkVO resolveQuickLink(HostComponentPO hostComponentPO, String quickLinkJson) { QuickLinkVO quickLinkVO = new QuickLinkVO(); QuickLinkDTO quickLinkDTO = JsonUtils.readFromString(quickLinkJson, QuickLinkDTO.class); quickLinkVO.setDisplayName(quickLinkDTO.getDisplayName()); - Component component = hostComponent.getComponent(); - Cluster cluster = component.getCluster(); - Host host = hostComponent.getHost(); - Service service = component.getService(); - ServiceConfig serviceConfig = - serviceConfigRepository.findByClusterAndServiceAndSelectedIsTrue(cluster, service); - List typeConfigs = serviceConfig.getConfigs(); + ComponentPO componentPO = hostComponentPO.getComponentPO(); + ClusterPO clusterPO = componentPO.getClusterPO(); + HostPO hostPO = hostComponentPO.getHostPO(); + ServicePO servicePO = componentPO.getServicePO(); + ServiceConfigPO serviceConfigPO = + serviceConfigRepository.findByClusterPOAndServicePOAndSelectedIsTrue(clusterPO, servicePO); + List typeConfigPOList = serviceConfigPO.getConfigs(); // Use HTTP for now, need to handle https in the future - for (TypeConfig typeConfig : typeConfigs) { - TypeConfigDTO typeConfigDTO = TypeConfigConverter.INSTANCE.fromEntity2DTO(typeConfig); + for (TypeConfigPO typeConfigPO : typeConfigPOList) { + TypeConfigDTO typeConfigDTO = TypeConfigConverter.INSTANCE.fromPO2DTO(typeConfigPO); for (PropertyDTO propertyDTO : typeConfigDTO.getProperties()) { if (propertyDTO.getName().equals(quickLinkDTO.getHttpPortProperty())) { String port = propertyDTO.getValue().contains(":") ? propertyDTO.getValue().split(":")[1] : propertyDTO.getValue(); - String url = "http://" + host.getHostname() + ":" + port; + String url = "http://" + hostPO.getHostname() + ":" + port; quickLinkVO.setUrl(url); return quickLinkVO; } } } - String url = "http://" + host.getHostname() + ":" + quickLinkDTO.getHttpPortDefault(); + String url = "http://" + hostPO.getHostname() + ":" + quickLinkDTO.getHttpPortDefault(); quickLinkVO.setUrl(url); return quickLinkVO; } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/TaskLogServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/TaskLogServiceImpl.java index 7d91360a..62b5613a 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/TaskLogServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/TaskLogServiceImpl.java @@ -19,7 +19,7 @@ package org.apache.bigtop.manager.server.service.impl; import org.apache.bigtop.manager.common.enums.JobState; -import org.apache.bigtop.manager.dao.entity.Task; +import org.apache.bigtop.manager.dao.po.TaskPO; import org.apache.bigtop.manager.dao.repository.TaskRepository; import org.apache.bigtop.manager.grpc.generated.TaskLogReply; import org.apache.bigtop.manager.grpc.generated.TaskLogRequest; @@ -41,13 +41,13 @@ public class TaskLogServiceImpl implements TaskLogService { private TaskRepository taskRepository; public void registerSink(Long taskId, FluxSink sink) { - Task task = taskRepository.getReferenceById(taskId); - String hostname = task.getHostname(); + TaskPO taskPO = taskRepository.getReferenceById(taskId); + String hostname = taskPO.getHostname(); - if (task.getState() == JobState.PENDING || task.getState() == JobState.CANCELED) { + if (taskPO.getState() == JobState.PENDING || taskPO.getState() == JobState.CANCELED) { new Thread(() -> { sink.next("There is no log when task is in status: " - + task.getState().name().toLowerCase() + + taskPO.getState().name().toLowerCase() + ", please reopen the window when status changed"); sink.complete(); }) diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java index b1f0abdc..c8165fce 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/service/impl/UserServiceImpl.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.service.impl; -import org.apache.bigtop.manager.dao.entity.User; +import org.apache.bigtop.manager.dao.po.UserPO; import org.apache.bigtop.manager.dao.repository.UserRepository; import org.apache.bigtop.manager.server.enums.ApiExceptionEnum; import org.apache.bigtop.manager.server.exception.ApiException; @@ -41,16 +41,16 @@ public class UserServiceImpl implements UserService { @Override public UserVO current() { Long id = SessionUserHolder.getUserId(); - User user = userRepository.findById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.NEED_LOGIN)); - return UserConverter.INSTANCE.fromEntity2VO(user); + UserPO userPO = userRepository.findById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.NEED_LOGIN)); + return UserConverter.INSTANCE.fromPO2VO(userPO); } @Override public UserVO update(UserDTO userDTO) { Long id = SessionUserHolder.getUserId(); - User user = userRepository.findById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.NEED_LOGIN)); - user.setNickname(userDTO.getNickname()); - userRepository.save(user); - return UserConverter.INSTANCE.fromEntity2VO(user); + UserPO userPO = userRepository.findById(id).orElseThrow(() -> new ApiException(ApiExceptionEnum.NEED_LOGIN)); + userPO.setNickname(userDTO.getNickname()); + userRepository.save(userPO); + return UserConverter.INSTANCE.fromPO2VO(userPO); } } diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java index 9e77ee42..b3c76c8b 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/StackInitializer.java @@ -18,7 +18,7 @@ */ package org.apache.bigtop.manager.server.stack; -import org.apache.bigtop.manager.dao.entity.Stack; +import org.apache.bigtop.manager.dao.po.StackPO; import org.apache.bigtop.manager.dao.repository.StackRepository; import org.apache.bigtop.manager.server.model.dto.ServiceDTO; import org.apache.bigtop.manager.server.model.dto.StackDTO; @@ -58,13 +58,13 @@ public void onApplicationEvent(@Nonnull ApplicationStartedEvent event) { String stackName = stackDTO.getStackName(); String stackVersion = stackDTO.getStackVersion(); - Stack stack = stackRepository.findByStackNameAndStackVersion(stackName, stackVersion); - if (stack == null) { - stack = new Stack(); - stack.setStackName(stackName); - stack.setStackVersion(stackVersion); + StackPO stackPO = stackRepository.findByStackNameAndStackVersion(stackName, stackVersion); + if (stackPO == null) { + stackPO = new StackPO(); + stackPO.setStackName(stackName); + stackPO.setStackVersion(stackVersion); - stackRepository.save(stack); + stackRepository.save(stackPO); } }