Skip to content

Commit f82ab47

Browse files
committed
refactor: rename parsing methods for clarity and consistency
1 parent f306c1e commit f82ab47

28 files changed

+78
-149
lines changed

backend/crm/src/main/java/cn/cordys/common/permission/PermissionDefinition.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

backend/crm/src/main/java/cn/cordys/common/permission/RoleResource.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

backend/crm/src/main/java/cn/cordys/common/resolver/field/AbstractModuleFieldResolver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public abstract class AbstractModuleFieldResolver<T extends BaseField> {
3535
*
3636
* @return
3737
*/
38-
public Object parse2Value(T selectField, String value) {
38+
public Object convertToValue(T selectField, String value) {
3939
return value;
4040
}
4141

@@ -46,7 +46,7 @@ public Object parse2Value(T selectField, String value) {
4646
*
4747
* @return
4848
*/
49-
public Object trans2Value(T selectField, String value) {
49+
public Object transformToValue(T selectField, String value) {
5050
return value;
5151
}
5252

@@ -58,7 +58,7 @@ public Object trans2Value(T selectField, String value) {
5858
*
5959
* @return 字段值
6060
*/
61-
public Object text2Value(T field, String text) {
61+
public Object textToValue(T field, String text) {
6262
return text;
6363
}
6464

@@ -70,7 +70,7 @@ public Object text2Value(T field, String text) {
7070
*
7171
* @return
7272
*/
73-
public String parse2String(T selectField, Object value) {
73+
public String convertToString(T selectField, Object value) {
7474
return value == null ? null : value.toString();
7575
}
7676

@@ -86,8 +86,8 @@ protected void validateArray(String name, Object value) {
8686
if (value == null) {
8787
return;
8888
}
89-
if (value instanceof List) {
90-
((List) value).forEach(v -> validateString(name, v));
89+
if (value instanceof List<?> list) {
90+
list.forEach(v -> validateString(name, v));
9191
} else {
9292
throwValidateException(name);
9393
}

backend/crm/src/main/java/cn/cordys/common/resolver/field/AttachmentFieldResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ public void validate(AttachmentField customField, Object value) {
1111
}
1212

1313
@Override
14-
public String parse2String(AttachmentField attachmentField, Object value) {
14+
public String convertToString(AttachmentField attachmentField, Object value) {
1515
return getJsonString(value);
1616
}
1717

1818
@Override
19-
public Object parse2Value(AttachmentField attachmentField, String value) {
19+
public Object convertToValue(AttachmentField attachmentField, String value) {
2020
return parse2Array(value);
2121
}
2222
}

backend/crm/src/main/java/cn/cordys/common/resolver/field/CheckBoxResolver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ public void validate(CheckBoxField checkBoxField, Object value) {
2828
}
2929

3030
@Override
31-
public String parse2String(CheckBoxField checkBoxField, Object value) {
31+
public String convertToString(CheckBoxField checkBoxField, Object value) {
3232
return JSON.toJSONString(value);
3333
}
3434

3535
@Override
36-
public Object parse2Value(CheckBoxField checkBoxField, String value) {
36+
public Object convertToValue(CheckBoxField checkBoxField, String value) {
3737
return parse2Array(value);
3838
}
3939

4040
@Override
41-
public Object trans2Value(CheckBoxField checkBoxField, String value) {
41+
public Object transformToValue(CheckBoxField checkBoxField, String value) {
4242
if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) {
4343
return StringUtils.EMPTY;
4444
}
@@ -54,7 +54,7 @@ public Object trans2Value(CheckBoxField checkBoxField, String value) {
5454
}
5555

5656
@Override
57-
public Object text2Value(CheckBoxField field, String text) {
57+
public Object textToValue(CheckBoxField field, String text) {
5858
if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) {
5959
return StringUtils.EMPTY;
6060
}

backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceMultipleResolver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ public void validate(DatasourceMultipleField customField, Object value) {
4242
}
4343

4444
@Override
45-
public Object parse2Value(DatasourceMultipleField customField, String value) {
45+
public Object convertToValue(DatasourceMultipleField customField, String value) {
4646
return parse2Array(value);
4747
}
4848

4949
@Override
50-
public String parse2String(DatasourceMultipleField customField, Object value) {
50+
public String convertToString(DatasourceMultipleField customField, Object value) {
5151
return getJsonString(value);
5252
}
5353

5454

5555
@Override
56-
public Object trans2Value(DatasourceMultipleField datasourceMultipleField, String value) {
56+
public Object transformToValue(DatasourceMultipleField datasourceMultipleField, String value) {
5757
if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) {
5858
return StringUtils.EMPTY;
5959
}
@@ -83,7 +83,7 @@ public Object trans2Value(DatasourceMultipleField datasourceMultipleField, Strin
8383
}
8484

8585
@Override
86-
public Object text2Value(DatasourceMultipleField field, String text) {
86+
public Object textToValue(DatasourceMultipleField field, String text) {
8787
if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) {
8888
return StringUtils.EMPTY;
8989
}

backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void validate(DatasourceField customField, Object value) {
4242

4343

4444
@Override
45-
public Object trans2Value(DatasourceField datasourceField, String value) {
45+
public Object transformToValue(DatasourceField datasourceField, String value) {
4646
if (StringUtils.isBlank(value)) {
4747
return StringUtils.EMPTY;
4848
}
@@ -71,7 +71,7 @@ public Object trans2Value(DatasourceField datasourceField, String value) {
7171
}
7272

7373
@Override
74-
public Object text2Value(DatasourceField field, String text) {
74+
public Object textToValue(DatasourceField field, String text) {
7575
if (StringUtils.isBlank(text)) {
7676
return StringUtils.EMPTY;
7777
}

backend/crm/src/main/java/cn/cordys/common/resolver/field/DateTimeResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ protected void validateLong(String name, Object value) {
3333
}
3434

3535
@Override
36-
public Object parse2Value(DateTimeField dateTimeField, String value) {
36+
public Object convertToValue(DateTimeField dateTimeField, String value) {
3737
return parse2Long(value);
3838
}
3939

4040
@Override
41-
public Object trans2Value(DateTimeField dateTimeField, String value) {
41+
public Object transformToValue(DateTimeField dateTimeField, String value) {
4242
if (Strings.CI.equals(dateTimeField.getDateType(), DATE)) {
4343
return TimeUtils.getDataStr(Long.valueOf(value));
4444
}
@@ -52,7 +52,7 @@ public Object trans2Value(DateTimeField dateTimeField, String value) {
5252
}
5353

5454
@Override
55-
public Object text2Value(DateTimeField field, String text) {
55+
public Object textToValue(DateTimeField field, String text) {
5656
DateTimeFormatter formatter = new DateTimeFormatterBuilder()
5757
.appendOptional(DateTimeFormatter.ofPattern("yyyy-M-d H:m:s"))
5858
.appendOptional(DateTimeFormatter.ofPattern("yyyy/M/d H:m:s"))

backend/crm/src/main/java/cn/cordys/common/resolver/field/DefaultModuleFieldResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void validate(BaseField customField, Object value) {
1616
}
1717

1818
@Override
19-
public String parse2String(BaseField selectField, Object value) {
19+
public String convertToString(BaseField selectField, Object value) {
2020
if (value instanceof List) {
2121
return getJsonString(value);
2222
}

backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentMultipleResolver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ public void validate(DepartmentMultipleField departmentField, Object value) {
2626
}
2727

2828
@Override
29-
public String parse2String(DepartmentMultipleField departmentField, Object value) {
29+
public String convertToString(DepartmentMultipleField departmentField, Object value) {
3030
return getJsonString(value);
3131
}
3232

3333
@Override
34-
public Object parse2Value(DepartmentMultipleField departmentField, String value) {
34+
public Object convertToValue(DepartmentMultipleField departmentField, String value) {
3535
return parse2Array(value);
3636
}
3737

3838
@Override
39-
public Object trans2Value(DepartmentMultipleField departmentMultipleField, String value) {
39+
public Object transformToValue(DepartmentMultipleField departmentMultipleField, String value) {
4040
if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) {
4141
return StringUtils.EMPTY;
4242
}
@@ -52,7 +52,7 @@ public Object trans2Value(DepartmentMultipleField departmentMultipleField, Strin
5252
}
5353

5454
@Override
55-
public Object text2Value(DepartmentMultipleField field, String text) {
55+
public Object textToValue(DepartmentMultipleField field, String text) {
5656
if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) {
5757
return StringUtils.EMPTY;
5858
}

0 commit comments

Comments
 (0)