diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java index e69af9ed1..92ca7eef6 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java index a6bf46cb2..a7cff400f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/CrawlingSessionEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/CrawlingSessionEditForm.java index ba5b89633..503499e64 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/CrawlingSessionEditForm.java +++ b/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") diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java index 3d3ce44b1..f28bb0e68 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java index e673e57aa..569cb1457 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java index 9388547df..5327208dc 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java +++ b/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 diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java index ae18ebddc..e13289a40 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/EditForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java index 35a99d068..6d096ec0e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java +++ b/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 diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java index 5fd6cb109..5858b1b16 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/EditForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/FailureUrlEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/FailureUrlEditForm.java index 418830ad3..b0a2185ac 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/FailureUrlEditForm.java +++ b/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 searchParams = new HashMap(); - //@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") diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/CreateForm.java index 09a7ac4a6..629bca46a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/EditForm.java index 32793d3b8..cb5254ba3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/EditForm.java +++ b/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; } \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java index 4a555b786..88f28f36b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java index 58828fe81..a30a7e603 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java index d91a00001..141d649a3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java +++ b/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) diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/GroupEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/group/GroupEditForm.java index 86f624e73..da2f59e6b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/GroupEditForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/JobLogEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/JobLogEditForm.java index c2e67bad0..276d1f3a3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/JobLogEditForm.java +++ b/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") diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java index 1a80e6ca3..9e2315061 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java index 5e1d08a94..b7241a87c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java index 8d4788238..fc95b0868 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java index f9e393c23..d44f0a32f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/labeltype/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java index f3e138b11..0178275fa 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java index e4a651ae2..9290f90f4 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/CreateForm.java index 5c4112186..940855657 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/EditForm.java index 055c3e8c6..fb28744e1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java index ee2f7e677..f8b0de390 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java index fcf00eb76..6e43fad92 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/RoleEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/role/RoleEditForm.java index 45f5c61e7..0e917b5e7 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/RoleEditForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/CreateForm.java index 8f22b716f..07a1af0ed 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/roletype/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/EditForm.java index 7d229514f..e0ed7818c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/roletype/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java index 53655aedc..eea1e4562 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/ScheduledjobEditForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/SearchListForm.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/SearchListForm.java index 852696a13..20d86bc11 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/SearchListForm.java +++ b/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") diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java index 7d16aabff..fc0ad5ff4 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/SuggestBadWordEditForm.java +++ b/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 searchParams = new HashMap(); - //@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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/SuggestElevateWordEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/SuggestElevateWordEditForm.java index 3807afc4a..fad353cea 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/SuggestElevateWordEditForm.java +++ b/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 searchParams = new HashMap(); - //@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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index 2114b28a6..2e2b21860 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/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; diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java index 8c8a0060b..1265fd441 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/CreateForm.java +++ b/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 diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java index eefa99b34..7fd98d7fb 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/EditForm.java +++ b/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; } \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/CreateForm.java index 437182339..ecfaad8d5 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/EditForm.java index a70b466f5..7ec8314e6 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/EditForm.java +++ b/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; } \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java index 1233bd9d7..72aff7be0 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/CreateForm.java +++ b/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() { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java index 833ecfbe7..4d2910358 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/EditForm.java +++ b/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; } diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/search/SearchForm.java index c058a9624..e572d8d23 100644 --- a/src/main/java/org/codelibs/fess/app/web/search/SearchForm.java +++ b/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)