refactor: clear up and beautify code

Author: y-t99

client/src/main/java/cn/vika/client/api/FieldApi.java

@@ -61,15 +61,15 @@ public void deleteField(String spaceId, String datasheetId, String fieldId) {
 
     private void checkDeleteFieldPathArgs(String spaceId, String datasheetId, String fieldId) {
         if (!StringUtil.hasText(spaceId)) {
-            throw new ApiException("space id must be not null");
+            throw new ApiException("space id must not be null");
         }
 
         if (!StringUtil.hasText(datasheetId)) {
-            throw new ApiException("datasheet id must be not null");
+            throw new ApiException("datasheet id must not be null");
         }
 
         if (!StringUtil.hasText(fieldId)) {
-            throw new ApiException("fieldId id must be not null");
+            throw new ApiException("fieldId id must not be null");
         }
     }
 }

client/src/main/java/cn/vika/client/api/model/CreateFieldRequest.java

@@ -1,5 +1,6 @@
 package cn.vika.client.api.model;
 
+import cn.vika.client.api.model.field.FieldTypeEnum;
 import cn.vika.client.api.model.field.property.BaseFieldProperty;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -11,7 +12,7 @@ public class CreateFieldRequest <T extends BaseFieldProperty> {
 
     /**
      * field type
-     * @see cn.vika.client.api.model.field.FieldType
+     * @see FieldTypeEnum
      */
     private String type;
 

client/src/main/java/cn/vika/client/api/model/builder/CreateFieldRequestBuilder.java

@@ -1,106 +1,53 @@
 package cn.vika.client.api.model.builder;
 
 import cn.vika.client.api.model.CreateFieldRequest;
-import cn.vika.client.api.model.field.FieldType;
+import cn.vika.client.api.model.field.FieldTypeEnum;
 import cn.vika.client.api.model.field.property.BaseFieldProperty;
 import cn.vika.client.api.model.field.property.EmptyProperty;
 
 /**
+ * step builder
+ *
  * @author tao
  */
-public class CreateFieldRequestBuilder{
+public class CreateFieldRequestBuilder implements IFieldTypeOfCreateField, INameOfCreateField, IPropertyOfCreateField {
 
-    public static IFieldTypeOfCreateField create() {
-        return new FieldTypeOfCreateField(new ContextOfCreateField());
-    }
-
-}
-
-class ContextOfCreateField {
-    private FieldType fieldType;
-    private String name;
-    private BaseFieldProperty property;
-
-    public FieldType getFieldType() {
-        return fieldType;
-    }
-
-    public void setFieldType(FieldType fieldType) {
-        this.fieldType = fieldType;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
+    private final ContextOfCreateField context;
 
-    public BaseFieldProperty getProperty() {
-        return property;
+    public static IFieldTypeOfCreateField create() {
+        return new CreateFieldRequestBuilder();
     }
 
-    public void setProperty(BaseFieldProperty property) {
-        this.property = property;
-    }
-}
-
-class FieldTypeOfCreateField implements IFieldTypeOfCreateField {
-
-    private final ContextOfCreateField context;
-
-    FieldTypeOfCreateField(ContextOfCreateField context) {
-        this.context = context;
+    public CreateFieldRequestBuilder() {
+        context = new ContextOfCreateField();
     }
 
     @Override
-    public INameOfCreateField ofType(FieldType fieldType) {
+    public INameOfCreateField ofType(FieldTypeEnum fieldType) {
         context.setFieldType(fieldType);
-        return new NameOfCreateField(context);
-    }
-
-}
-
-class NameOfCreateField implements INameOfCreateField {
-
-    private final ContextOfCreateField context;
-
-    NameOfCreateField(ContextOfCreateField context) {
-        this.context = context;
+        return this;
     }
 
     @Override
     public IPropertyOfCreateField withName(String name) {
         context.setName(name);
-        return new PropertyOfCreateField(context);
-    }
-
-}
-
-class PropertyOfCreateField implements IPropertyOfCreateField {
-
-    private final ContextOfCreateField context;
-
-    PropertyOfCreateField(ContextOfCreateField context) {
-        this.context = context;
+        return this;
     }
 
     @Override
     public <T extends BaseFieldProperty> IBuildCreateField<T> withProperty(T property) {
-
         context.setProperty(property);
         return new BuildCreateField<>(context);
     }
 
     @Override
     public IBuildCreateField<EmptyProperty> withoutProperty() {
-        context.setProperty(new EmptyProperty());
         return new BuildCreateField<>(context);
     }
+
 }
 
-class BuildCreateField<T extends BaseFieldProperty>  implements IBuildCreateField<T> {
+class BuildCreateField<T extends BaseFieldProperty> implements IBuildCreateField<T> {
 
     private final ContextOfCreateField context;
 
@@ -120,3 +67,37 @@ public CreateFieldRequest<T> build() {
 }
 
 
+class ContextOfCreateField {
+
+    private FieldTypeEnum fieldType;
+
+    private String name;
+
+    private BaseFieldProperty property;
+
+    public FieldTypeEnum getFieldType() {
+        return fieldType;
+    }
+
+    public void setFieldType(FieldTypeEnum fieldType) {
+        this.fieldType = fieldType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BaseFieldProperty getProperty() {
+        return property;
+    }
+
+    public void setProperty(BaseFieldProperty property) {
+        this.property = property;
+    }
+}
+
+

client/src/main/java/cn/vika/client/api/model/builder/IFieldTypeOfCreateField.java

@@ -1,12 +1,12 @@
 package cn.vika.client.api.model.builder;
 
-import cn.vika.client.api.model.field.FieldType;
+import cn.vika.client.api.model.field.FieldTypeEnum;
 
 /**
  * @author tao
  */
 public interface IFieldTypeOfCreateField {
 
-    INameOfCreateField ofType(FieldType fieldType);
+    INameOfCreateField ofType(FieldTypeEnum fieldType);
 
 }

…ka/client/api/model/field/FieldType.java …lient/api/model/field/FieldTypeEnum.javaclient/src/main/java/cn/vika/client/api/model/field/FieldType.java renamed to client/src/main/java/cn/vika/client/api/model/field/FieldTypeEnum.java client/src/main/java/cn/vika/client/api/model/field/FieldType.java renamed to client/src/main/java/cn/vika/client/api/model/field/FieldTypeEnum.java

@@ -5,7 +5,7 @@
  *
  * @author tao
  */
-public enum FieldType {
+public enum FieldTypeEnum {
     /**
      *
      */
@@ -101,7 +101,7 @@ public enum FieldType {
 
     private final String fieldType;
 
-    FieldType(String fieldType) {
+    FieldTypeEnum(String fieldType) {
         this.fieldType = fieldType;
     }
 

client/src/main/java/cn/vika/client/api/model/field/property/MagicLinkFieldProperty.java

@@ -10,7 +10,6 @@ public class MagicLinkFieldProperty extends BaseFieldProperty {
 
     private String foreignDatasheetId;
 
-
     @JsonInclude(Include.NON_NULL)
     private String limitToViewId;
 

client/src/main/java/cn/vika/client/api/model/field/property/MagicLookupFieldProperty.java

@@ -11,10 +11,8 @@
  */
 public class MagicLookupFieldProperty extends BaseFieldProperty {
 
-
     private String relatedLinkFieldId;
 
-
     private String targetFieldId;
 
     @JsonInclude(Include.NON_NULL)

client/src/main/java/cn/vika/client/api/model/field/property/option/Format.java

@@ -5,15 +5,15 @@
  */
 public class Format<T extends TypeFormat> {
 
-    private FormatType type;
+    private FormatTypeEnum type;
 
     private T format;
 
-    public FormatType getType() {
+    public FormatTypeEnum getType() {
         return type;
     }
 
-    public void setType(FormatType type) {
+    public void setType(FormatTypeEnum type) {
         this.type = type;
     }
 

…el/field/property/option/FormatType.java …ield/property/option/FormatTypeEnum.javaclient/src/main/java/cn/vika/client/api/model/field/property/option/FormatType.java renamed to client/src/main/java/cn/vika/client/api/model/field/property/option/FormatTypeEnum.java client/src/main/java/cn/vika/client/api/model/field/property/option/FormatType.java renamed to client/src/main/java/cn/vika/client/api/model/field/property/option/FormatTypeEnum.java

@@ -5,7 +5,7 @@
 /**
  * @author tao
  */
-public enum FormatType {
+public enum FormatTypeEnum {
     /**
      * Format about DateTime
      * @see cn.vika.client.api.model.field.property.option.DateTimeFormat
@@ -25,12 +25,11 @@ public enum FormatType {
      * Format about Currency
      * @see cn.vika.client.api.model.field.property.option.CurrencyFormat
      */
-    Currency("Currency"),
-    ;
+    Currency("Currency");
 
     private final String value;
 
-    FormatType(String value) {
+    FormatTypeEnum(String value) {
         this.value = value;
     }
 

client/src/test/java/cn/vika/client/api/DatasheetOperationTest.java

@@ -8,7 +8,7 @@
 import cn.vika.client.api.model.CreateDatasheetResponse;
 import cn.vika.client.api.model.CreateFieldRequest;
 import cn.vika.client.api.model.builder.CreateFieldRequestBuilder;
-import cn.vika.client.api.model.field.FieldType;
+import cn.vika.client.api.model.field.FieldTypeEnum;
 import cn.vika.client.api.model.field.property.EmptyProperty;
 import cn.vika.client.api.model.field.property.SingleTextFieldProperty;
 import org.junit.jupiter.api.Test;
@@ -51,13 +51,13 @@ void testAddDatasheetWithOtherInfo() {
         property.setDefaultValue("default");
         CreateFieldRequest<SingleTextFieldProperty> singleSelectField = CreateFieldRequestBuilder
                 .create()
-                .ofType(FieldType.SingleText)
+                .ofType(FieldTypeEnum.SingleText)
                 .withName("singleSelect")
                 .withProperty(property)
                 .build();
         CreateFieldRequest<EmptyProperty> textField = CreateFieldRequestBuilder
                 .create()
-                .ofType(FieldType.Text)
+                .ofType(FieldTypeEnum.Text)
                 .withName("text")
                 .withoutProperty()
                 .build();