diff --git a/pom.xml b/pom.xml index 2d734bb7e..3afdbf001 100644 --- a/pom.xml +++ b/pom.xml @@ -39,8 +39,8 @@ 1.8 - 1.1.3 - 1.0.0-RC4 + 1.1.4 + 1.0.0-RC6 0.7.2 0.5.0 0.5.6 @@ -72,7 +72,7 @@ 8.5.20 - 0.5.6 + 0.5.7 /usr/share/fess diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java index fda9e86be..cc38274c7 100644 --- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java +++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java @@ -74,8 +74,8 @@ public abstract class EsAbstractConditionAggregation { // =================================================================================== // Aggregation - // ===== - public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) { + // =========== + public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) { assertObjectNotNull("aggregationAggregationBuilder", aggregationAggregationBuilder); regA(aggregationAggregationBuilder); } diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java index 935651a4b..40ec5f8c3 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java @@ -132,23 +132,23 @@ public class AccessTokenDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnToken = cci("token", "token", null, null, String.class, "token", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnParameterName = cci("parameter_name", "parameter_name", null, null, String.class, "parameterName", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnName() { return _columnName; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java index cb1556774..81dee0175 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java @@ -130,19 +130,19 @@ public class BadWordDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java index eda3be438..69b345de8 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java @@ -130,19 +130,19 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnBoostExpr = cci("boostExpr", "boostExpr", null, null, String.class, "boostExpr", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUrlExpr = cci("urlExpr", "urlExpr", null, null, String.class, "urlExpr", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnBoostExpr() { return _columnBoostExpr; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java index b2d66b87c..0fe45fc0b 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java @@ -123,13 +123,13 @@ public class CrawlingInfoDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSessionId = cci("sessionId", "sessionId", null, null, String.class, "sessionId", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedTime() { return _columnCreatedTime; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java index 492e1b908..a9038c467 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java @@ -124,13 +124,13 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCrawlingInfoId = cci("crawlingInfoId", "crawlingInfoId", null, null, String.class, "crawlingInfoId", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "keyword", 0, 0, - null, false, null, null, null, null, null, false); + null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCrawlingInfoId() { return _columnCrawlingInfoId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java index 30de747cc..8a32dbc1f 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java @@ -142,33 +142,33 @@ public class DataConfigDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); + 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false, - false, false, "text", 0, 0, null, false, null, null, null, null, null, false); + false, false, "text", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHandlerName = cci("handlerName", "handlerName", null, null, String.class, "handlerName", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHandlerParameter = cci("handlerParameter", "handlerParameter", null, null, String.class, - "handlerParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "handlerParameter", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHosts = cci("virtualHosts", "virtualHosts", null, null, String[].class, "virtualHosts", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnAvailable() { return _columnAvailable; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java index 5fafbff01..d3244cd90 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java @@ -120,9 +120,9 @@ public class DataConfigToLabelDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnDataConfigId() { return _columnDataConfigId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java index c67a76a82..c4a8ad28c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java @@ -120,9 +120,9 @@ public class DataConfigToRoleDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnDataConfigId() { return _columnDataConfigId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java index 7eba598f0..9bef86511 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java @@ -130,19 +130,19 @@ public class DuplicateHostDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class, - "duplicateHostName", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "duplicateHostName", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java index 870fa552f..2437b87b1 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java @@ -135,25 +135,25 @@ public class ElevateWordDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); + 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnBoost() { return _columnBoost; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java index 3f21ac0e2..a35c154bd 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java @@ -120,9 +120,9 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnElevateWordId() { return _columnElevateWordId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java index d78541fd2..8a6f6821b 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java @@ -129,19 +129,19 @@ public class FailureUrlDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnConfigId = cci("configId", "configId", null, null, String.class, "configId", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnErrorCount = cci("errorCount", "errorCount", null, null, Integer.class, "errorCount", null, false, - false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnErrorLog = cci("errorLog", "errorLog", null, null, String.class, "errorLog", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime", - null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0, - null, false, null, null, null, null, null, false); + null, null, false, null, null, null, null, null, false); public ColumnInfo columnConfigId() { return _columnConfigId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java index 02da17d87..1b16a24ad 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java @@ -138,27 +138,27 @@ public class FileAuthenticationDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", - 0, 0, null, false, null, null, null, null, null, false); + 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java index 56a6f1fe2..fc619e207 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java @@ -156,49 +156,49 @@ public class FileConfigDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); + 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class, - "configParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "configParameter", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); + "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false, - false, false, "text", 0, 0, null, false, null, null, null, null, null, false); + false, false, "text", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnExcludedDocPaths = cci("excludedDocPaths", "excludedDocPaths", null, null, String.class, - "excludedDocPaths", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "excludedDocPaths", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnIncludedDocPaths = cci("includedDocPaths", "includedDocPaths", null, null, String.class, - "includedDocPaths", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "includedDocPaths", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false, - false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount", - null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHosts = cci("virtualHosts", "virtualHosts", null, null, String[].class, "virtualHosts", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnAvailable() { return _columnAvailable; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java index cf5cdad8c..86e189e7c 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java @@ -120,9 +120,9 @@ public class FileConfigToLabelDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnFileConfigId() { return _columnFileConfigId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java index 576b8eca1..9cfe2ce73 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java @@ -120,9 +120,9 @@ public class FileConfigToRoleDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnFileConfigId() { return _columnFileConfigId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java index 5d2424f0d..5b2b198af 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java @@ -129,23 +129,23 @@ public class JobLogDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false, - "Long", 0, 0, null, false, null, null, null, null, null, false); + "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false, - false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnLastUpdated = cci("lastUpdated", "lastUpdated", null, null, Long.class, "lastUpdated", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnEndTime() { return _columnEndTime; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java index 70ea4079f..23f906a7a 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java @@ -130,23 +130,23 @@ public class KeyMatchDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); + 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); + "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnBoost() { return _columnBoost; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java index 4c86b7e0c..e1677e899 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java @@ -120,9 +120,9 @@ public class LabelToRoleDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java index 6385a056c..809f0ed37 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java @@ -136,27 +136,27 @@ public class LabelTypeDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java index 8d960f00a..97386c021 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java @@ -133,23 +133,23 @@ public class PathMappingDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java index 2b2827fe1..d302bef54 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedContentDbm.java @@ -129,19 +129,19 @@ public class RelatedContentDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnContent = cci("content", "content", null, null, String.class, "content", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java index 05dc77ba8..fd0be01de 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RelatedQueryDbm.java @@ -128,19 +128,19 @@ public class RelatedQueryDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQueries = cci("queries", "queries", null, null, String[].class, "queries", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java index eea1017ae..5da304aef 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java @@ -129,19 +129,19 @@ public class RequestHeaderDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java index 85f32c965..290bceaf2 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java @@ -128,19 +128,19 @@ public class RoleTypeDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java index 319c4d7f5..59ed49097 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java @@ -141,31 +141,31 @@ public class ScheduledJobDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false, - "Boolean", 0, 0, null, false, null, null, null, null, null, false); + "Boolean", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false, - false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnAvailable() { return _columnAvailable; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java index 66c6274b7..556dccba5 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java @@ -127,17 +127,17 @@ public class ThumbnailQueueDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnGenerator = cci("generator", "generator", null, null, String.class, "generator", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnThumbnailId = cci("thumbnail_id", "thumbnail_id", null, null, String.class, "thumbnailId", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPath = cci("path", "path", null, null, String.class, "path", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedBy() { return _columnCreatedBy; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java index 5a0b84ff9..a25a10881 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java @@ -140,29 +140,29 @@ public class WebAuthenticationDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer", - 0, 0, null, false, null, null, null, null, null, false); + 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnAuthRealm() { return _columnAuthRealm; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java index 210874f49..9525302aa 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java @@ -158,51 +158,51 @@ public class WebConfigDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnAvailable = cci("available", "available", null, null, Boolean.class, "available", null, false, false, - false, "Boolean", 0, 0, null, false, null, null, null, null, null, false); + false, "Boolean", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float", - 0, 0, null, false, null, null, null, null, null, false); + 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class, - "configParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "configParameter", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); + "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false, - false, false, "text", 0, 0, null, false, null, null, null, null, null, false); + false, false, "text", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnExcludedDocUrls = cci("excludedDocUrls", "excludedDocUrls", null, null, String.class, - "excludedDocUrls", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "excludedDocUrls", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class, - "includedDocUrls", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "includedDocUrls", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false, - false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount", - null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false, - false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false, - false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHosts = cci("virtualHosts", "virtualHosts", null, null, String[].class, "virtualHosts", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnAvailable() { return _columnAvailable; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java index d074e3ff2..ff58a78a6 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java @@ -120,9 +120,9 @@ public class WebConfigToLabelDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnLabelTypeId() { return _columnLabelTypeId; diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java index b070b9d0b..a314c1486 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java @@ -120,9 +120,9 @@ public class WebConfigToRoleDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnRoleTypeId() { return _columnRoleTypeId; diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java index 2137f8084..76c9bdf33 100644 --- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java +++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java @@ -74,8 +74,8 @@ public abstract class EsAbstractConditionAggregation { // =================================================================================== // Aggregation - // ===== - public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) { + // =========== + public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) { assertObjectNotNull("aggregationAggregationBuilder", aggregationAggregationBuilder); regA(aggregationAggregationBuilder); } diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java index e14270611..5c2319820 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java @@ -126,19 +126,19 @@ public class ClickLogDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnQueryRequestedAt = cci("queryRequestedAt", "queryRequestedAt", null, null, LocalDateTime.class, - "queryRequestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + "queryRequestedAt", null, false, false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, - false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0, - null, false, null, null, null, null, null, false); + null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnOrder = cci("order", "order", null, null, Integer.class, "order", null, false, false, false, - "Integer", 0, 0, null, false, null, null, null, null, null, false); + "Integer", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnQueryRequestedAt() { return _columnQueryRequestedAt; diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java index 48a6f54e6..ff653ba54 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java @@ -124,15 +124,15 @@ public class FavoriteLogDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, - false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0, - null, false, null, null, null, null, null, false); + null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedAt() { return _columnCreatedAt; diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java index 7b840f0e3..1be19034f 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java @@ -147,41 +147,41 @@ public class SearchLogDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false, - "Long", 0, 0, null, false, null, null, null, null, null, false); + "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null, - false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize", - null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "Integer", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null, - false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null, - false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false, - false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnLanguages = cci("languages", "languages", null, null, String.class, "languages", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnVirtualHost = cci("virtualHost", "virtualHost", null, null, String.class, "virtualHost", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnAccessType() { return _columnAccessType; diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java index 6a4f3bee4..0b9308282 100644 --- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java +++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/UserInfoDbm.java @@ -120,9 +120,9 @@ public class UserInfoDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false, - false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUpdatedAt = cci("updatedAt", "updatedAt", null, null, LocalDateTime.class, "updatedAt", null, false, - false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false); + false, false, "LocalDateTime", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnCreatedAt() { return _columnCreatedAt; diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java index 39864124b..77a1a54b3 100644 --- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java +++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java @@ -74,8 +74,8 @@ public abstract class EsAbstractConditionAggregation { // =================================================================================== // Aggregation - // ===== - public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) { + // =========== + public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) { assertObjectNotNull("aggregationAggregationBuilder", aggregationAggregationBuilder); regA(aggregationAggregationBuilder); } diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java index 697fa97e4..7f4a6959a 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java @@ -118,9 +118,9 @@ public class GroupDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false, - false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnName() { return _columnName; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java index db6a60758..c7183559f 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java @@ -117,7 +117,7 @@ public class RoleDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnName() { return _columnName; diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java index febb3ffcc..8664f0392 100644 --- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java +++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java @@ -175,89 +175,89 @@ public class UserDbm extends AbstractDBMeta { // Column Info // =========== protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnSurname = cci("surname", "surname", null, null, String.class, "surname", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnGivenName = cci("givenName", "givenName", null, null, String.class, "givenName", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnEmployeeNumber = cci("employeeNumber", "employeeNumber", null, null, String.class, "employeeNumber", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnMail = cci("mail", "mail", null, null, String.class, "mail", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTelephoneNumber = cci("telephoneNumber", "telephoneNumber", null, null, String.class, - "telephoneNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "telephoneNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHomePhone = cci("homePhone", "homePhone", null, null, String.class, "homePhone", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHomePostalAddress = cci("homePostalAddress", "homePostalAddress", null, null, String.class, - "homePostalAddress", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "homePostalAddress", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnLabeledURI = cci("labeledURI", "labeledURI", null, null, String.class, "labeledURI", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRoomNumber = cci("roomNumber", "roomNumber", null, null, String.class, "roomNumber", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPager = cci("pager", "pager", null, null, String.class, "pager", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnStreet = cci("street", "street", null, null, String.class, "street", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPostalCode = cci("postalCode", "postalCode", null, null, String.class, "postalCode", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPhysicalDeliveryOfficeName = cci("physicalDeliveryOfficeName", "physicalDeliveryOfficeName", null, - null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, - null, null, false); + null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, + null, null, null, false); protected final ColumnInfo _columnDestinationIndicator = cci("destinationIndicator", "destinationIndicator", null, null, String.class, - "destinationIndicator", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "destinationIndicator", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnInternationaliSDNNumber = cci("internationaliSDNNumber", "internationaliSDNNumber", null, null, - String.class, "internationaliSDNNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, - false); + String.class, "internationaliSDNNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, + null, false); protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnEmployeeType = cci("employeeType", "employeeType", null, null, String.class, "employeeType", null, - false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnFacsimileTelephoneNumber = cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null, - String.class, "facsimileTelephoneNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, - null, false); + String.class, "facsimileTelephoneNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, + null, null, false); protected final ColumnInfo _columnPostOfficeBox = cci("postOfficeBox", "postOfficeBox", null, null, String.class, "postOfficeBox", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnInitials = cci("initials", "initials", null, null, String.class, "initials", null, false, false, - false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCarLicense = cci("carLicense", "carLicense", null, null, String.class, "carLicense", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnMobile = cci("mobile", "mobile", null, null, String.class, "mobile", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPostalAddress = cci("postalAddress", "postalAddress", null, null, String.class, "postalAddress", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnCity = cci("city", "city", null, null, String.class, "city", null, false, false, false, "keyword", 0, - 0, null, false, null, null, null, null, null, false); + 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnTeletexTerminalIdentifier = cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null, - String.class, "teletexTerminalIdentifier", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, - null, false); + String.class, "teletexTerminalIdentifier", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, + null, null, false); protected final ColumnInfo _columnX121Address = cci("x121Address", "x121Address", null, null, String.class, "x121Address", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnBusinessCategory = cci("businessCategory", "businessCategory", null, null, String.class, - "businessCategory", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "businessCategory", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRegisteredAddress = cci("registeredAddress", "registeredAddress", null, null, String.class, - "registeredAddress", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "registeredAddress", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDisplayName = cci("displayName", "displayName", null, null, String.class, "displayName", null, false, - false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnPreferredLanguage = cci("preferredLanguage", "preferredLanguage", null, null, String.class, - "preferredLanguage", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "preferredLanguage", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnDepartmentNumber = cci("departmentNumber", "departmentNumber", null, null, String.class, - "departmentNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + "departmentNumber", null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnUidNumber = cci("uidNumber", "uidNumber", null, null, Long.class, "uidNumber", null, false, false, - false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false, - false, "Long", 0, 0, null, false, null, null, null, null, null, false); + false, "Long", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory", - null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false); + null, false, false, false, "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false, - "keyword", 0, 0, null, false, null, null, null, null, null, false); + "keyword", 0, 0, null, null, false, null, null, null, null, null, false); public ColumnInfo columnName() { return _columnName; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java index c71e7d895..7debccd56 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessMessages.java @@ -575,12 +575,11 @@ public class FessMessages extends FessLabels { * comment: --------------- * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsAssertFalseMessage(String property, String item) { + public FessMessages addConstraintsAssertFalseMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_AssertFalse_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_AssertFalse_MESSAGE)); return this; } @@ -590,12 +589,11 @@ public class FessMessages extends FessLabels { * message: {item} must be true. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsAssertTrueMessage(String property, String item) { + public FessMessages addConstraintsAssertTrueMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_AssertTrue_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_AssertTrue_MESSAGE)); return this; } @@ -605,13 +603,12 @@ public class FessMessages extends FessLabels { * message: {item} must be less than ${inclusive == true ? 'or equal to ' : ''}{value}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param value The parameter value for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsDecimalMaxMessage(String property, String item, String value) { + public FessMessages addConstraintsDecimalMaxMessage(String property, String value) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_DecimalMax_MESSAGE, item, value)); + add(property, new UserMessage(CONSTRAINTS_DecimalMax_MESSAGE, value)); return this; } @@ -621,13 +618,12 @@ public class FessMessages extends FessLabels { * message: {item} must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param value The parameter value for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsDecimalMinMessage(String property, String item, String value) { + public FessMessages addConstraintsDecimalMinMessage(String property, String value) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_DecimalMin_MESSAGE, item, value)); + add(property, new UserMessage(CONSTRAINTS_DecimalMin_MESSAGE, value)); return this; } @@ -637,14 +633,13 @@ public class FessMessages extends FessLabels { * message: {item} is numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected). * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) - * @param integer The parameter integer for message. (NotNull) * @param fraction The parameter fraction for message. (NotNull) + * @param integer The parameter integer for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsDigitsMessage(String property, String item, String integer, String fraction) { + public FessMessages addConstraintsDigitsMessage(String property, String fraction, String integer) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Digits_MESSAGE, item, integer, fraction)); + add(property, new UserMessage(CONSTRAINTS_Digits_MESSAGE, fraction, integer)); return this; } @@ -654,12 +649,11 @@ public class FessMessages extends FessLabels { * message: {item} must be in the future. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsFutureMessage(String property, String item) { + public FessMessages addConstraintsFutureMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Future_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_Future_MESSAGE)); return this; } @@ -669,13 +663,12 @@ public class FessMessages extends FessLabels { * message: {item} must be less than or equal to {value}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param value The parameter value for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsMaxMessage(String property, String item, String value) { + public FessMessages addConstraintsMaxMessage(String property, String value) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Max_MESSAGE, item, value)); + add(property, new UserMessage(CONSTRAINTS_Max_MESSAGE, value)); return this; } @@ -685,13 +678,12 @@ public class FessMessages extends FessLabels { * message: {item} must be greater than or equal to {value}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param value The parameter value for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsMinMessage(String property, String item, String value) { + public FessMessages addConstraintsMinMessage(String property, String value) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Min_MESSAGE, item, value)); + add(property, new UserMessage(CONSTRAINTS_Min_MESSAGE, value)); return this; } @@ -701,12 +693,11 @@ public class FessMessages extends FessLabels { * message: {item} may not be null. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsNotNullMessage(String property, String item) { + public FessMessages addConstraintsNotNullMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_NotNull_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_NotNull_MESSAGE)); return this; } @@ -716,12 +707,11 @@ public class FessMessages extends FessLabels { * message: {item} must be null. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsNullMessage(String property, String item) { + public FessMessages addConstraintsNullMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Null_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_Null_MESSAGE)); return this; } @@ -731,12 +721,11 @@ public class FessMessages extends FessLabels { * message: {item} must be in the past. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsPastMessage(String property, String item) { + public FessMessages addConstraintsPastMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Past_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_Past_MESSAGE)); return this; } @@ -746,13 +735,12 @@ public class FessMessages extends FessLabels { * message: {item} must match "{regexp}". * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param regexp The parameter regexp for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsPatternMessage(String property, String item, String regexp) { + public FessMessages addConstraintsPatternMessage(String property, String regexp) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Pattern_MESSAGE, item, regexp)); + add(property, new UserMessage(CONSTRAINTS_Pattern_MESSAGE, regexp)); return this; } @@ -762,14 +750,13 @@ public class FessMessages extends FessLabels { * message: Size of {item} must be between {min} and {max}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param min The parameter min for message. (NotNull) * @param max The parameter max for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsSizeMessage(String property, String item, String min, String max) { + public FessMessages addConstraintsSizeMessage(String property, String min, String max) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Size_MESSAGE, item, min, max)); + add(property, new UserMessage(CONSTRAINTS_Size_MESSAGE, min, max)); return this; } @@ -780,12 +767,11 @@ public class FessMessages extends FessLabels { * comment: ------------------- * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsCreditCardNumberMessage(String property, String item) { + public FessMessages addConstraintsCreditCardNumberMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_CreditCardNumber_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_CreditCardNumber_MESSAGE)); return this; } @@ -795,13 +781,12 @@ public class FessMessages extends FessLabels { * message: {item} is invalid {type} barcode. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param type The parameter type for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsEanMessage(String property, String item, String type) { + public FessMessages addConstraintsEanMessage(String property, String type) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_EAN_MESSAGE, item, type)); + add(property, new UserMessage(CONSTRAINTS_EAN_MESSAGE, type)); return this; } @@ -811,12 +796,11 @@ public class FessMessages extends FessLabels { * message: {item} is not a well-formed email address. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsEmailMessage(String property, String item) { + public FessMessages addConstraintsEmailMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Email_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_Email_MESSAGE)); return this; } @@ -826,14 +810,13 @@ public class FessMessages extends FessLabels { * message: Length of {item} must be between {min} and {max}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param min The parameter min for message. (NotNull) * @param max The parameter max for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsLengthMessage(String property, String item, String min, String max) { + public FessMessages addConstraintsLengthMessage(String property, String min, String max) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Length_MESSAGE, item, min, max)); + add(property, new UserMessage(CONSTRAINTS_Length_MESSAGE, min, max)); return this; } @@ -888,13 +871,13 @@ public class FessMessages extends FessLabels { * message: The check digit for ${value} is invalid, ${modType} checksum failed. * * @param property The property name for the message. (NotNull) - * @param value The parameter value for message. (NotNull) * @param modType The parameter modType for message. (NotNull) + * @param value The parameter value for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsModCheckMessage(String property, String value, String modType) { + public FessMessages addConstraintsModCheckMessage(String property, String modType, String value) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_ModCheck_MESSAGE, value, modType)); + add(property, new UserMessage(CONSTRAINTS_ModCheck_MESSAGE, modType, value)); return this; } @@ -904,12 +887,11 @@ public class FessMessages extends FessLabels { * message: {item} may not be empty. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsNotBlankMessage(String property, String item) { + public FessMessages addConstraintsNotBlankMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_NotBlank_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_NotBlank_MESSAGE)); return this; } @@ -919,12 +901,11 @@ public class FessMessages extends FessLabels { * message: {item} may not be empty. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsNotEmptyMessage(String property, String item) { + public FessMessages addConstraintsNotEmptyMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_NotEmpty_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_NotEmpty_MESSAGE)); return this; } @@ -949,14 +930,13 @@ public class FessMessages extends FessLabels { * message: {item} must be between {min} and {max}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param min The parameter min for message. (NotNull) * @param max The parameter max for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsRangeMessage(String property, String item, String min, String max) { + public FessMessages addConstraintsRangeMessage(String property, String min, String max) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Range_MESSAGE, item, min, max)); + add(property, new UserMessage(CONSTRAINTS_Range_MESSAGE, min, max)); return this; } @@ -966,12 +946,11 @@ public class FessMessages extends FessLabels { * message: {item} may have unsafe html content. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsSafeHtmlMessage(String property, String item) { + public FessMessages addConstraintsSafeHtmlMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_SafeHtml_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_SafeHtml_MESSAGE)); return this; } @@ -996,12 +975,11 @@ public class FessMessages extends FessLabels { * message: {item} must be a valid URL. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsUrlMessage(String property, String item) { + public FessMessages addConstraintsUrlMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_URL_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_URL_MESSAGE)); return this; } @@ -1011,12 +989,11 @@ public class FessMessages extends FessLabels { * message: {item} is required. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsRequiredMessage(String property, String item) { + public FessMessages addConstraintsRequiredMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_Required_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_Required_MESSAGE)); return this; } @@ -1026,12 +1003,11 @@ public class FessMessages extends FessLabels { * message: {item} should be numeric. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsTypeIntegerMessage(String property, String item) { + public FessMessages addConstraintsTypeIntegerMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_TypeInteger_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_TypeInteger_MESSAGE)); return this; } @@ -1041,12 +1017,11 @@ public class FessMessages extends FessLabels { * message: {item} should be numeric. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsTypeLongMessage(String property, String item) { + public FessMessages addConstraintsTypeLongMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_TypeLong_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_TypeLong_MESSAGE)); return this; } @@ -1056,12 +1031,11 @@ public class FessMessages extends FessLabels { * message: {item} should be numeric. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsTypeFloatMessage(String property, String item) { + public FessMessages addConstraintsTypeFloatMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_TypeFloat_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_TypeFloat_MESSAGE)); return this; } @@ -1071,12 +1045,11 @@ public class FessMessages extends FessLabels { * message: {item} should be numeric. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsTypeDoubleMessage(String property, String item) { + public FessMessages addConstraintsTypeDoubleMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_TypeDouble_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_TypeDouble_MESSAGE)); return this; } @@ -1086,13 +1059,12 @@ public class FessMessages extends FessLabels { * message: {item} cannot convert as {propertyType}. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @param propertyType The parameter propertyType for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsTypeAnyMessage(String property, String item, String propertyType) { + public FessMessages addConstraintsTypeAnyMessage(String property, String propertyType) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_TypeAny_MESSAGE, item, propertyType)); + add(property, new UserMessage(CONSTRAINTS_TypeAny_MESSAGE, propertyType)); return this; } @@ -1102,12 +1074,11 @@ public class FessMessages extends FessLabels { * message: {item} has wrong URI. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsUriTypeMessage(String property, String item) { + public FessMessages addConstraintsUriTypeMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_UriType_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_UriType_MESSAGE)); return this; } @@ -1117,12 +1088,11 @@ public class FessMessages extends FessLabels { * message: {item} is invalid cron expression. * * @param property The property name for the message. (NotNull) - * @param item The parameter item for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addConstraintsCronExpressionMessage(String property, String item) { + public FessMessages addConstraintsCronExpressionMessage(String property) { assertPropertyNotNull(property); - add(property, new UserMessage(CONSTRAINTS_CronExpression_MESSAGE, item)); + add(property, new UserMessage(CONSTRAINTS_CronExpression_MESSAGE)); return this; } @@ -1717,13 +1687,13 @@ public class FessMessages extends FessLabels { * message: "{1}" in "{0}" is invalid. * * @param property The property name for the message. (NotNull) - * @param arg1 The parameter arg1 for message. (NotNull) * @param arg0 The parameter arg0 for message. (NotNull) + * @param arg1 The parameter arg1 for message. (NotNull) * @return this. (NotNull) */ - public FessMessages addErrorsInvalidStrIsIncluded(String property, String arg1, String arg0) { + public FessMessages addErrorsInvalidStrIsIncluded(String property, String arg0, String arg1) { assertPropertyNotNull(property); - add(property, new UserMessage(ERRORS_invalid_str_is_included, arg1, arg0)); + add(property, new UserMessage(ERRORS_invalid_str_is_included, arg0, arg1)); return this; }