瀏覽代碼

add @Digits

Shinsuke Sugaya 9 年之前
父節點
當前提交
6e7eb72026
共有 42 個文件被更改,包括 140 次插入31 次删除
  1. 4 0
      src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java
  2. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java
  3. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/CrawlingSessionEditForm.java
  4. 5 0
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java
  5. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java
  6. 2 0
      src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java
  7. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java
  8. 2 0
      src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java
  9. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java
  10. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/failureurl/FailureUrlEditForm.java
  11. 4 0
      src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/CreateForm.java
  12. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/EditForm.java
  13. 9 0
      src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java
  14. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java
  15. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java
  16. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/group/GroupEditForm.java
  17. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/joblog/JobLogEditForm.java
  18. 2 0
      src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java
  19. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java
  20. 4 0
      src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java
  21. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java
  22. 4 0
      src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java
  23. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java
  24. 4 0
      src/main/java/org/codelibs/fess/app/web/admin/pathmapping/CreateForm.java
  25. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/pathmapping/EditForm.java
  26. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java
  27. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java
  28. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/role/RoleEditForm.java
  29. 4 0
      src/main/java/org/codelibs/fess/app/web/admin/roletype/CreateForm.java
  30. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/roletype/EditForm.java
  31. 5 5
      src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java
  32. 3 3
      src/main/java/org/codelibs/fess/app/web/admin/searchlist/SearchListForm.java
  33. 5 5
      src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java
  34. 5 5
      src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/SuggestElevateWordEditForm.java
  35. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java
  36. 2 0
      src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java
  37. 2 0
      src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java
  38. 4 0
      src/main/java/org/codelibs/fess/app/web/admin/webauthentication/CreateForm.java
  39. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/webauthentication/EditForm.java
  40. 9 0
      src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java
  41. 3 0
      src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java
  42. 2 2
      src/main/java/org/codelibs/fess/app/web/search/SearchForm.java

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

@@ -2,6 +2,7 @@ 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;
@@ -14,6 +15,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -27,6 +29,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -34,6 +37,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.boostdocumentrule;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -35,9 +36,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/CrawlingSessionEditForm.java

@@ -26,7 +26,7 @@ public class CrawlingSessionEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public int crudMode;
 
     //@Required(target = "confirmfromupdate,update,delete")

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

