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 e69af9ed1e8c210a60bf710eb3d191c589a741cd..92ca7eef6110055bf4713848b4754045808093b9 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 a6bf46cb28cd47bb63ddf5724170135f27424ca9..a7cff400f636a8c5d8f10b50e85ab7e3d6067e9a 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 ba5b89633feb54426b9ff2e83c3f0d0a08d801b5..503499e6440f2d064ac0ec87c3d9d2cc816837e5 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 3d3ce44b11b4b4aeb813172d3298381aca419b1d..f28bb0e68ff962f4135d169613f000e6f0f3ae0a 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 e673e57aadb516c326d78de89bbf76c2e9e40be7..569cb1457f71e78b4d9762e35da776e361950122 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 9388547df51be88d116ee9602071a5a946b1b57b..5327208dcc207cb8e2c7c403081da483a1351e86 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 ae18ebddcd15770bb42858b04d7e11ec25d0fbb1..e13289a401ceef6758f809f9d6073a2ca3968d44 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 35a99d068c1c4f426de58b54e2a51e782250e690..6d096ec0e3cb3a8d928aee49330a8246f04b8b26 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 5fd6cb109c221a395dafe0582c354ac038aefd03..5858b1b16efd1c084977e4d25d50d36eef4b52c5 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 418830ad337a9ce61a98beff27dc7f7de617833c..b0a2185ac91af09192e0e4e36936197b121ddea8 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<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") 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 09a7ac4a62c57aebb2342977bb5e8158fa9a1bb6..629bca46a5dd7a22be3624f1801fdf64d59ec216 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 32793d3b805fe361d36e6697814cbb7af5a857ea..cb5254ba33bf13b51617ac0362acbb0c49dcd025 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 4a555b786118089704070a549b10e030edc2600a..88f28f36beccd04084366269ec170030701242e5 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 58828fe818049dd06716a13e082ed36d82092051..a30a7e6030e8e8a0235005e02921c1375790a3ec 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 d91a000011a093793aae78e05e478a634312026b..141d649a3e938085e392d0a5b9545104100a3e76 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 86f624e731fabb596c9e8afa5469a840d03372dd..da2f59e6b03620797cf7b120dac6696525956446 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 c2e67bad0e22d2a6a4719c49e3efe1c5cf059978..276d1f3a33dbe668539dc8e3358026e7204b149e 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 1a80e6ca32a1d7fb6b1e692a5478cf02c61a7cc7..9e2315061b561990a3b7c257b01cdd693584231e 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 5e1d08a94cc22b5770977fd19649b95ffa17ce7a..b7241a87c65db1214060bb58558d83fd72869661 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 8d478823886a998de27f9fa473b22ce968d16599..fc95b0868a2b1acf4da4f35722d729324de0c1f3 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 f9e393c23c3d19bc1f326a03dbd8d4f7046545e7..d44f0a32f7766b543a41f78ecec38161da287b63 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 f3e138b11ad7ca81d615e1489f4c578242dd6834..0178275fa04a41bae954b2376066bca21c66a8e3 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 e4a651ae2bcc058e7fa736eb124459563c9e0ac5..9290f90f4997f5be126d05cd0d1d26db3370c063 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 5c41121861f5fb36841d448c321e34537fd96c52..9408556575422ddb882401b285a1c3e8c6dbdb44 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 055c3e8c69fe7af8499fbb3c555f0eb9999ec3ad..fb28744e1909a9337c4a1bcee8836073d8a45334 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 ee2f7e6774d4727f78de317b7b0a9b6f2290d962..f8b0de390ccf677005cd590c4a06defc11ce9417 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 fcf00eb761cd73f7a8157cef978cb0b6e58468ef..6e43fad92cc88277343b20e75311bcefa0dd70fc 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 45f5c61e71e645064b3dd3014ca85cbcbea5464b..0e917b5e73947e41d5584a2608f927c5a7e7aa69 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 8f22b716fc1e70bc85190e261dd8c415d2363632..07a1af0ed423db2afa13c534467e5ab92194861c 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 7d229514f8785323980e07bfbdd74b84c0367b53..e0ed7818c10ee2cbac98804ecb69392b71e12804 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 53655aedce41a6c9c6b8c373d8bbf0b5c91d7778..eea1e4562fa808b7c559f5b6eb72207a2916647c 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 852696a1346b6d39d5b56ac2f31a0b229c90b846..20d86bc114abe7178e516b61eba9a3521c939ca6 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 7d16aabff767e676f2967d359e4eb913abc5fd6b..fc0ad5ff4a1f6b9af877b1c115f14e635dcf8ec9 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<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() { 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 3807afc4aab422bd6805424ac11a982b16ea5162..fad353cea756a0c1a76e8470c6966c4acbf0a2d4 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<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() { 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 2114b28a66f7d06a781cb69b653db89efc9666be..2e2b218601e0f6c944a82aa0154c460dc521ed4c 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 8c8a0060b2d830d9b7b7c1ad852c9f0355f3ff3e..1265fd4411d8a7a804f77ceed7d29132252293f6 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 eefa99b3461a21a04b7354dd7f2ce33b1b6ea60b..7fd98d7fbde27a544a1f940eaf46a670cb747e11 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 43718233972d1fe670520b00c1e49686efe9f4e3..ecfaad8d5bbbe2c4910f21656ec7b7aea7c3d11b 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 a70b466f504b2c53af0d34b4dc8e7b5fdb91af80..7ec8314e6436df79424481340f1de71d6242c557 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 1233bd9d7a3a11d8cbf58df379dcdcd90142c753..72aff7be0c7cbbed6bb0878a6898a38581104ca4 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 833ecfbe79b0cddc25272640c860f7690142fde3..4d29103583b27a3685bf954d7c693c8fb3843922 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 c058a9624937a272b90a4ff45ff721dfb17aaf76..e572d8d234f779efd7c54d988c9d19169524953b 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)