From 71c491a80d054c9668dd362e00325e1f057a92c7 Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Wed, 17 Jan 2024 21:23:03 +0800 Subject: [PATCH] (improvement)(headless) Extend data source parameters (placeholder and require) (#643) --- .../pojo/ClickHouseParametersBuilder.java | 24 ++++++++------- .../server/pojo/DatabaseParameter.java | 7 +++-- .../server/pojo/H2ParametersBuilder.java | 28 ++++++++--------- .../server/pojo/MysqlParametersBuilder.java | 30 +++++++++++-------- .../pojo/PostgresqlParametersBuilder.java | 30 +++++++++---------- 5 files changed, 62 insertions(+), 57 deletions(-) diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClickHouseParametersBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClickHouseParametersBuilder.java index 601b89738..f77600374 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClickHouseParametersBuilder.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/ClickHouseParametersBuilder.java @@ -14,30 +14,34 @@ public class ClickHouseParametersBuilder implements DbParametersBuilder { public List build() { List databaseParameters = new ArrayList<>(); DatabaseParameter host = new DatabaseParameter(); + host.setComment("host"); host.setName("host"); - host.setEnName("host"); - host.setComment("请输入host"); + host.setPlaceholder("请输入host"); databaseParameters.add(host); DatabaseParameter port = new DatabaseParameter(); + port.setComment("port"); port.setName("port"); - port.setEnName("port"); - port.setComment("请输入端口号"); + port.setPlaceholder("请输入端口号"); databaseParameters.add(port); DatabaseParameter userName = new DatabaseParameter(); - userName.setName("用户名"); - userName.setEnName("username"); + userName.setComment("用户名"); + userName.setName("username"); + userName.setPlaceholder("请输入用户名"); databaseParameters.add(userName); DatabaseParameter password = new DatabaseParameter(); - password.setName("密码"); - password.setEnName("password"); + password.setComment("密码"); + password.setName("password"); + password.setPlaceholder("请输入密码"); databaseParameters.add(password); DatabaseParameter database = new DatabaseParameter(); - database.setName("数据库名称"); - database.setEnName("database"); + database.setComment("数据库名称"); + database.setName("database"); + database.setPlaceholder("请输入数据库名称"); + database.setRequire(false); databaseParameters.add(database); return databaseParameters; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DatabaseParameter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DatabaseParameter.java index e9b07d02a..e4163d8c6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DatabaseParameter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DatabaseParameter.java @@ -12,8 +12,9 @@ import lombok.NoArgsConstructor; public class DatabaseParameter { private String name; - private String enName; private String comment; - private String defaultValue; - + private String placeholder; + private String value; + private String dataType = "string"; + private Boolean require = true; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/H2ParametersBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/H2ParametersBuilder.java index 5ee50a82d..7aa9638ee 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/H2ParametersBuilder.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/H2ParametersBuilder.java @@ -14,30 +14,28 @@ public class H2ParametersBuilder implements DbParametersBuilder { public List build() { List databaseParameters = new ArrayList<>(); DatabaseParameter host = new DatabaseParameter(); - host.setName("链接"); - host.setEnName("url"); - host.setComment("请输入链接"); + host.setComment("链接"); + host.setName("url"); + host.setPlaceholder("请输入链接"); databaseParameters.add(host); - DatabaseParameter port = new DatabaseParameter(); - port.setName("port"); - port.setEnName("port"); - port.setComment("请输入端口号"); - databaseParameters.add(port); - DatabaseParameter userName = new DatabaseParameter(); - userName.setName("用户名"); - userName.setEnName("username"); + userName.setComment("用户名"); + userName.setName("username"); + userName.setPlaceholder("请输入用户名"); databaseParameters.add(userName); DatabaseParameter password = new DatabaseParameter(); - password.setName("密码"); - password.setEnName("password"); + password.setComment("密码"); + password.setName("password"); + password.setPlaceholder("请输入密码"); databaseParameters.add(password); DatabaseParameter database = new DatabaseParameter(); - database.setName("数据库名称"); - database.setEnName("database"); + database.setComment("数据库名称"); + database.setName("database"); + database.setPlaceholder("请输入数据库名称"); + database.setRequire(false); databaseParameters.add(database); return databaseParameters; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MysqlParametersBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MysqlParametersBuilder.java index d38c99f2a..657169a99 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MysqlParametersBuilder.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/MysqlParametersBuilder.java @@ -14,36 +14,40 @@ public class MysqlParametersBuilder implements DbParametersBuilder { public List build() { List databaseParameters = new ArrayList<>(); DatabaseParameter host = new DatabaseParameter(); + host.setComment("host"); host.setName("host"); - host.setEnName("host"); - host.setComment("请输入host"); + host.setPlaceholder("请输入host"); databaseParameters.add(host); DatabaseParameter port = new DatabaseParameter(); + port.setComment("port"); port.setName("port"); - port.setEnName("port"); - port.setComment("请输入端口号"); + port.setPlaceholder("请输入端口号"); databaseParameters.add(port); DatabaseParameter version = new DatabaseParameter(); - version.setName("数据库版本"); - version.setEnName("version"); - version.setComment("请输入数据库版本"); + version.setComment("数据库版本"); + version.setName("version"); + version.setPlaceholder("请输入数据库版本"); databaseParameters.add(version); DatabaseParameter userName = new DatabaseParameter(); - userName.setName("用户名"); - userName.setEnName("username"); + userName.setComment("用户名"); + userName.setName("username"); + userName.setPlaceholder("请输入用户名"); databaseParameters.add(userName); DatabaseParameter password = new DatabaseParameter(); - password.setName("密码"); - password.setEnName("password"); + password.setComment("密码"); + password.setName("password"); + password.setPlaceholder("请输入密码"); databaseParameters.add(password); DatabaseParameter database = new DatabaseParameter(); - database.setName("数据库名称"); - database.setEnName("database"); + database.setComment("数据库名称"); + database.setName("database"); + database.setPlaceholder("请输入数据库名称"); + database.setRequire(false); databaseParameters.add(database); return databaseParameters; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/PostgresqlParametersBuilder.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/PostgresqlParametersBuilder.java index a60f1a6a1..fc076b492 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/PostgresqlParametersBuilder.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/PostgresqlParametersBuilder.java @@ -14,36 +14,34 @@ public class PostgresqlParametersBuilder implements DbParametersBuilder { public List build() { List databaseParameters = new ArrayList<>(); DatabaseParameter host = new DatabaseParameter(); + host.setComment("host"); host.setName("host"); - host.setEnName("host"); - host.setComment("请输入host"); + host.setPlaceholder("请输入host"); databaseParameters.add(host); DatabaseParameter port = new DatabaseParameter(); + port.setComment("port"); port.setName("port"); - port.setEnName("port"); - port.setComment("请输入端口号"); + port.setPlaceholder("请输入端口号"); databaseParameters.add(port); DatabaseParameter userName = new DatabaseParameter(); - userName.setName("用户名"); - userName.setEnName("username"); + userName.setComment("用户名"); + userName.setName("username"); + userName.setPlaceholder("请输入用户名"); databaseParameters.add(userName); DatabaseParameter password = new DatabaseParameter(); - password.setName("密码"); - password.setEnName("password"); + password.setComment("密码"); + password.setName("password"); + password.setPlaceholder("请输入密码"); databaseParameters.add(password); - DatabaseParameter schema = new DatabaseParameter(); - schema.setName("schema"); - schema.setEnName("schema"); - schema.setDefaultValue("public"); - databaseParameters.add(schema); - DatabaseParameter database = new DatabaseParameter(); - database.setName("数据库名称"); - database.setEnName("database"); + database.setComment("数据库名称"); + database.setName("database"); + database.setPlaceholder("请输入数据库名称"); + database.setRequire(false); databaseParameters.add(database); return databaseParameters; }