fix code style
diff --git a/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructure.java b/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructure.java
index 57194dd..f7dcb44 100644
--- a/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructure.java
+++ b/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructure.java
@@ -17,9 +17,10 @@
package org.apache.seatunnel.dynamicforms;
+import static com.google.common.base.Preconditions.checkArgument;
+
import com.fasterxml.jackson.annotation.JsonIgnoreType;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.google.common.base.Preconditions;
import lombok.Data;
import lombok.NonNull;
@@ -43,7 +44,7 @@
public FormStructure(@NonNull String name, @NonNull List<AbstractFormOption> formOptionList, Locale locale,
Map<String, Map<String, String>> apis) {
- Preconditions.checkArgument(formOptionList.size() > 1);
+ checkArgument(formOptionList.size() > 1);
this.name = name;
this.forms = formOptionList;
this.locales = locale;
diff --git a/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructureValidate.java b/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructureValidate.java
index 3270885..9abd3c2 100644
--- a/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructureValidate.java
+++ b/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/FormStructureValidate.java
@@ -35,12 +35,7 @@
public class FormStructureValidate {
/**
- * validate rules:
- * <li>All data_integration.xxx need found xxx in locales</li>
- * <li>All api used in select option need found in apis</li>
- *
- * @param formStructure
- * @throws FormStructureValidateException
+ * validate rules
*/
public static void validateFormStructure(@NonNull FormStructure formStructure)
throws FormStructureValidateException {
diff --git a/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/validate/UnionNonEmptyValidate.java b/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/validate/UnionNonEmptyValidate.java
index e27d831..fdc039f 100644
--- a/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/validate/UnionNonEmptyValidate.java
+++ b/seatunnel-server/seatunnel-dynamicform/src/main/java/org/apache/seatunnel/dynamicforms/validate/UnionNonEmptyValidate.java
@@ -17,7 +17,8 @@
package org.apache.seatunnel.dynamicforms.validate;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+
import lombok.Data;
import lombok.NonNull;
@@ -30,7 +31,7 @@
private final RequiredType requiredType = RequiredType.UNION_NON_EMPTY;
public UnionNonEmptyValidate(@NonNull List<String> fields) {
- Preconditions.checkArgument(fields.size() > 0);
+ checkArgument(fields.size() > 0);
this.fields = fields;
}
}
diff --git a/seatunnel-server/seatunnel-dynamicform/src/test/java/org/apache/seatunnel/dynamicforms/FormStructureBuilderTest.java b/seatunnel-server/seatunnel-dynamicform/src/test/java/org/apache/seatunnel/dynamicforms/FormStructureBuilderTest.java
index ae7eae4..6e09d19 100644
--- a/seatunnel-server/seatunnel-dynamicform/src/test/java/org/apache/seatunnel/dynamicforms/FormStructureBuilderTest.java
+++ b/seatunnel-server/seatunnel-dynamicform/src/test/java/org/apache/seatunnel/dynamicforms/FormStructureBuilderTest.java
@@ -17,9 +17,9 @@
package org.apache.seatunnel.dynamicforms;
+import org.apache.seatunnel.common.utils.JsonUtils;
import org.apache.seatunnel.dynamicforms.exception.FormStructureValidateException;
import org.apache.seatunnel.dynamicforms.validate.ValidateBuilder;
-import org.apache.seatunnel.common.utils.JsonUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -29,8 +29,8 @@
@Test
public void testFormStructureBuild() {
Locale locale = new Locale();
- locale.addZhCN("name_password_union_required", "用户名和密码都不能为空")
- .addZhCN("username", "用户名")
+ locale.addZhCN("name_password_union_required", "all name and password are required")
+ .addZhCN("username", "username")
.addEnUS("name_password_union_required", "all name and password are required")
.addEnUS("username", "username");
@@ -101,14 +101,23 @@
String s = JsonUtils.toJsonString(testForm);
String result =
- "{\"name\":\"testForm\",\"locales\":{\"zh_CN\":{\"name_password_union_required\":\"用户名和密码都不能为空\",\"username\":\"用户名\"},\"en_US\":{\"name_password_union_required\":\"all name and password are required\",\"username\":\"username\"}},\"apis\":{\"getCity\":{\"method\":\"get\",\"url\":\"/api/get_city\"}},\"forms\":[{\"label\":\"i18n.username\",\"field\":\"username\",\"defaultValue\":null,\"description\":\"username\",\"clearable\":true,\"show\":{\"field\":\"checkType\",\"value\":\"nameAndPassword\"},\"placeholder\":\"username\",\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"i18n.name_password_union_required\",\"required\":false,\"fields\":[\"username\",\"password\"],\"requiredType\":\"union-non-empty\"},\"inputType\":\"text\",\"type\":\"input\"},{\"label\":\"password\",\"field\":\"password\",\"defaultValue\":null,\"description\":\"password\",\"clearable\":false,\"show\":{\"field\":\"checkType\",\"value\":\"nameAndPassword\"},\"placeholder\":\"password\",\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"i18n.name_password_union_required\",\"required\":false,\"fields\":[\"username\",\"password\"],\"requiredType\":\"union-non-empty\"},\"inputType\":\"password\",\"type\":\"input\"},{\"label\":\"content\",\"field\":\"context\",\"defaultValue\":null,\"description\":\"content\",\"clearable\":true,\"placeholder\":\"\",\"inputType\":\"textarea\",\"type\":\"input\"},{\"label\":\"checkType\",\"field\":\"checkType\",\"defaultValue\":\"no\",\"description\":\"check type\",\"clearable\":true,\"placeholder\":\"\",\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"required\",\"required\":true,\"type\":\"non-empty\"},\"options\":[{\"label\":\"no\",\"value\":\"no\"},{\"label\":\"nameAndPassword\",\"value\":\"nameAndPassword\"}],\"type\":\"select\"},{\"label\":\"city\",\"field\":\"city\",\"defaultValue\":null,\"description\":\"city\",\"clearable\":false,\"placeholder\":\"\",\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"required\",\"required\":true,\"type\":\"non-empty\"},\"api\":\"getCity\",\"type\":\"select\"}]}";
+ "{\"name\":\"testForm\",\"locales\":{\"zh_CN\":{\"name_password_union_required\":\"all name and password are required\",\"username\":\"username\"}" +
+ ",\"en_US\":{\"name_password_union_required\":\"all name and password are required\",\"username\":\"username\"}},\"apis\":{\"getCity\":{\"method\":\"get\",\"url\":\"/api/get_city\"}}" +
+ ",\"forms\":[{\"label\":\"i18n.username\",\"field\":\"username\",\"defaultValue\":null,\"description\":\"username\",\"clearable\":true,\"show\":{\"field\":\"checkType\",\"value\":\"nameAndPassword\"}" +
+ ",\"placeholder\":\"username\",\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"i18n.name_password_union_required\",\"required\":false,\"fields\":[\"username\",\"password\"],\"requiredType\":\"union-non-empty\"}" +
+ ",\"inputType\":\"text\",\"type\":\"input\"},{\"label\":\"password\",\"field\":\"password\",\"defaultValue\":null,\"description\":\"password\",\"clearable\":false,\"show\":{\"field\":\"checkType\",\"value\":\"nameAndPassword\"}" +
+ ",\"placeholder\":\"password\",\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"i18n.name_password_union_required\",\"required\":false,\"fields\":[\"username\",\"password\"],\"requiredType\":\"union-non-empty\"}" +
+ ",\"inputType\":\"password\",\"type\":\"input\"},{\"label\":\"content\",\"field\":\"context\",\"defaultValue\":null,\"description\":\"content\",\"clearable\":true,\"placeholder\":\"\",\"inputType\":\"textarea\",\"type\":\"input\"}" +
+ ",{\"label\":\"checkType\",\"field\":\"checkType\",\"defaultValue\":\"no\",\"description\":\"check type\",\"clearable\":true,\"placeholder\":\"\",\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"required\",\"required\":true,\"type\":\"non-empty\"}" +
+ ",\"options\":[{\"label\":\"no\",\"value\":\"no\"},{\"label\":\"nameAndPassword\",\"value\":\"nameAndPassword\"}],\"type\":\"select\"},{\"label\":\"city\",\"field\":\"city\",\"defaultValue\":null,\"description\":\"city\",\"clearable\":false,\"placeholder\":\"\"," +
+ "\"validate\":{\"trigger\":[\"input\",\"blur\"],\"message\":\"required\",\"required\":true,\"type\":\"non-empty\"},\"api\":\"getCity\",\"type\":\"select\"}]}";
Assertions.assertEquals(result, s);
}
@Test
public void testFormStructureValidate() {
Locale locale = new Locale();
- locale.addZhCN("name_password_union_required", "用户名和密码都不能为空")
+ locale.addZhCN("name_password_union_required", "all name and password are required")
.addEnUS("name_password_union_required", "all name and password are required")
.addEnUS("username", "username");