@@ -18,6 +18,7 @@ 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;
@@ -38,6 +39,7 @@ public class CreateForm implements Serializable {
 
     public String[] labelTypeIds;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -57,6 +59,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer boost;
 
     @Required
@@ -66,6 +69,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -73,6 +77,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.dataconfig;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -34,6 +35,7 @@ public class CreateForm implements Serializable {
     @Required
     public String dictId;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required

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

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

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

@@ -18,6 +18,7 @@ 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;
@@ -34,6 +35,7 @@ public class CreateForm implements Serializable {
     @Required
     public String dictId;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required

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

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

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/failureurl/FailureUrlEditForm.java

@@ -32,12 +32,12 @@ public class FailureUrlEditForm implements Serializable {
 
     public String fileConfigName;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String pageNumber;
 
     public Map<String, String> searchParams = new HashMap<String, String>();
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     // TODO necessary?
     public int crudMode;
 
@@ -60,7 +60,7 @@ public class FailureUrlEditForm implements Serializable {
     public String errorLog;
 
     //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String errorCount;
 
     //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")

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

@@ -18,6 +18,7 @@ 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;
@@ -34,6 +35,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Size(max = 100)
@@ -41,6 +43,7 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer port;
 
     @Size(max = 10)
@@ -65,6 +68,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.fileauthentication;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 255)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -40,6 +41,7 @@ public class CreateForm implements Serializable {
 
     public String[] labelTypeIds;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -68,25 +70,30 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer depth;
 
     @Min(value = 0)
     @Max(value = 9223372036854775807l)
+    @Digits(integer = 19, fraction = 0)
     public Long maxAccessCount;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer numOfThread;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer intervalTime;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer boost;
 
     @Required
@@ -96,6 +103,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -103,6 +111,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.fileconfig;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -44,6 +45,7 @@ public class EditForm implements Serializable {
     @Required
     @Max(1000)
     @Min(-1)
+    @Digits(integer = 10, fraction = 0)
     public Integer dayForCleanup;
 
     @Required
@@ -81,6 +83,7 @@ public class EditForm implements Serializable {
     @Required
     @Max(10000)
     @Min(-1)
+    @Digits(integer = 10, fraction = 0)
     public Integer failureCountThreshold;
 
     @Size(max = 10)

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/group/GroupEditForm.java

@@ -25,7 +25,7 @@ public class GroupEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public int crudMode;
 
     //@Required(target = "confirmfromupdate,update,delete")
@@ -37,7 +37,7 @@ public class GroupEditForm implements Serializable {
     public String name;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String versionNo;
 
     public void initialize() {

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/joblog/JobLogEditForm.java

@@ -26,11 +26,11 @@ public class JobLogEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public int crudMode;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@LongType
+    //@Digits(integer=19, fraction=0)
     public String id;
 
     //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")

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

@@ -18,6 +18,7 @@ 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;
@@ -57,6 +58,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.keymatch;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -35,9 +36,11 @@ public class EditForm extends CreateForm {
     @Size(max = 255)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -38,6 +39,7 @@ public class CreateForm implements Serializable {
 
     public String[] roleTypeIds;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -60,6 +62,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -67,6 +70,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.labeltype;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -34,6 +35,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -47,6 +49,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -54,6 +57,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.overlappinghost;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -35,6 +36,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -51,6 +53,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -58,6 +61,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.pathmapping;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -33,6 +34,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -52,6 +54,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.requestheader;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -25,7 +25,7 @@ public class RoleEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public int crudMode;
 
     //@Required(target = "confirmfromupdate,update,delete")
@@ -37,7 +37,7 @@ public class RoleEditForm implements Serializable {
     public String name;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String versionNo;
 
     public void initialize() {

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

@@ -18,6 +18,7 @@ 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;
@@ -35,6 +36,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -49,6 +51,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -56,6 +59,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.roletype;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

+ 5 - 5
src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java

@@ -29,7 +29,7 @@ public class ScheduledjobEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public int crudMode;
 
     //@Required(target = "confirmfromupdate,update,delete")
@@ -66,7 +66,7 @@ public class ScheduledjobEditForm implements Serializable {
     public String available;
 
     //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     //@IntRange(min = 0, max = 2147483647)
     public String sortOrder;
 
@@ -74,16 +74,16 @@ public class ScheduledjobEditForm implements Serializable {
     public String createdBy;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@LongType
+    //@Digits(integer=19, fraction=0)
     public String createdTime;
 
     public String updatedBy;
 
-    //@LongType
+    //@Digits(integer=19, fraction=0)
     public String updatedTime;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String versionNo;
 
     public void initialize() {

+ 3 - 3
src/main/java/org/codelibs/fess/app/web/admin/searchlist/SearchListForm.java

@@ -29,13 +29,13 @@ public class SearchListForm implements Serializable {
     //@Maxbytelength(maxbytelength = 1000)
     public String query;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String start;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String pn;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String num;
 
     //@Required(target = "confirmDelete,delete")

+ 5 - 5
src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java

@@ -30,12 +30,12 @@ public class SuggestBadWordEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String pageNumber;
 
     public Map<String, String> searchParams = new HashMap<String, String>();
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public int crudMode;
 
     public String getCurrentPageNumber() {
@@ -64,17 +64,17 @@ public class SuggestBadWordEditForm implements Serializable {
     public String createdBy;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@LongType
+    //@Digits(integer=19, fraction=0)
     public String createdTime;
 
     //@Maxbytelength(maxbytelength = 255)
     public String updatedBy;
 
-    //@LongType
+    //@Digits(integer=19, fraction=0)
     public String updatedTime;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String versionNo;
 
     public void initialize() {

+ 5 - 5
src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/SuggestElevateWordEditForm.java

@@ -30,12 +30,12 @@ public class SuggestElevateWordEditForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String pageNumber;
 
     public Map<String, String> searchParams = new HashMap<String, String>();
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public int crudMode;
 
     public String getCurrentPageNumber() {
@@ -64,17 +64,17 @@ public class SuggestElevateWordEditForm implements Serializable {
     public String createdBy;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@LongType
+    //@Digits(integer=19, fraction=0)
     public String createdTime;
 
     //@Maxbytelength(maxbytelength = 255)
     public String updatedBy;
 
-    //@LongType
+    //@Digits(integer=19, fraction=0)
     public String updatedTime;
 
     //@Required(target = "confirmfromupdate,update,delete")
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String versionNo;
 
     public void initialize() {

+ 1 - 1
src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java

@@ -25,9 +25,9 @@ import javax.annotation.Resource;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.UserPager;
-import org.codelibs.fess.app.service.UserService;
 import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.service.RoleService;
+import org.codelibs.fess.app.service.UserService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.es.exentity.User;

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

@@ -18,6 +18,7 @@ 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;
@@ -30,6 +31,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.user;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -32,6 +33,7 @@ public class EditForm extends CreateForm {
     public String id;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -34,6 +35,7 @@ public class CreateForm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Size(max = 100)
@@ -41,6 +43,7 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer port;
 
     @Size(max = 100)
@@ -68,6 +71,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.webauthentication;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -35,9 +36,11 @@ public class EditForm extends CreateForm {
     @Size(max = 255)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

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

@@ -18,6 +18,7 @@ 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;
@@ -42,6 +43,7 @@ public class CreateForm implements Serializable {
 
     public String[] labelTypeIds;
 
+    @Digits(integer = 10, fraction = 0)
     public Integer crudMode;
 
     @Required
@@ -70,10 +72,12 @@ public class CreateForm implements Serializable {
 
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer depth;
 
     @Min(value = 0)
     @Max(value = 9223372036854775807l)
+    @Digits(integer = 19, fraction = 0)
     public Long maxAccessCount;
 
     @Required
@@ -83,16 +87,19 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer numOfThread;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer intervalTime;
 
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer boost;
 
     @Required
@@ -102,6 +109,7 @@ public class CreateForm implements Serializable {
     @Required
     @Min(value = 0)
     @Max(value = 2147483647)
+    @Digits(integer = 10, fraction = 0)
     public Integer sortOrder;
 
     @Required
@@ -109,6 +117,7 @@ public class CreateForm implements Serializable {
     public String createdBy;
 
     @Required
+    @Digits(integer = 19, fraction = 0)
     public Long createdTime;
 
     public void initialize() {

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

@@ -16,6 +16,7 @@
 
 package org.codelibs.fess.app.web.admin.webconfig;
 
+import javax.validation.constraints.Digits;
 import javax.validation.constraints.Size;
 
 import org.lastaflute.web.validation.Required;
@@ -34,9 +35,11 @@ public class EditForm extends CreateForm {
     @Size(max = 1000)
     public String updatedBy;
 
+    @Digits(integer = 19, fraction = 0)
     public Long updatedTime;
 
     @Required
+    @Digits(integer = 10, fraction = 0)
     public Integer versionNo;
 
 }

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/search/SearchForm.java

@@ -47,10 +47,10 @@ public class SearchForm implements SearchRequestParams, Serializable {
     //@Maxbytelength(maxbytelength = 10)
     public String op;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String start;
 
-    //@IntegerType
+    //@Digits(integer=10, fraction=0)
     public String pn;
 
     //@Maxbytelength(maxbytelength = 1000)