diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java index cf3b96ba98..a9798c91f1 100644 --- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java +++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/ScheduleEntity.java @@ -33,7 +33,7 @@ public class ScheduleEntity implements Serializable { private String inlongGroupId; // schedule type, support [normal, crontab], 0 for normal and 1 for crontab private Integer scheduleType; - // schedule engine type, support [Quartz, Airflow, Dolphinscheduler] + // schedule engine type, support [Quartz, Airflow, DolphinScheduler] private String scheduleEngine; // time unit for offline task schedule interval, support [month, week, day, hour, minute, oneround] // Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java index 7413d5f47a..194bf35454 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/group/InlongGroupRequest.java @@ -135,8 +135,8 @@ public abstract class InlongGroupRequest extends BaseInlongGroup { @ApiModelProperty("Schedule type") private Integer scheduleType; - // schedule engine type, support [Quartz, Airflow, Dolphinscheduler] - @ApiModelProperty(value = "Schedule engine, support Quartz, Airflow and Dolphinscheduler") + // schedule engine type, support [Quartz, Airflow, DolphinScheduler] + @ApiModelProperty(value = "Schedule engine, support Quartz, Airflow and DolphinScheduler") @Length(min = 1, max = 20, message = "length must be between 1 and 20") private String scheduleEngine; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java index 45c7736501..b6527cf308 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfo.java @@ -30,7 +30,6 @@ import java.sql.Timestamp; import java.util.Objects; -import org.hibernate.validator.constraints.Length; @Data @Builder @@ -51,7 +50,7 @@ public class ScheduleInfo { @ApiModelProperty("Schedule type") private Integer scheduleType; - // schedule engine type, support [Quartz, Airflow, Dolphinscheduler] + // schedule engine type, support [Quartz, Airflow, DolphinScheduler] @ApiModelProperty("Schedule engine") private String scheduleEngine; diff --git a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java index 1f7a6e7353..882b490cf1 100644 --- a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java +++ b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/schedule/ScheduleInfoRequest.java @@ -27,7 +27,6 @@ import java.sql.Timestamp; import java.util.Objects; -import org.hibernate.validator.constraints.Length; @Data @ApiModel("Schedule request") @@ -45,7 +44,7 @@ public class ScheduleInfoRequest { @ApiModelProperty("Schedule type") private Integer scheduleType; - // schedule engine type, support [Quartz, Airflow, Dolphinscheduler] + // schedule engine type, support [Quartz, Airflow, DolphinScheduler] @ApiModelProperty(value = "Schedule engine") private String scheduleEngine; diff --git a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql index 8da64b60ae..1d92f14f46 100644 --- a/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql +++ b/inlong-manager/manager-test/src/main/resources/h2/apache_inlong_manager.sql @@ -992,7 +992,7 @@ CREATE TABLE IF NOT EXISTS `schedule_config` `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `inlong_group_id` varchar(256) NOT NULL COMMENT 'Inlong group id, undeleted ones cannot be repeated', `schedule_type` int(4) NOT NULL DEFAULT '0' COMMENT 'Schedule type, 0 for normal, 1 for crontab', - `schedule_engine` varchar(64) NOT NULL DEFAULT 'Quartz' COMMENT 'Schedule engine, support Quartz, Airflow and Dolphinscheduler', + `schedule_engine` varchar(64) NOT NULL DEFAULT 'Quartz' COMMENT 'Schedule engine, support Quartz, Airflow and DolphinScheduler', `schedule_unit` varchar(64) DEFAULT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround', `schedule_interval` int(11) DEFAULT '1' COMMENT 'Schedule interval', `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Start time for schedule', diff --git a/inlong-manager/manager-web/sql/apache_inlong_manager.sql b/inlong-manager/manager-web/sql/apache_inlong_manager.sql index 83ae4a37bd..58259c9047 100644 --- a/inlong-manager/manager-web/sql/apache_inlong_manager.sql +++ b/inlong-manager/manager-web/sql/apache_inlong_manager.sql @@ -1045,7 +1045,7 @@ CREATE TABLE IF NOT EXISTS `schedule_config` `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'Incremental primary key', `inlong_group_id` varchar(256) NOT NULL COMMENT 'Inlong group id, undeleted ones cannot be repeated', `schedule_type` int(4) NOT NULL DEFAULT '0' COMMENT 'Schedule type, 0 for normal, 1 for crontab', - `schedule_engine` varchar(64) NOT NULL DEFAULT 'Quartz' COMMENT 'Schedule engine, support Quartz, Airflow and Dolphinscheduler', + `schedule_engine` varchar(64) NOT NULL DEFAULT 'Quartz' COMMENT 'Schedule engine, support Quartz, Airflow and DolphinScheduler', `schedule_unit` varchar(64) DEFAULT NULL COMMENT 'Schedule unit, Y=year, M=month, W=week, D=day, H=hour, I=minute, O=oneround', `schedule_interval` int(11) DEFAULT '1' COMMENT 'Schedule interval', `start_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Start time for schedule', diff --git a/inlong-manager/manager-web/sql/changes-2.1.0.sql b/inlong-manager/manager-web/sql/changes-2.1.0.sql index e35a58b342..0d4c984778 100644 --- a/inlong-manager/manager-web/sql/changes-2.1.0.sql +++ b/inlong-manager/manager-web/sql/changes-2.1.0.sql @@ -24,4 +24,4 @@ SET FOREIGN_KEY_CHECKS = 0; USE `apache_inlong_manager`; ALTER TABLE `schedule_config` - ADD COLUMN `schedule_engine` varchar(64) NOT NULL DEFAULT 'Quartz' COMMENT 'Schedule engine, support Quartz, Airflow and Dolphinscheduler'; + ADD COLUMN `schedule_engine` varchar(64) NOT NULL DEFAULT 'Quartz' COMMENT 'Schedule engine, support Quartz, Airflow and DolphinScheduler';