Skip to content

Commit

Permalink
refs #86 入力値検証時のエラーメッセージのキーのパターンを追加
Browse files Browse the repository at this point in the history
  • Loading branch information
@mygreen
mygreen committed Oct 30, 2016
1 parent 1fc550e commit e483178
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 27 deletions.
9 changes: 7 additions & 2 deletions src/main/java/com/gh/mygreen/xlsmapper/validation/MessageCodeGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,23 @@ public String[] generateCodes(final String code, final String objectName, final

final String baseCode = getPrefix().isEmpty() ? code : getPrefix() + code;
final List<String> codeList = new ArrayList<>();

final List<String> objectNameList = Arrays.asList(generateObjectNameCodes(objectName));
final List<String> fieldList = new ArrayList<>();
buildFieldList(field, fieldList);

addCodes(codeList, baseCode, objectName, fieldList);

if(Utils.isNotEmpty(field)) {
// 最後のフィールド名のみを取得する
int dotIndex = field.lastIndexOf('.');
if(dotIndex > 0) {
buildFieldList(field.substring(dotIndex + 1), fieldList);
}
}

for(final String name : objectNameList) {
addCodes(codeList, baseCode, name, fieldList);
}

addCodes(codeList, code, null, fieldList);

if(fieldType != null) {
Expand Down
46 changes: 23 additions & 23 deletions src/main/java/com/gh/mygreen/xlsmapper/validation/SheetBindingErrors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@ public void rejectSheet(final String errorCode, final Map<String, Object> errorV
public void rejectValue(final String field, final String errorCode) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field))
.codes(generateMessageCodes(errorCode, buildFieldPath(field)))
.build());
}

Expand All @@ -737,7 +737,7 @@ public void rejectValue(final String field, final String errorCode) {
public void rejectValue(final String field, final String errorCode, final String defaultMessage) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field))
.codes(generateMessageCodes(errorCode, buildFieldPath(field)))
.defaultMessage(defaultMessage)
.build());
}
Expand All @@ -752,7 +752,7 @@ public void rejectValue(final String field, final String errorCode, final String
public void rejectValue(final String field, final String errorCode, final Object[] errorArgs) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorArgs)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorArgs)
.build());
}

Expand All @@ -767,7 +767,7 @@ public void rejectValue(final String field, final String errorCode, final Object
public void rejectValue(final String field, final String errorCode, final Object[] errorArgs, final String defaultMessage) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorArgs)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorArgs)
.defaultMessage(defaultMessage)
.build());
}
Expand All @@ -781,7 +781,7 @@ public void rejectValue(final String field, final String errorCode, final Object
public void rejectValue(final String field, final String errorCode, final Map<String, Object> errorVars) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorVars)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorVars)
.build());
}

Expand All @@ -795,7 +795,7 @@ public void rejectValue(final String field, final String errorCode, final Map<St
public void rejectValue(final String field, final String errorCode, final Map<String, Object> errorVars, final String defaultMessage) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorVars)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorVars)
.defaultMessage(defaultMessage)
.build());
}
Expand All @@ -809,7 +809,7 @@ public void rejectValue(final String field, final String errorCode, final Map<St
public void rejectSheetValue(final String field, final Point cellAddress, final String errorCode) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field))
.codes(generateMessageCodes(errorCode, buildFieldPath(field)))
.sheetName(getSheetName()).cellAddress(cellAddress)
.build());
}
Expand All @@ -827,7 +827,7 @@ public void rejectValue(final String field, final Object fieldValue, final Class
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.codes(generateMessageCodes(errorCode, field, fieldType), errorVars)
.codes(generateMessageCodes(errorCode, buildFieldPath(field), fieldType), errorVars)
.build());
}

Expand All @@ -844,7 +844,7 @@ public void rejectSheetValue(final String field, final Object fieldValue, final
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.codes(generateMessageCodes(errorCode, field, fieldType))
.codes(generateMessageCodes(errorCode, buildFieldPath(field), fieldType))
.sheetName(getSheetName()).cellAddress(cellAddress)
.build());
}
Expand All @@ -863,7 +863,7 @@ public void rejectSheetValue(final String field, final Object fieldValue, final
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.codes(generateMessageCodes(errorCode, field, fieldType))
.codes(generateMessageCodes(errorCode, buildFieldPath(field), fieldType))
.sheetName(getSheetName()).cellAddress(cellAddress)
.defaultMessage(defaultMessage)
.build());
Expand All @@ -879,7 +879,7 @@ public void rejectSheetValue(final String field, final Object fieldValue, final
public void rejectSheetValue(final String field, final Point cellAddress, final String errorCode, final String defaultMessage) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field))
.codes(generateMessageCodes(errorCode, buildFieldPath(field)))
.sheetName(getSheetName()).cellAddress(cellAddress)
.defaultMessage(defaultMessage)
.build());
Expand All @@ -896,7 +896,7 @@ public void rejectSheetValue(final String field, final Point cellAddress, final
public void rejectSheetValue(final String field, final Point cellAddress, final String errorCode, final Object[] errorArgs) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorArgs)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorArgs)
.sheetName(getSheetName()).cellAddress(cellAddress)
.build());
}
Expand All @@ -913,7 +913,7 @@ public void rejectSheetValue(final String field, final Point cellAddress, final
public void rejectSheetValue(final String field, final Point cellAddress, final String errorCode, final Object[] errorArgs, final String defaultMessage) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorArgs)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorArgs)
.sheetName(getSheetName()).cellAddress(cellAddress)
.defaultMessage(defaultMessage)
.build());
Expand All @@ -929,7 +929,7 @@ public void rejectSheetValue(final String field, final Point cellAddress, final
public void rejectSheetValue(final String field, final Point cellAddress, final String errorCode, final Map<String, Object> errorVars) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorVars)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorVars)
.sheetName(getSheetName()).cellAddress(cellAddress)
.build());
}
Expand All @@ -945,7 +945,7 @@ public void rejectSheetValue(final String field, final Point cellAddress, final
public void rejectSheetValue(final String field, final Point cellAddress, final String errorCode, final Map<String, Object> errorVars, final String defaultMessage) {
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.codes(generateMessageCodes(errorCode, field), errorVars)
.codes(generateMessageCodes(errorCode, buildFieldPath(field)), errorVars)
.sheetName(getSheetName()).cellAddress(cellAddress)
.defaultMessage(defaultMessage)
.build());
Expand All @@ -966,7 +966,7 @@ public void rejectSheetValue(final String field, final Object fieldValue, final
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.codes(generateMessageCodes(errorCode, field, fieldType), errorArgs)
.codes(generateMessageCodes(errorCode, buildFieldPath(field), fieldType), errorArgs)
.sheetName(getSheetName()).cellAddress(cellAddress)
.build());
}
Expand All @@ -987,7 +987,7 @@ public void rejectSheetValue(final String field, final Object fieldValue, final
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.codes(generateMessageCodes(errorCode, field, fieldType), errorArgs)
.codes(generateMessageCodes(errorCode, buildFieldPath(field), fieldType), errorArgs)
.sheetName(getSheetName()).cellAddress(cellAddress)
.defaultMessage(defaultMessage)
.build());
Expand All @@ -1007,7 +1007,7 @@ public void rejectSheetValue(final String field, final Object fieldValue, final
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.codes(generateMessageCodes(errorCode, field, fieldType), errorVars)
.codes(generateMessageCodes(errorCode, buildFieldPath(field), fieldType), errorVars)
.sheetName(getSheetName()).cellAddress(cellAddress)
.build());
}
Expand All @@ -1027,7 +1027,7 @@ public void rejectSheetValue(final String field, final Object fieldValue, final
addError(FieldErrorBuilder.create()
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.codes(generateMessageCodes(errorCode, field, fieldType), errorVars)
.codes(generateMessageCodes(errorCode, buildFieldPath(field), fieldType), errorVars)
.sheetName(getSheetName()).cellAddress(cellAddress)
.defaultMessage(defaultMessage)
.build());
Expand All @@ -1045,7 +1045,7 @@ public void rejectTypeBind(final String field, final Object fieldValue, final Cl
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.typeBindFailure(true)
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), field, fieldType), errorVars)
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), buildFieldPath(field), fieldType), errorVars)
.build());
}

Expand All @@ -1064,7 +1064,7 @@ public void rejectSheetTypeBind(final String field, final Object fieldValue, fin
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.typeBindFailure(true)
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), field, fieldType), errorVars)
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), buildFieldPath(field), fieldType), errorVars)
.sheetName(getSheetName()).cellAddress(cellAddress)
.label(label)
.build());
Expand All @@ -1081,7 +1081,7 @@ public void rejectTypeBind(final String field, final Object fieldValue, final Cl
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.typeBindFailure(true)
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), field, fieldType))
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), buildFieldPath(field), fieldType))
.build());
}

Expand All @@ -1099,7 +1099,7 @@ public void rejectSheetTypeBind(final String field, final Object fieldValue, fin
.objectName(getObjectName()).fieldPath(buildFieldPath(field))
.fieldValue(fieldValue).fieldType(fieldType)
.typeBindFailure(true)
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), field, fieldType))
.codes(getMessageCodeGenerator().generateTypeMismatchCodes(getObjectName(), buildFieldPath(field), fieldType))
.sheetName(getSheetName()).cellAddress(cellAddress)
.label(label)
.build());
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/gh/mygreen/xlsmapper/validation/ObjectValidatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ public void test_error() throws Exception {
}

// データの書き換え
// sheet.className = null;
sheet.className = null;
sheet.list.get(1).email = "test";
// sheet.list.get(2).birthday = getDateByDay(new Date(), 1);
sheet.list.get(2).birthday = getDateByDay(new Date(), 1);

// 入力値検証
SampleSheetValidator validator = new SampleSheetValidator();
Expand Down

0 comments on commit e483178

Please sign in to comment.