Преглед изворни кода

improve validation messages

Shinsuke Sugaya пре 9 година
родитељ
комит
6ccf5fb461
50 измењених фајлова са 420 додато и 364 уклоњено
  1. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java
  2. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java
  3. 3 2
      src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/EditForm.java
  4. 6 6
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
  5. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java
  6. 1 0
      src/main/java/org/codelibs/fess/app/web/admin/design/DesignEditForm.java
  7. 1 4
      src/main/java/org/codelibs/fess/app/web/admin/design/DesignForm.java
  8. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java
  9. 2 3
      src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java
  10. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java
  11. 2 3
      src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java
  12. 6 6
      src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java
  13. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/CreateForm.java
  14. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/EditForm.java
  15. 10 10
      src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
  16. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java
  17. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java
  18. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java
  19. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java
  20. 3 4
      src/main/java/org/codelibs/fess/app/web/admin/joblog/EditForm.java
  21. 5 5
      src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java
  22. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java
  23. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java
  24. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java
  25. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java
  26. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java
  27. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/pathmapping/CreateForm.java
  28. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/pathmapping/EditForm.java
  29. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java
  30. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java
  31. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java
  32. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java
  33. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/roletype/CreateForm.java
  34. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/roletype/EditForm.java
  35. 4 7
      src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/CreateForm.java
  36. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/EditForm.java
  37. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/CreateForm.java
  38. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/EditForm.java
  39. 6 6
      src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/CreateForm.java
  40. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/EditForm.java
  41. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java
  42. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java
  43. 4 4
      src/main/java/org/codelibs/fess/app/web/admin/webauthentication/CreateForm.java
  44. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/webauthentication/EditForm.java
  45. 10 10
      src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
  46. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java
  47. 8 8
      src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java
  48. 3 10
      src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java
  49. 207 140
      src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java
  50. 42 39
      src/main/resources/fess_message.properties

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.boostdocumentrule;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -25,12 +24,13 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -44,7 +44,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -52,7 +52,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.boostdocumentrule;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -35,11 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 3 - 2
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/EditForm.java

@@ -17,10 +17,10 @@ package org.codelibs.fess.app.web.admin.crawlingsession;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -30,7 +30,7 @@ public class EditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public int crudMode;
 
     @Required
