Skip to content

refactor: rename parsing methods for clarity and consistency #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fit2-zhao merged 1 commit into from
Nov 24, 2025
Merged

refactor: rename parsing methods for clarity and consistency #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions backend/crm/src/main/java/cn/cordys/common/permission/PermissionDefinition.java
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions backend/crm/src/main/java/cn/cordys/common/permission/RoleResource.java
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/AbstractModuleFieldResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public abstract class AbstractModuleFieldResolver<T extends BaseField> {
*
* @return
*/
public Object parse2Value(T selectField, String value) {
public Object convertToValue(T selectField, String value) {
return value;
}

Expand All @@ -46,7 +46,7 @@ public Object parse2Value(T selectField, String value) {
*
* @return
*/
public Object trans2Value(T selectField, String value) {
public Object transformToValue(T selectField, String value) {
return value;
}

Expand All @@ -58,7 +58,7 @@ public Object trans2Value(T selectField, String value) {
*
* @return 字段值
*/
public Object text2Value(T field, String text) {
public Object textToValue(T field, String text) {
return text;
}

Expand All @@ -70,7 +70,7 @@ public Object text2Value(T field, String text) {
*
* @return
*/
public String parse2String(T selectField, Object value) {
public String convertToString(T selectField, Object value) {
return value == null ? null : value.toString();
}

Expand All @@ -86,8 +86,8 @@ protected void validateArray(String name, Object value) {
if (value == null) {
return;
}
if (value instanceof List) {
((List) value).forEach(v -> validateString(name, v));
if (value instanceof List<?> list) {
list.forEach(v -> validateString(name, v));
} else {
throwValidateException(name);
}
Expand Down
4 changes: 2 additions & 2 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/AttachmentFieldResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ public void validate(AttachmentField customField, Object value) {
}

@Override
public String parse2String(AttachmentField attachmentField, Object value) {
public String convertToString(AttachmentField attachmentField, Object value) {
return getJsonString(value);
}

@Override
public Object parse2Value(AttachmentField attachmentField, String value) {
public Object convertToValue(AttachmentField attachmentField, String value) {
return parse2Array(value);
}
}
8 changes: 4 additions & 4 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/CheckBoxResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ public void validate(CheckBoxField checkBoxField, Object value) {
}

@Override
public String parse2String(CheckBoxField checkBoxField, Object value) {
public String convertToString(CheckBoxField checkBoxField, Object value) {
return JSON.toJSONString(value);
}

@Override
public Object parse2Value(CheckBoxField checkBoxField, String value) {
public Object convertToValue(CheckBoxField checkBoxField, String value) {
return parse2Array(value);
}

@Override
public Object trans2Value(CheckBoxField checkBoxField, String value) {
public Object transformToValue(CheckBoxField checkBoxField, String value) {
if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) {
return StringUtils.EMPTY;
}
Expand All @@ -54,7 +54,7 @@ public Object trans2Value(CheckBoxField checkBoxField, String value) {
}

@Override
public Object text2Value(CheckBoxField field, String text) {
public Object textToValue(CheckBoxField field, String text) {
if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) {
return StringUtils.EMPTY;
}
Expand Down
8 changes: 4 additions & 4 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceMultipleResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ public void validate(DatasourceMultipleField customField, Object value) {
}

@Override
public Object parse2Value(DatasourceMultipleField customField, String value) {
public Object convertToValue(DatasourceMultipleField customField, String value) {
return parse2Array(value);
}

@Override
public String parse2String(DatasourceMultipleField customField, Object value) {
public String convertToString(DatasourceMultipleField customField, Object value) {
return getJsonString(value);
}


@Override
public Object trans2Value(DatasourceMultipleField datasourceMultipleField, String value) {
public Object transformToValue(DatasourceMultipleField datasourceMultipleField, String value) {
if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) {
return StringUtils.EMPTY;
}
Expand Down Expand Up @@ -83,7 +83,7 @@ public Object trans2Value(DatasourceMultipleField datasourceMultipleField, Strin
}

@Override
public Object text2Value(DatasourceMultipleField field, String text) {
public Object textToValue(DatasourceMultipleField field, String text) {
if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) {
return StringUtils.EMPTY;
}
Expand Down
4 changes: 2 additions & 2 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/DatasourceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void validate(DatasourceField customField, Object value) {


@Override
public Object trans2Value(DatasourceField datasourceField, String value) {
public Object transformToValue(DatasourceField datasourceField, String value) {
if (StringUtils.isBlank(value)) {
return StringUtils.EMPTY;
}
Expand Down Expand Up @@ -71,7 +71,7 @@ public Object trans2Value(DatasourceField datasourceField, String value) {
}

@Override
public Object text2Value(DatasourceField field, String text) {
public Object textToValue(DatasourceField field, String text) {
if (StringUtils.isBlank(text)) {
return StringUtils.EMPTY;
}
Expand Down
6 changes: 3 additions & 3 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/DateTimeResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ protected void validateLong(String name, Object value) {
}

@Override
public Object parse2Value(DateTimeField dateTimeField, String value) {
public Object convertToValue(DateTimeField dateTimeField, String value) {
return parse2Long(value);
}

@Override
public Object trans2Value(DateTimeField dateTimeField, String value) {
public Object transformToValue(DateTimeField dateTimeField, String value) {
if (Strings.CI.equals(dateTimeField.getDateType(), DATE)) {
return TimeUtils.getDataStr(Long.valueOf(value));
}
Expand All @@ -52,7 +52,7 @@ public Object trans2Value(DateTimeField dateTimeField, String value) {
}

@Override
public Object text2Value(DateTimeField field, String text) {
public Object textToValue(DateTimeField field, String text) {
DateTimeFormatter formatter = new DateTimeFormatterBuilder()
.appendOptional(DateTimeFormatter.ofPattern("yyyy-M-d H:m:s"))
.appendOptional(DateTimeFormatter.ofPattern("yyyy/M/d H:m:s"))
Expand Down
2 changes: 1 addition & 1 deletion backend/crm/src/main/java/cn/cordys/common/resolver/field/DefaultModuleFieldResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void validate(BaseField customField, Object value) {
}

@Override
public String parse2String(BaseField selectField, Object value) {
public String convertToString(BaseField selectField, Object value) {
if (value instanceof List) {
return getJsonString(value);
}
Expand Down
8 changes: 4 additions & 4 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentMultipleResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ public void validate(DepartmentMultipleField departmentField, Object value) {
}

@Override
public String parse2String(DepartmentMultipleField departmentField, Object value) {
public String convertToString(DepartmentMultipleField departmentField, Object value) {
return getJsonString(value);
}

@Override
public Object parse2Value(DepartmentMultipleField departmentField, String value) {
public Object convertToValue(DepartmentMultipleField departmentField, String value) {
return parse2Array(value);
}

@Override
public Object trans2Value(DepartmentMultipleField departmentMultipleField, String value) {
public Object transformToValue(DepartmentMultipleField departmentMultipleField, String value) {
if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) {
return StringUtils.EMPTY;
}
Expand All @@ -52,7 +52,7 @@ public Object trans2Value(DepartmentMultipleField departmentMultipleField, Strin
}

@Override
public Object text2Value(DepartmentMultipleField field, String text) {
public Object textToValue(DepartmentMultipleField field, String text) {
if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) {
return StringUtils.EMPTY;
}
Expand Down
8 changes: 4 additions & 4 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/DepartmentResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ public void validate(DepartmentField departmentField, Object value) {
}

@Override
public String parse2String(DepartmentField selectField, Object value) {
public String convertToString(DepartmentField selectField, Object value) {
return getStringValue(value);
}

@Override
public Object parse2Value(DepartmentField selectField, String value) {
public Object convertToValue(DepartmentField selectField, String value) {
return getStringValue(value);
}


@Override
public Object trans2Value(DepartmentField departmentField, String value) {
public Object transformToValue(DepartmentField departmentField, String value) {
if (StringUtils.isBlank(value)) {
return StringUtils.EMPTY;
}
Expand All @@ -50,7 +50,7 @@ public Object trans2Value(DepartmentField departmentField, String value) {
}

@Override
public Object text2Value(DepartmentField field, String text) {
public Object textToValue(DepartmentField field, String text) {
if (StringUtils.isBlank(text)) {
return StringUtils.EMPTY;
}
Expand Down
4 changes: 2 additions & 2 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/IndustryResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ public void validate(IndustryField customField, Object value) {
}

@Override
public Object trans2Value(IndustryField field, String value) {
public Object transformToValue(IndustryField field, String value) {
return IndustryUtils.mapping(value, false);
}

@Override
public Object text2Value(IndustryField field, String text) {
public Object textToValue(IndustryField field, String text) {
return IndustryUtils.mapping(text, true);
}
}
4 changes: 2 additions & 2 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/LocationResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ public void validate(LocationField customField, Object value) {


@Override
public Object trans2Value(LocationField locationField, String value) {
public Object transformToValue(LocationField locationField, String value) {
return RegionUtils.mapping(value, false);
}

@Override
public Object text2Value(LocationField field, String text) {
public Object textToValue(LocationField field, String text) {
return RegionUtils.mapping(text, true);
}
}
8 changes: 4 additions & 4 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberMultipleResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ public void validate(MemberMultipleField memberField, Object value) {
}

@Override
public String parse2String(MemberMultipleField memberField, Object value) {
public String convertToString(MemberMultipleField memberField, Object value) {
return getJsonString(value);
}

@Override
public Object parse2Value(MemberMultipleField memberField, String value) {
public Object convertToValue(MemberMultipleField memberField, String value) {
return parse2Array(value);
}


@Override
public Object trans2Value(MemberMultipleField memberMultipleField, String value) {
public Object transformToValue(MemberMultipleField memberMultipleField, String value) {
if (StringUtils.isBlank(value) || Strings.CS.equals(value, "[]")) {
return StringUtils.EMPTY;
}
Expand All @@ -58,7 +58,7 @@ public Object trans2Value(MemberMultipleField memberMultipleField, String value)
}

@Override
public Object text2Value(MemberMultipleField field, String text) {
public Object textToValue(MemberMultipleField field, String text) {
if (StringUtils.isBlank(text) || Strings.CS.equals(text, "[]")) {
return StringUtils.EMPTY;
}
Expand Down
8 changes: 4 additions & 4 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/MemberResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ public void validate(MemberField memberField, Object value) {
}

@Override
public String parse2String(MemberField memberField, Object value) {
public String convertToString(MemberField memberField, Object value) {
return getStringValue(value);
}

@Override
public Object parse2Value(MemberField memberField, String value) {
public Object convertToValue(MemberField memberField, String value) {
return getStringValue(value);
}

@Override
public Object trans2Value(MemberField memberField, String value) {
public Object transformToValue(MemberField memberField, String value) {
if (StringUtils.isBlank(value)) {
return StringUtils.EMPTY;
}
Expand All @@ -55,7 +55,7 @@ public Object trans2Value(MemberField memberField, String value) {
}

@Override
public Object text2Value(MemberField field, String text) {
public Object textToValue(MemberField field, String text) {
if (StringUtils.isBlank(text)) {
return StringUtils.EMPTY;
}
Expand Down
6 changes: 3 additions & 3 deletions backend/crm/src/main/java/cn/cordys/common/resolver/field/NumberResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ public void validate(InputNumberField numberField, Object value) {
}

@Override
public Object parse2Value(InputNumberField numberField, String value) {
public Object convertToValue(InputNumberField numberField, String value) {
return value == null ? null : new BigDecimal(value);
}

@Override
public Object trans2Value(InputNumberField numberField, String value) {
public Object transformToValue(InputNumberField numberField, String value) {
return value == null ? null : new BigDecimal(value);
}

@Override
public Object text2Value(InputNumberField field, String text) {
public Object textToValue(InputNumberField field, String text) {
if (Strings.CS.equals(field.getNumberFormat(), PERCENT_FORMAT)) {
text = text.replace(PERCENT_SUFFIX, StringUtils.EMPTY);
}
Expand Down
2 changes: 1 addition & 1 deletion backend/crm/src/main/java/cn/cordys/common/resolver/field/PhoneResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void validate(PhoneField field, Object value) {
}

@Override
public Object text2Value(PhoneField field, String text) {
public Object textToValue(PhoneField field, String text) {
if (StringUtils.isEmpty(text)) {
return text;
}
Expand Down
Loading
Loading