@@ -46,6 +46,7 @@ public class EditForm implements Serializable {
 
     public String expiredTime;
 
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 6 - 6
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.dataconfig;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -25,6 +24,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -38,7 +38,7 @@ public class CreateForm implements Serializable {
 
     public String[] labelTypeIds;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -56,8 +56,8 @@ public class CreateForm implements Serializable {
     public String handlerScript;
 
     @Required
-    // @FloatType
-    public float boost;
+    @ValidateTypeFailure
+    public Float boost;
 
     @Required
     @Size(max = 5)
@@ -66,7 +66,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -74,7 +74,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.dataconfig;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 1 - 0
src/main/java/org/codelibs/fess/app/web/admin/design/DesignEditForm.java

@@ -22,5 +22,6 @@ package org.codelibs.fess.app.web.admin.design;
 public class DesignEditForm {
 
     public String fileName;
+
     public String content;
 }

+ 1 - 4
src/main/java/org/codelibs/fess/app/web/admin/design/DesignForm.java

@@ -24,14 +24,11 @@ public class DesignForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    // TODO jflute target needed? (2015/07/25)
-    //@Required(target = "upload")
     @Required
     public MultipartFormFile designFile;
 
     public String designFileName;
 
-    // TODO jflute unneeded? no validator at the method (2015/07/25)
-    //@Required(target = "edit,editAsUseDefault,download,delete")
+    @Required
     public String fileName;
 }

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java

@@ -17,11 +17,11 @@ package org.codelibs.fess.app.web.admin.dict.kuromoji;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -34,7 +34,7 @@ public class CreateForm implements Serializable {
     @Required
     public String dictId;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required

+ 2 - 3
src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java

@@ -15,16 +15,15 @@
  */
 package org.codelibs.fess.app.web.admin.dict.kuromoji;
 
-import javax.validation.constraints.Digits;
-
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 public class EditForm extends CreateForm {
 
     private static final long serialVersionUID = 1L;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long id;
 
     public String getDisplayId() {

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java

@@ -17,11 +17,11 @@ package org.codelibs.fess.app.web.admin.dict.synonym;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -34,7 +34,7 @@ public class CreateForm implements Serializable {
     @Required
     public String dictId;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required

+ 2 - 3
src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java

@@ -15,9 +15,8 @@
  */
 package org.codelibs.fess.app.web.admin.dict.synonym;
 
-import javax.validation.constraints.Digits;
-
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -28,7 +27,7 @@ public class EditForm extends CreateForm {
     private static final long serialVersionUID = 1L;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long id;
 
     public String getDisplayId() {

+ 6 - 6
src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java

@@ -19,10 +19,10 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -36,14 +36,14 @@ public class EditForm implements Serializable {
 
     public String fileConfigName;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public String pageNumber;
 
+    // TODO remove?
     public Map<String, String> searchParams = new HashMap<String, String>();
 
-    @Digits(integer = 10, fraction = 0)
-    // TODO necessary?
-    public int crudMode;
+    @ValidateTypeFailure
+    public Integer crudMode;
 
     public String getCurrentPageNumber() {
         return pageNumber;
@@ -64,7 +64,7 @@ public class EditForm implements Serializable {
     public String errorLog;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public String errorCount;
 
     @Required

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.fileauthentication;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -25,6 +24,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -34,7 +34,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Size(max = 100)
@@ -42,7 +42,7 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer port;
 
     @Size(max = 10)
@@ -67,7 +67,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.fileauthentication;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 255)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 10 - 10
src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.fileconfig;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -27,6 +26,7 @@ import org.codelibs.fess.annotation.UriType;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -40,7 +40,7 @@ public class CreateForm implements Serializable {
 
     public String[] labelTypeIds;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -69,29 +69,29 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer depth;
 
     @Min(value = 0)
     @Max(value = 9223372036854775807l)
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long maxAccessCount;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer numOfThread;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer intervalTime;
 
     @Required
-    // @FloatType
-    public float boost;
+    @ValidateTypeFailure
+    public Float boost;
 
     @Required
     @Size(max = 5)
@@ -100,7 +100,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -108,7 +108,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.fileconfig;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java

@@ -17,12 +17,12 @@ package org.codelibs.fess.app.web.admin.general;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -44,7 +44,7 @@ public class EditForm implements Serializable {
     @Required
     @Max(1000)
     @Min(-1)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer dayForCleanup;
 
     @Required
@@ -82,7 +82,7 @@ public class EditForm implements Serializable {
     @Required
     @Max(10000)
     @Min(-1)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer failureCountThreshold;
 
     @Size(max = 10)

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java

@@ -17,10 +17,10 @@ package org.codelibs.fess.app.web.admin.group;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -30,8 +30,8 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
-    public int crudMode;
+    @ValidateTypeFailure
+    public Integer crudMode;
 
     @Required
     @Size(max = 100)

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.group;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 3 - 4
src/main/java/org/codelibs/fess/app/web/admin/joblog/EditForm.java

@@ -17,9 +17,8 @@ package org.codelibs.fess.app.web.admin.joblog;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
-
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -29,11 +28,11 @@ public class EditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public int crudMode;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public String id;
 
     @Required

+ 5 - 5
src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.keymatch;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -25,6 +24,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -47,19 +47,19 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer maxSize;
 
     @Required
-    // @FloatType
-    public float boost;
+    @ValidateTypeFailure
+    public Float boost;
 
     @Required
     @Size(max = 255)
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.keymatch;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -35,11 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 255)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.labeltype;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Pattern;
@@ -26,6 +25,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -38,7 +38,7 @@ public class CreateForm implements Serializable {
 
     public String[] roleTypeIds;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -58,7 +58,7 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -66,7 +66,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.labeltype;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.overlappinghost;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -25,6 +24,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -34,7 +34,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -48,7 +48,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -56,7 +56,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.overlappinghost;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/pathmapping/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.pathmapping;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -25,6 +24,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -35,7 +35,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -52,7 +52,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -60,7 +60,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/pathmapping/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.pathmapping;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java

@@ -17,12 +17,12 @@ package org.codelibs.fess.app.web.admin.requestheader;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -33,7 +33,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -53,7 +53,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.requestheader;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/role/CreateForm.java

@@ -17,10 +17,10 @@ package org.codelibs.fess.app.web.admin.role;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -30,7 +30,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public int crudMode;
 
     @Required

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/role/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.role;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/roletype/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.roletype;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Pattern;
@@ -26,6 +25,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -35,7 +35,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -50,7 +50,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -58,7 +58,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/roletype/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.roletype;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 4 - 7
src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.scheduledjob;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -26,6 +25,7 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.CronExpression;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -34,7 +34,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public int crudMode;
 
     @Required
@@ -57,19 +57,16 @@ public class CreateForm implements Serializable {
     @Size(max = 4000)
     public String scriptData;
 
-    // ignore
     public String crawler;
 
-    // ignore
     public String jobLogging;
 
-    // ignore
     public String available;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -77,7 +74,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.scheduledjob;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -32,7 +32,7 @@ public class EditForm extends CreateForm {
     public String id;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/CreateForm.java

@@ -17,11 +17,11 @@ package org.codelibs.fess.app.web.admin.suggestbadword;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -31,8 +31,8 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
-    public int crudMode;
+    @ValidateTypeFailure
+    public Integer crudMode;
 
     @Required
     public String suggestWord;
@@ -42,7 +42,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.suggestbadword;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 6 - 6
src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/CreateForm.java

@@ -17,11 +17,11 @@ package org.codelibs.fess.app.web.admin.suggestelevateword;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -31,8 +31,8 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
-    public int crudMode;
+    @ValidateTypeFailure
+    public Integer crudMode;
 
     @Required
     public String suggestWord;
@@ -44,15 +44,15 @@ public class CreateForm implements Serializable {
     public String targetLabel;
 
     @Required
-    // @FloatType
-    public float boost;
+    @ValidateTypeFailure
+    public Float boost;
 
     @Required
     @Size(max = 1000)
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.suggestelevateword;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java

@@ -17,10 +17,10 @@ package org.codelibs.fess.app.web.admin.user;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author shinsuke
@@ -30,7 +30,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.user;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -32,7 +32,7 @@ public class EditForm extends CreateForm {
     public String id;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 4 - 4
src/main/java/org/codelibs/fess/app/web/admin/webauthentication/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.webauthentication;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -25,6 +24,7 @@ import javax.validation.constraints.Size;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -34,7 +34,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Size(max = 100)
@@ -42,7 +42,7 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer port;
 
     @Size(max = 100)
@@ -70,7 +70,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/webauthentication/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.webauthentication;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -35,11 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 255)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 10 - 10
src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java

@@ -17,7 +17,6 @@ package org.codelibs.fess.app.web.admin.webconfig;
 
 import java.io.Serializable;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.Size;
@@ -28,6 +27,7 @@ import org.codelibs.fess.annotation.UriType;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author codelibs
@@ -42,7 +42,7 @@ public class CreateForm implements Serializable {
 
     public String[] labelTypeIds;
 
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer crudMode;
 
     @Required
@@ -71,12 +71,12 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer depth;
 
     @Min(value = 0)
     @Max(value = 9223372036854775807l)
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long maxAccessCount;
 
     @Required
@@ -86,18 +86,18 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer numOfThread;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer intervalTime;
 
     @Required
-    // @FloatType
-    public float boost;
+    @ValidateTypeFailure
+    public Float boost;
 
     @Required
     @Size(max = 5)
@@ -106,7 +106,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer sortOrder;
 
     @Required
@@ -114,7 +114,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long createdTime;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.webconfig;
 
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
+import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
 /**
  * @author Keiichi Watanabe
@@ -34,11 +34,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
-    @Digits(integer = 19, fraction = 0)
+    @ValidateTypeFailure
     public Long updatedTime;
 
     @Required
-    @Digits(integer = 10, fraction = 0)
+    @ValidateTypeFailure
     public Integer versionNo;
 
 }

+ 8 - 8
src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java

@@ -155,16 +155,16 @@ public class AdminWizardAction extends FessAdminAction {
                 wConfig.setBoost(1.0f);
                 wConfig.setCreatedBy(username);
                 wConfig.setCreatedTime(now);
-                if (StringUtil.isNotBlank(form.depth)) {
-                    wConfig.setDepth(Integer.parseInt(form.depth));
+                if (form.depth != null) {
+                    wConfig.setDepth(form.depth);
                 }
                 wConfig.setExcludedDocUrls(getDefaultString("default.config.web.excludedDocUrls", StringUtil.EMPTY));
                 wConfig.setExcludedUrls(getDefaultString("default.config.web.excludedUrls", StringUtil.EMPTY));
                 wConfig.setIncludedDocUrls(getDefaultString("default.config.web.includedDocUrls", StringUtil.EMPTY));
                 wConfig.setIncludedUrls(getDefaultString("default.config.web.includedUrls", StringUtil.EMPTY));
                 wConfig.setIntervalTime(getDefaultInteger("default.config.web.intervalTime", Constants.DEFAULT_INTERVAL_TIME_FOR_WEB));
-                if (StringUtil.isNotBlank(form.maxAccessCount)) {
-                    wConfig.setMaxAccessCount(Long.parseLong(form.maxAccessCount));
+                if (form.maxAccessCount != null) {
+                    wConfig.setMaxAccessCount(form.maxAccessCount);
                 }
                 wConfig.setName(configName);
                 wConfig.setNumOfThread(getDefaultInteger("default.config.web.numOfThread", Constants.DEFAULT_NUM_OF_THREAD_FOR_WEB));
@@ -183,16 +183,16 @@ public class AdminWizardAction extends FessAdminAction {
                 fConfig.setBoost(1.0f);
                 fConfig.setCreatedBy(username);
                 fConfig.setCreatedTime(now);
-                if (StringUtil.isNotBlank(form.depth)) {
-                    fConfig.setDepth(Integer.parseInt(form.depth));
+                if (form.depth != null) {
+                    fConfig.setDepth(form.depth);
                 }
                 fConfig.setExcludedDocPaths(getDefaultString("default.config.file.excludedDocPaths", StringUtil.EMPTY));
                 fConfig.setExcludedPaths(getDefaultString("default.config.file.excludedPaths", StringUtil.EMPTY));
                 fConfig.setIncludedDocPaths(getDefaultString("default.config.file.includedDocPaths", StringUtil.EMPTY));
                 fConfig.setIncludedPaths(getDefaultString("default.config.file.includedPaths", StringUtil.EMPTY));
                 fConfig.setIntervalTime(getDefaultInteger("default.config.file.intervalTime", Constants.DEFAULT_INTERVAL_TIME_FOR_FS));
-                if (StringUtil.isNotBlank(form.maxAccessCount)) {
-                    fConfig.setMaxAccessCount(Long.parseLong(form.maxAccessCount));
+                if (form.maxAccessCount != null) {
+                    fConfig.setMaxAccessCount(form.maxAccessCount);
                 }
                 fConfig.setName(configName);
                 fConfig.setNumOfThread(getDefaultInteger("default.config.file.numOfThread", Constants.DEFAULT_NUM_OF_THREAD_FOR_FS));

+ 3 - 10
src/main/java/org/codelibs/fess/app/web/admin/wizard/CrawlingConfigForm.java

@@ -33,15 +33,8 @@ public class CrawlingConfigForm implements Serializable {
     @Size(max = 1000)
     public String crawlingConfigPath;
 
-    // TODO
-    //    @Min(0)
-    //    @Max(Integer.MAX_VALUE)
-    public String depth;
-
-    // TODO
-    @Size(max = 100)
-    //    @Min(0)
-    //    @Max(Long.MAX_VALUE)
-    public String maxAccessCount;
+    public Integer depth;
+
+    public Long maxAccessCount;
 
 }

+ 207 - 140
src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java

@@ -38,121 +38,128 @@ public class FessMessages extends FessLabels {
     /** The key of the message: </li> */
     public static final String ERRORS_SUFFIX = "{errors.suffix}";
 
-    /** The key of the message: must be false */
+    /** The key of the message: {item} must be false. */
     public static final String CONSTRAINTS_AssertFalse_MESSAGE = "{constraints.AssertFalse.message}";
 
-    /** The key of the message: must be true */
+    /** The key of the message: {item} must be true. */
     public static final String CONSTRAINTS_AssertTrue_MESSAGE = "{constraints.AssertTrue.message}";
 
-    /** The key of the message: must be less than ${inclusive == true ? 'or equal to ' : ''}{value} */
+    /** The key of the message: {item} must be less than ${inclusive == true ? 'or equal to ' : ''}{value}. */
     public static final String CONSTRAINTS_DecimalMax_MESSAGE = "{constraints.DecimalMax.message}";
 
-    /** The key of the message: must be greater than ${inclusive == true ? 'or equal to ' : ''}{value} */
+    /** The key of the message: {item} must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}. */
     public static final String CONSTRAINTS_DecimalMin_MESSAGE = "{constraints.DecimalMin.message}";
 
-    /** The key of the message: numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected) */
+    /** The key of the message: {item} is numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected). */
     public static final String CONSTRAINTS_Digits_MESSAGE = "{constraints.Digits.message}";
 
-    /** The key of the message: must be in the future */
+    /** The key of the message: {item} must be in the future. */
     public static final String CONSTRAINTS_Future_MESSAGE = "{constraints.Future.message}";
 
-    /** The key of the message: must be less than or equal to {value} */
+    /** The key of the message: {item} must be less than or equal to {value}. */
     public static final String CONSTRAINTS_Max_MESSAGE = "{constraints.Max.message}";
 
-    /** The key of the message: must be greater than or equal to {value} */
+    /** The key of the message: {item} must be greater than or equal to {value}. */
     public static final String CONSTRAINTS_Min_MESSAGE = "{constraints.Min.message}";
 
-    /** The key of the message: may not be null */
+    /** The key of the message: {item} may not be null. */
     public static final String CONSTRAINTS_NotNull_MESSAGE = "{constraints.NotNull.message}";
 
-    /** The key of the message: must be null */
+    /** The key of the message: {item} must be null. */
     public static final String CONSTRAINTS_Null_MESSAGE = "{constraints.Null.message}";
 
-    /** The key of the message: must be in the past */
+    /** The key of the message: {item} must be in the past. */
     public static final String CONSTRAINTS_Past_MESSAGE = "{constraints.Past.message}";
 
-    /** The key of the message: must match "{regexp}" */
+    /** The key of the message: {item} must match "{regexp}". */
     public static final String CONSTRAINTS_Pattern_MESSAGE = "{constraints.Pattern.message}";
 
-    /** The key of the message: size must be between {min} and {max} */
+    /** The key of the message: Size of {item} must be between {min} and {max}. */
     public static final String CONSTRAINTS_Size_MESSAGE = "{constraints.Size.message}";
 
-    /** The key of the message: invalid credit card number */
+    /** The key of the message: {item} is invalid credit card number. */
     public static final String CONSTRAINTS_CreditCardNumber_MESSAGE = "{constraints.CreditCardNumber.message}";
 
-    /** The key of the message: invalid {type} barcode */
+    /** The key of the message: {item} is invalid {type} barcode. */
     public static final String CONSTRAINTS_EAN_MESSAGE = "{constraints.EAN.message}";
 
-    /** The key of the message: not a well-formed email address */
+    /** The key of the message: {item} is not a well-formed email address. */
     public static final String CONSTRAINTS_Email_MESSAGE = "{constraints.Email.message}";
 
-    /** The key of the message: length must be between {min} and {max} */
+    /** The key of the message: Length of {item} must be between {min} and {max}. */
     public static final String CONSTRAINTS_Length_MESSAGE = "{constraints.Length.message}";
 
-    /** The key of the message: The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed */
+    /** The key of the message: The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed. */
     public static final String CONSTRAINTS_LuhnCheck_MESSAGE = "{constraints.LuhnCheck.message}";
 
-    /** The key of the message: The check digit for ${value} is invalid, Modulo 10 checksum failed */
+    /** The key of the message: The check digit for ${value} is invalid, Modulo 10 checksum failed. */
     public static final String CONSTRAINTS_Mod10Check_MESSAGE = "{constraints.Mod10Check.message}";
 
-    /** The key of the message: The check digit for ${value} is invalid, Modulo 11 checksum failed */
+    /** The key of the message: The check digit for ${value} is invalid, Modulo 11 checksum failed. */
     public static final String CONSTRAINTS_Mod11Check_MESSAGE = "{constraints.Mod11Check.message}";
 
-    /** The key of the message: The check digit for ${value} is invalid, ${modType} checksum failed */
+    /** The key of the message: The check digit for ${value} is invalid, ${modType} checksum failed. */
     public static final String CONSTRAINTS_ModCheck_MESSAGE = "{constraints.ModCheck.message}";
 
-    /** The key of the message: may not be empty */
+    /** The key of the message: {item} may not be empty. */
     public static final String CONSTRAINTS_NotBlank_MESSAGE = "{constraints.NotBlank.message}";
 
-    /** The key of the message: may not be empty */
+    /** The key of the message: {item} may not be empty. */
     public static final String CONSTRAINTS_NotEmpty_MESSAGE = "{constraints.NotEmpty.message}";
 
-    /** The key of the message: script expression "{script}" didn't evaluate to true */
+    /** The key of the message: script expression "{script}" didn't evaluate to true. */
     public static final String CONSTRAINTS_ParametersScriptAssert_MESSAGE = "{constraints.ParametersScriptAssert.message}";
 
-    /** The key of the message: must be between {min} and {max} */
+    /** The key of the message: {item} must be between {min} and {max}. */
     public static final String CONSTRAINTS_Range_MESSAGE = "{constraints.Range.message}";
 
-    /** The key of the message: may have unsafe html content */
+    /** The key of the message: {item} may have unsafe html content. */
     public static final String CONSTRAINTS_SafeHtml_MESSAGE = "{constraints.SafeHtml.message}";
 
-    /** The key of the message: script expression "{script}" didn't evaluate to true */
+    /** The key of the message: script expression "{script}" didn't evaluate to true. */
     public static final String CONSTRAINTS_ScriptAssert_MESSAGE = "{constraints.ScriptAssert.message}";
 
-    /** The key of the message: must be a valid URL */
+    /** The key of the message: {item} must be a valid URL. */
     public static final String CONSTRAINTS_URL_MESSAGE = "{constraints.URL.message}";
 
-    /** The key of the message: is required */
+    /** The key of the message: {item} is required. */
     public static final String CONSTRAINTS_Required_MESSAGE = "{constraints.Required.message}";
 
-    /** The key of the message: should be integer */
-    public static final String CONSTRAINTS_IntegerType_MESSAGE = "{constraints.IntegerType.message}";
+    /** The key of the message: {item} should be numeric. */
+    public static final String CONSTRAINTS_TypeInteger_MESSAGE = "{constraints.TypeInteger.message}";
 
-    /** The key of the message: should be long */
-    public static final String CONSTRAINTS_LongType_MESSAGE = "{constraints.LongType.message}";
+    /** The key of the message: {item} should be numeric. */
+    public static final String CONSTRAINTS_TypeLong_MESSAGE = "{constraints.TypeLong.message}";
 
-    /** The key of the message: should be float */
-    public static final String CONSTRAINTS_FloatType_MESSAGE = "{constraints.FloatType.message}";
+    /** The key of the message: {item} should be numeric. */
+    public static final String CONSTRAINTS_TypeFloat_MESSAGE = "{constraints.TypeFloat.message}";
 
-    /** The key of the message: should be double */
-    public static final String CONSTRAINTS_DoubleType_MESSAGE = "{constraints.DoubleType.message}";
+    /** The key of the message: {item} should be numeric. */
+    public static final String CONSTRAINTS_TypeDouble_MESSAGE = "{constraints.TypeDouble.message}";
 
-    /** The key of the message: could not login */
+    /** The key of the message: {item} cannot convert as {propertyType}. */
+    public static final String CONSTRAINTS_TypeAny_MESSAGE = "{constraints.TypeAny.message}";
+
+    /** The key of the message: {item} cannot convert as {propertyType}. */
+    public static final String ORG_LASTAFLUTE_VALIDATOR_CONSTRAINTS_TypeAny_MESSAGE =
+            "{org.lastaflute.validator.constraints.TypeAny.message}";
+
+    /** The key of the message: could not login. */
     public static final String ERRORS_LOGIN_FAILURE = "{errors.login.failure}";
 
-    /** The key of the message: retry because of illegal transition */
+    /** The key of the message: retry because of illegal transition. */
     public static final String ERRORS_APP_ILLEGAL_TRANSITION = "{errors.app.illegal.transition}";
 
-    /** The key of the message: others might be updated, so retry */
+    /** The key of the message: others might be updated, so retry. */
     public static final String ERRORS_APP_DB_ALREADY_DELETED = "{errors.app.db.already.deleted}";
 
-    /** The key of the message: others might be updated, so retry */
+    /** The key of the message: others might be updated, so retry. */
     public static final String ERRORS_APP_DB_ALREADY_UPDATED = "{errors.app.db.already.updated}";
 
-    /** The key of the message: already existing data, so retry */
+    /** The key of the message: already existing data, so retry. */
     public static final String ERRORS_APP_DB_ALREADY_EXISTS = "{errors.app.db.already.exists}";
 
-    /** The key of the message: double submit might be requested */
+    /** The key of the message: double submit might be requested. */
     public static final String ERRORS_APP_DOUBLE_SUBMIT_REQUEST = "{errors.app.double.submit.request}";
 
     /** The key of the message: Failed to update parameters. Please contact to a site administrator. */
@@ -525,259 +532,276 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'constraints.AssertFalse.message' with parameters.
      * <pre>
-     * message: must be false
+     * message: {item} must be false.
      * comment: ---------------
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsAssertFalseMessage(String property) {
+    public FessMessages addConstraintsAssertFalseMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_AssertFalse_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_AssertFalse_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.AssertTrue.message' with parameters.
      * <pre>
-     * message: must be true
+     * message: {item} must be true.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsAssertTrueMessage(String property) {
+    public FessMessages addConstraintsAssertTrueMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_AssertTrue_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_AssertTrue_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.DecimalMax.message' with parameters.
      * <pre>
-     * message: must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
+     * message: {item} must be less than ${inclusive == true ? 'or equal to ' : ''}{value}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param value The parameter value for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsDecimalMaxMessage(String property, String value) {
+    public FessMessages addConstraintsDecimalMaxMessage(String property, String item, String value) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_DecimalMax_MESSAGE, value));
+        add(property, new ActionMessage(CONSTRAINTS_DecimalMax_MESSAGE, item, value));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.DecimalMin.message' with parameters.
      * <pre>
-     * message: must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
+     * message: {item} must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param value The parameter value for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsDecimalMinMessage(String property, String value) {
+    public FessMessages addConstraintsDecimalMinMessage(String property, String item, String value) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_DecimalMin_MESSAGE, value));
+        add(property, new ActionMessage(CONSTRAINTS_DecimalMin_MESSAGE, item, value));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Digits.message' with parameters.
      * <pre>
-     * message: numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+     * message: {item} is numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected).
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param integer The parameter integer for message. (NotNull)
      * @param fraction The parameter fraction for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsDigitsMessage(String property, String integer, String fraction) {
+    public FessMessages addConstraintsDigitsMessage(String property, String item, String integer, String fraction) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Digits_MESSAGE, integer, fraction));
+        add(property, new ActionMessage(CONSTRAINTS_Digits_MESSAGE, item, integer, fraction));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Future.message' with parameters.
      * <pre>
-     * message: must be in the future
+     * message: {item} must be in the future.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsFutureMessage(String property) {
+    public FessMessages addConstraintsFutureMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Future_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_Future_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Max.message' with parameters.
      * <pre>
-     * message: must be less than or equal to {value}
+     * message: {item} must be less than or equal to {value}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param value The parameter value for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsMaxMessage(String property, String value) {
+    public FessMessages addConstraintsMaxMessage(String property, String item, String value) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Max_MESSAGE, value));
+        add(property, new ActionMessage(CONSTRAINTS_Max_MESSAGE, item, value));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Min.message' with parameters.
      * <pre>
-     * message: must be greater than or equal to {value}
+     * message: {item} must be greater than or equal to {value}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param value The parameter value for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsMinMessage(String property, String value) {
+    public FessMessages addConstraintsMinMessage(String property, String item, String value) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Min_MESSAGE, value));
+        add(property, new ActionMessage(CONSTRAINTS_Min_MESSAGE, item, value));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.NotNull.message' with parameters.
      * <pre>
-     * message: may not be null
+     * message: {item} may not be null.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsNotNullMessage(String property) {
+    public FessMessages addConstraintsNotNullMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_NotNull_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_NotNull_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Null.message' with parameters.
      * <pre>
-     * message: must be null
+     * message: {item} must be null.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsNullMessage(String property) {
+    public FessMessages addConstraintsNullMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Null_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_Null_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Past.message' with parameters.
      * <pre>
-     * message: must be in the past
+     * message: {item} must be in the past.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsPastMessage(String property) {
+    public FessMessages addConstraintsPastMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Past_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_Past_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Pattern.message' with parameters.
      * <pre>
-     * message: must match "{regexp}"
+     * message: {item} must match "{regexp}".
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param regexp The parameter regexp for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsPatternMessage(String property, String regexp) {
+    public FessMessages addConstraintsPatternMessage(String property, String item, String regexp) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Pattern_MESSAGE, regexp));
+        add(property, new ActionMessage(CONSTRAINTS_Pattern_MESSAGE, item, regexp));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Size.message' with parameters.
      * <pre>
-     * message: size must be between {min} and {max}
+     * message: Size of {item} must be between {min} and {max}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param min The parameter min for message. (NotNull)
      * @param max The parameter max for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsSizeMessage(String property, String min, String max) {
+    public FessMessages addConstraintsSizeMessage(String property, String item, String min, String max) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Size_MESSAGE, min, max));
+        add(property, new ActionMessage(CONSTRAINTS_Size_MESSAGE, item, min, max));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.CreditCardNumber.message' with parameters.
      * <pre>
-     * message: invalid credit card number
+     * message: {item} is invalid credit card number.
      * comment: -------------------
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsCreditCardNumberMessage(String property) {
+    public FessMessages addConstraintsCreditCardNumberMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_CreditCardNumber_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_CreditCardNumber_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.EAN.message' with parameters.
      * <pre>
-     * message: invalid {type} barcode
+     * message: {item} is invalid {type} barcode.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param type The parameter type for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsEanMessage(String property, String type) {
+    public FessMessages addConstraintsEanMessage(String property, String item, String type) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_EAN_MESSAGE, type));
+        add(property, new ActionMessage(CONSTRAINTS_EAN_MESSAGE, item, type));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Email.message' with parameters.
      * <pre>
-     * message: not a well-formed email address
+     * message: {item} is not a well-formed email address.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsEmailMessage(String property) {
+    public FessMessages addConstraintsEmailMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Email_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_Email_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Length.message' with parameters.
      * <pre>
-     * message: length must be between {min} and {max}
+     * message: Length of {item} must be between {min} and {max}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param min The parameter min for message. (NotNull)
      * @param max The parameter max for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsLengthMessage(String property, String min, String max) {
+    public FessMessages addConstraintsLengthMessage(String property, String item, String min, String max) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Length_MESSAGE, min, max));
+        add(property, new ActionMessage(CONSTRAINTS_Length_MESSAGE, item, min, max));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.LuhnCheck.message' with parameters.
      * <pre>
-     * message: The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed
+     * message: The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @param value The parameter value for message. (NotNull)
@@ -792,7 +816,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'constraints.Mod10Check.message' with parameters.
      * <pre>
-     * message: The check digit for ${value} is invalid, Modulo 10 checksum failed
+     * message: The check digit for ${value} is invalid, Modulo 10 checksum failed.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @param value The parameter value for message. (NotNull)
@@ -807,7 +831,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'constraints.Mod11Check.message' with parameters.
      * <pre>
-     * message: The check digit for ${value} is invalid, Modulo 11 checksum failed
+     * message: The check digit for ${value} is invalid, Modulo 11 checksum failed.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @param value The parameter value for message. (NotNull)
@@ -822,7 +846,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'constraints.ModCheck.message' with parameters.
      * <pre>
-     * message: The check digit for ${value} is invalid, ${modType} checksum failed
+     * message: The check digit for ${value} is invalid, ${modType} checksum failed.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @param value The parameter value for message. (NotNull)
@@ -838,35 +862,37 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'constraints.NotBlank.message' with parameters.
      * <pre>
-     * message: may not be empty
+     * message: {item} may not be empty.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsNotBlankMessage(String property) {
+    public FessMessages addConstraintsNotBlankMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_NotBlank_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_NotBlank_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.NotEmpty.message' with parameters.
      * <pre>
-     * message: may not be empty
+     * message: {item} may not be empty.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsNotEmptyMessage(String property) {
+    public FessMessages addConstraintsNotEmptyMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_NotEmpty_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_NotEmpty_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.ParametersScriptAssert.message' with parameters.
      * <pre>
-     * message: script expression "{script}" didn't evaluate to true
+     * message: script expression "{script}" didn't evaluate to true.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @param script The parameter script for message. (NotNull)
@@ -881,37 +907,39 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'constraints.Range.message' with parameters.
      * <pre>
-     * message: must be between {min} and {max}
+     * message: {item} must be between {min} and {max}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @param min The parameter min for message. (NotNull)
      * @param max The parameter max for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsRangeMessage(String property, String min, String max) {
+    public FessMessages addConstraintsRangeMessage(String property, String item, String min, String max) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Range_MESSAGE, min, max));
+        add(property, new ActionMessage(CONSTRAINTS_Range_MESSAGE, item, min, max));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.SafeHtml.message' with parameters.
      * <pre>
-     * message: may have unsafe html content
+     * message: {item} may have unsafe html content.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsSafeHtmlMessage(String property) {
+    public FessMessages addConstraintsSafeHtmlMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_SafeHtml_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_SafeHtml_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.ScriptAssert.message' with parameters.
      * <pre>
-     * message: script expression "{script}" didn't evaluate to true
+     * message: script expression "{script}" didn't evaluate to true.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @param script The parameter script for message. (NotNull)
@@ -926,91 +954,130 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'constraints.URL.message' with parameters.
      * <pre>
-     * message: must be a valid URL
+     * message: {item} must be a valid URL.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsUrlMessage(String property) {
+    public FessMessages addConstraintsUrlMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_URL_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_URL_MESSAGE, item));
         return this;
     }
 
     /**
      * Add the created action message for the key 'constraints.Required.message' with parameters.
      * <pre>
-     * message: is required
+     * message: {item} is required.
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsRequiredMessage(String property, String item) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_Required_MESSAGE, item));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.TypeInteger.message' with parameters.
+     * <pre>
+     * message: {item} should be numeric.
+     * </pre>
+     * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
+     * @return this. (NotNull)
+     */
+    public FessMessages addConstraintsTypeIntegerMessage(String property, String item) {
+        assertPropertyNotNull(property);
+        add(property, new ActionMessage(CONSTRAINTS_TypeInteger_MESSAGE, item));
+        return this;
+    }
+
+    /**
+     * Add the created action message for the key 'constraints.TypeLong.message' with parameters.
+     * <pre>
+     * message: {item} should be numeric.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsRequiredMessage(String property) {
+    public FessMessages addConstraintsTypeLongMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_Required_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_TypeLong_MESSAGE, item));
         return this;
     }
 
     /**
-     * Add the created action message for the key 'constraints.IntegerType.message' with parameters.
+     * Add the created action message for the key 'constraints.TypeFloat.message' with parameters.
      * <pre>
-     * message: should be integer
+     * message: {item} should be numeric.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsIntegerTypeMessage(String property) {
+    public FessMessages addConstraintsTypeFloatMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_IntegerType_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_TypeFloat_MESSAGE, item));
         return this;
     }
 
     /**
-     * Add the created action message for the key 'constraints.LongType.message' with parameters.
+     * Add the created action message for the key 'constraints.TypeDouble.message' with parameters.
      * <pre>
-     * message: should be long
+     * message: {item} should be numeric.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsLongTypeMessage(String property) {
+    public FessMessages addConstraintsTypeDoubleMessage(String property, String item) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_LongType_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_TypeDouble_MESSAGE, item));
         return this;
     }
 
     /**
-     * Add the created action message for the key 'constraints.FloatType.message' with parameters.
+     * Add the created action message for the key 'constraints.TypeAny.message' with parameters.
      * <pre>
-     * message: should be float
+     * message: {item} cannot convert as {propertyType}.
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
+     * @param propertyType The parameter propertyType for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsFloatTypeMessage(String property) {
+    public FessMessages addConstraintsTypeAnyMessage(String property, String item, String propertyType) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_FloatType_MESSAGE));
+        add(property, new ActionMessage(CONSTRAINTS_TypeAny_MESSAGE, item, propertyType));
         return this;
     }
 
     /**
-     * Add the created action message for the key 'constraints.DoubleType.message' with parameters.
+     * Add the created action message for the key 'org.lastaflute.validator.constraints.TypeAny.message' with parameters.
      * <pre>
-     * message: should be double
+     * message: {item} cannot convert as {propertyType}.
+     * comment: TODO workaround
      * </pre>
      * @param property The property name for the message. (NotNull)
+     * @param item The parameter item for message. (NotNull)
+     * @param propertyType The parameter propertyType for message. (NotNull)
      * @return this. (NotNull)
      */
-    public FessMessages addConstraintsDoubleTypeMessage(String property) {
+    public FessMessages addOrgLastafluteValidatorConstraintsTypeAnyMessage(String property, String item, String propertyType) {
         assertPropertyNotNull(property);
-        add(property, new ActionMessage(CONSTRAINTS_DoubleType_MESSAGE));
+        add(property, new ActionMessage(ORG_LASTAFLUTE_VALIDATOR_CONSTRAINTS_TypeAny_MESSAGE, item, propertyType));
         return this;
     }
 
     /**
      * Add the created action message for the key 'errors.login.failure' with parameters.
      * <pre>
-     * message: could not login
+     * message: could not login.
      * comment: - - - - - - - - - -/
      * </pre>
      * @param property The property name for the message. (NotNull)
@@ -1025,7 +1092,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'errors.app.illegal.transition' with parameters.
      * <pre>
-     * message: retry because of illegal transition
+     * message: retry because of illegal transition.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)
@@ -1039,7 +1106,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'errors.app.db.already.deleted' with parameters.
      * <pre>
-     * message: others might be updated, so retry
+     * message: others might be updated, so retry.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)
@@ -1053,7 +1120,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'errors.app.db.already.updated' with parameters.
      * <pre>
-     * message: others might be updated, so retry
+     * message: others might be updated, so retry.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)
@@ -1067,7 +1134,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'errors.app.db.already.exists' with parameters.
      * <pre>
-     * message: already existing data, so retry
+     * message: already existing data, so retry.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)
@@ -1081,7 +1148,7 @@ public class FessMessages extends FessLabels {
     /**
      * Add the created action message for the key 'errors.app.double.submit.request' with parameters.
      * <pre>
-     * message: double submit might be requested
+     * message: double submit might be requested.
      * </pre>
      * @param property The property name for the message. (NotNull)
      * @return this. (NotNull)

+ 42 - 39
src/main/resources/fess_message.properties

@@ -13,43 +13,46 @@ errors.suffix=</li>
 # ----------------------------------------------------------
 #                                            Javax Validator
 #                                            ---------------
-constraints.AssertFalse.message = must be false
-constraints.AssertTrue.message  = must be true
-constraints.DecimalMax.message  = must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
-constraints.DecimalMin.message  = must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
-constraints.Digits.message      = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-constraints.Future.message      = must be in the future
-constraints.Max.message         = must be less than or equal to {value}
-constraints.Min.message         = must be greater than or equal to {value}
-constraints.NotNull.message     = may not be null
-constraints.Null.message        = must be null
-constraints.Past.message        = must be in the past
-constraints.Pattern.message     = must match "{regexp}"
-constraints.Size.message        = size must be between {min} and {max}
+constraints.AssertFalse.message = {item} must be false.
+constraints.AssertTrue.message  = {item} must be true.
+constraints.DecimalMax.message  = {item} must be less than ${inclusive == true ? 'or equal to ' : ''}{value}.
+constraints.DecimalMin.message  = {item} must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}.
+constraints.Digits.message      = {item} is numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected).
+constraints.Future.message      = {item} must be in the future.
+constraints.Max.message         = {item} must be less than or equal to {value}.
+constraints.Min.message         = {item} must be greater than or equal to {value}.
+constraints.NotNull.message     = {item} may not be null.
+constraints.Null.message        = {item} must be null.
+constraints.Past.message        = {item} must be in the past.
+constraints.Pattern.message     = {item} must match "{regexp}".
+constraints.Size.message        = Size of {item} must be between {min} and {max}.
 
 # ----------------------------------------------------------
 #                                        Hibernate Validator
 #                                        -------------------
-constraints.CreditCardNumber.message        = invalid credit card number
-constraints.EAN.message                     = invalid {type} barcode
-constraints.Email.message                   = not a well-formed email address
-constraints.Length.message                  = length must be between {min} and {max}
-constraints.LuhnCheck.message               = The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed
-constraints.Mod10Check.message              = The check digit for ${value} is invalid, Modulo 10 checksum failed
-constraints.Mod11Check.message              = The check digit for ${value} is invalid, Modulo 11 checksum failed
-constraints.ModCheck.message                = The check digit for ${value} is invalid, ${modType} checksum failed
-constraints.NotBlank.message                = may not be empty
-constraints.NotEmpty.message                = may not be empty
-constraints.ParametersScriptAssert.message  = script expression "{script}" didn't evaluate to true
-constraints.Range.message                   = must be between {min} and {max}
-constraints.SafeHtml.message                = may have unsafe html content
-constraints.ScriptAssert.message            = script expression "{script}" didn't evaluate to true
-constraints.URL.message                     = must be a valid URL
-constraints.Required.message                = is required
-constraints.IntegerType.message             = should be integer
-constraints.LongType.message                = should be long
-constraints.FloatType.message                = should be float
-constraints.DoubleType.message                = should be double
+constraints.CreditCardNumber.message        = {item} is invalid credit card number.
+constraints.EAN.message                     = {item} is invalid {type} barcode.
+constraints.Email.message                   = {item} is not a well-formed email address.
+constraints.Length.message                  = Length of {item} must be between {min} and {max}.
+constraints.LuhnCheck.message               = The check digit for ${value} is invalid, Luhn Modulo 10 checksum failed.
+constraints.Mod10Check.message              = The check digit for ${value} is invalid, Modulo 10 checksum failed.
+constraints.Mod11Check.message              = The check digit for ${value} is invalid, Modulo 11 checksum failed.
+constraints.ModCheck.message                = The check digit for ${value} is invalid, ${modType} checksum failed.
+constraints.NotBlank.message                = {item} may not be empty.
+constraints.NotEmpty.message                = {item} may not be empty.
+constraints.ParametersScriptAssert.message  = script expression "{script}" didn't evaluate to true.
+constraints.Range.message                   = {item} must be between {min} and {max}.
+constraints.SafeHtml.message                = {item} may have unsafe html content.
+constraints.ScriptAssert.message            = script expression "{script}" didn't evaluate to true.
+constraints.URL.message                     = {item} must be a valid URL.
+constraints.Required.message                = {item} is required.
+constraints.TypeInteger.message             = {item} should be numeric.
+constraints.TypeLong.message                = {item} should be numeric.
+constraints.TypeFloat.message               = {item} should be numeric.
+constraints.TypeDouble.message              = {item} should be numeric.
+constraints.TypeAny.message                 = {item} cannot convert as {propertyType}.
+# TODO workaround
+org.lastaflute.validator.constraints.TypeAny.message = {item} cannot convert as {propertyType}.
 
 # ----------------------------------------------------------
 #                                      Application Exception
@@ -57,12 +60,12 @@ constraints.DoubleType.message                = should be double
 # /- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # five framework-embedded messages (don't change key names)
 # - - - - - - - - - -/
-errors.login.failure=could not login
-errors.app.illegal.transition=retry because of illegal transition
-errors.app.db.already.deleted=others might be updated, so retry
-errors.app.db.already.updated=others might be updated, so retry
-errors.app.db.already.exists=already existing data, so retry
-errors.app.double.submit.request=double submit might be requested
+errors.login.failure=could not login.
+errors.app.illegal.transition=retry because of illegal transition.
+errors.app.db.already.deleted=others might be updated, so retry.
+errors.app.db.already.updated=others might be updated, so retry.
+errors.app.db.already.exists=already existing data, so retry.
+errors.app.double.submit.request=double submit might be requested.
 
 # _/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
 # you can define your messages here: