diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json index 0acffadef3c49676cbc97349284c4383f735d79f..3e2862c77186a764cbf7606c923ab54778a48ae3 100644 --- a/src/main/config/es/fess_config.json +++ b/src/main/config/es/fess_config.json @@ -221,6 +221,9 @@ "depth" : { "type" : "integer" }, + "description" : { + "type": "text" + }, "excludedDocUrls" : { "type": "keyword" }, @@ -425,6 +428,9 @@ "createdTime" : { "type" : "long" }, + "description" : { + "type": "text" + }, "handlerName" : { "type": "keyword" }, @@ -672,6 +678,9 @@ "depth" : { "type" : "integer" }, + "description" : { + "type": "text" + }, "excludedDocPaths" : { "type": "keyword" }, diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java index 8f9cdaf0f36b443fb11233b493f0285c91891538..7bc333d7c72a6dc42ab1b4906b005aa3988d0eb1 100644 --- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java @@ -77,6 +77,7 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior ((DataConfig) et).getCreatedTime(), (et, vl) -> ((DataConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); + setupEpg(_epgMap, et -> ((DataConfig) et).getDescription(), (et, vl) -> ((DataConfig) et).setDescription(DfTypeUtil.toString(vl)), + "description"); setupEpg(_epgMap, et -> ((DataConfig) et).getHandlerName(), (et, vl) -> ((DataConfig) et).setHandlerName(DfTypeUtil.toString(vl)), "handlerName"); setupEpg(_epgMap, et -> ((DataConfig) et).getHandlerParameter(), @@ -145,6 +147,8 @@ public class DataConfigDbm extends AbstractDBMeta { false, "keyword", 0, 0, 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); + 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); 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); protected final ColumnInfo _columnHandlerParameter = cci("handlerParameter", "handlerParameter", null, null, String.class, @@ -178,6 +182,10 @@ public class DataConfigDbm extends AbstractDBMeta { return _columnCreatedTime; } + public ColumnInfo columnDescription() { + return _columnDescription; + } + public ColumnInfo columnHandlerName() { return _columnHandlerName; } @@ -216,6 +224,7 @@ public class DataConfigDbm extends AbstractDBMeta { ls.add(columnBoost()); ls.add(columnCreatedBy()); ls.add(columnCreatedTime()); + ls.add(columnDescription()); ls.add(columnHandlerName()); ls.add(columnHandlerParameter()); ls.add(columnHandlerScript()); 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 3eff90e12e39b8ca42d95b9edd6440bfa8bf321e..11ea2255d3db11d17bb02cff08a8cd5ef1f0179a 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 @@ -89,6 +89,8 @@ public class FileConfigDbm extends AbstractDBMeta { setupEpg(_epgMap, et -> ((FileConfig) et).getCreatedTime(), (et, vl) -> ((FileConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); setupEpg(_epgMap, et -> ((FileConfig) et).getDepth(), (et, vl) -> ((FileConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); + setupEpg(_epgMap, et -> ((FileConfig) et).getDescription(), (et, vl) -> ((FileConfig) et).setDescription(DfTypeUtil.toString(vl)), + "description"); setupEpg(_epgMap, et -> ((FileConfig) et).getExcludedDocPaths(), (et, vl) -> ((FileConfig) et).setExcludedDocPaths(DfTypeUtil.toString(vl)), "excludedDocPaths"); setupEpg(_epgMap, et -> ((FileConfig) et).getExcludedPaths(), @@ -163,6 +165,8 @@ public class FileConfigDbm extends AbstractDBMeta { false, false, "Long", 0, 0, 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); + 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); 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); protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths", @@ -216,6 +220,10 @@ public class FileConfigDbm extends AbstractDBMeta { return _columnDepth; } + public ColumnInfo columnDescription() { + return _columnDescription; + } + public ColumnInfo columnExcludedDocPaths() { return _columnExcludedDocPaths; } @@ -280,6 +288,7 @@ public class FileConfigDbm extends AbstractDBMeta { ls.add(columnCreatedBy()); ls.add(columnCreatedTime()); ls.add(columnDepth()); + ls.add(columnDescription()); ls.add(columnExcludedDocPaths()); ls.add(columnExcludedPaths()); ls.add(columnIncludedDocPaths()); 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 d1b67a4e518e8d73f79a2406f84ad61f9b7b4c07..2fea283428f61850c802f0fc06b8ebc422e9e998 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 @@ -89,6 +89,8 @@ public class WebConfigDbm extends AbstractDBMeta { setupEpg(_epgMap, et -> ((WebConfig) et).getCreatedTime(), (et, vl) -> ((WebConfig) et).setCreatedTime(DfTypeUtil.toLong(vl)), "createdTime"); setupEpg(_epgMap, et -> ((WebConfig) et).getDepth(), (et, vl) -> ((WebConfig) et).setDepth(DfTypeUtil.toInteger(vl)), "depth"); + setupEpg(_epgMap, et -> ((WebConfig) et).getDescription(), (et, vl) -> ((WebConfig) et).setDescription(DfTypeUtil.toString(vl)), + "description"); setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedDocUrls(), (et, vl) -> ((WebConfig) et).setExcludedDocUrls(DfTypeUtil.toString(vl)), "excludedDocUrls"); setupEpg(_epgMap, et -> ((WebConfig) et).getExcludedUrls(), (et, vl) -> ((WebConfig) et).setExcludedUrls(DfTypeUtil.toString(vl)), @@ -165,6 +167,8 @@ public class WebConfigDbm extends AbstractDBMeta { false, false, "Long", 0, 0, 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); + 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); 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); protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null, @@ -220,6 +224,10 @@ public class WebConfigDbm extends AbstractDBMeta { return _columnDepth; } + public ColumnInfo columnDescription() { + return _columnDescription; + } + public ColumnInfo columnExcludedDocUrls() { return _columnExcludedDocUrls; } @@ -288,6 +296,7 @@ public class WebConfigDbm extends AbstractDBMeta { ls.add(columnCreatedBy()); ls.add(columnCreatedTime()); ls.add(columnDepth()); + ls.add(columnDescription()); ls.add(columnExcludedDocUrls()); ls.add(columnExcludedUrls()); ls.add(columnIncludedDocUrls()); diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java index 0e1b69301c716848229c15f0ef8d125c6e03bf15..5cf65eb61f4e00ca8a745b2534e99364c5d81be0 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java @@ -192,6 +192,10 @@ public class BsDataConfigCB extends EsAbstractConditionBean { doColumn("createdTime"); } + public void columnDescription() { + doColumn("description"); + } + public void columnHandlerName() { doColumn("handlerName"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java index 14519994ebecdcbc31c61ab41a45b04f20a5321f..5c4eff94cfb76892c1a0db1c315ca3a0d5b1e2d8 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java @@ -200,6 +200,10 @@ public class BsFileConfigCB extends EsAbstractConditionBean { doColumn("depth"); } + public void columnDescription() { + doColumn("description"); + } + public void columnExcludedDocPaths() { doColumn("excludedDocPaths"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java index 5a41b357069efd044d815a5284d8e9e3fd278ff5..5a70e2d9dccd71630f093c8a55929d0296cba462 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java @@ -200,6 +200,10 @@ public class BsWebConfigCB extends EsAbstractConditionBean { doColumn("depth"); } + public void columnDescription() { + doColumn("description"); + } + public void columnExcludedDocUrls() { doColumn("excludedDocUrls"); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java index 945674b85d4547b258d2e42bcba638b45cc59f83..bb157a2c9b644e414079c856500649fcc2188609 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java @@ -911,6 +911,61 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation { } } + public void setDescription_Count() { + setDescription_Count(null); + } + + public void setDescription_Count(ConditionOptionCall opLambda) { + setDescription_Count("description", opLambda); + } + + public void setDescription_Count(String name, ConditionOptionCall opLambda) { + ValueCountAggregationBuilder builder = regCountA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Cardinality() { + setDescription_Cardinality(null); + } + + public void setDescription_Cardinality(ConditionOptionCall opLambda) { + setDescription_Cardinality("description", opLambda); + } + + public void setDescription_Cardinality(String name, ConditionOptionCall opLambda) { + CardinalityAggregationBuilder builder = regCardinalityA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Missing() { + setDescription_Missing(null); + } + + public void setDescription_Missing(ConditionOptionCall opLambda) { + setDescription_Missing("description", opLambda, null); + } + + public void setDescription_Missing(ConditionOptionCall opLambda, OperatorCall aggsLambda) { + setDescription_Missing("description", opLambda, aggsLambda); + } + + public void setDescription_Missing(String name, ConditionOptionCall opLambda, + OperatorCall aggsLambda) { + MissingAggregationBuilder builder = regMissingA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + if (aggsLambda != null) { + DataConfigCA ca = new DataConfigCA(); + aggsLambda.callback(ca); + ca.getAggregationBuilderList().forEach(builder::subAggregation); + } + } + public void setHandlerName_Terms() { setHandlerName_Terms(null); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java index c8f9bdcdaee192cb715b20e98cdd9d079f1a2048..e5f6c9984d8db945eb0842ff03d1bc0308eea43c 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java @@ -1266,6 +1266,61 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation { } } + public void setDescription_Count() { + setDescription_Count(null); + } + + public void setDescription_Count(ConditionOptionCall opLambda) { + setDescription_Count("description", opLambda); + } + + public void setDescription_Count(String name, ConditionOptionCall opLambda) { + ValueCountAggregationBuilder builder = regCountA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Cardinality() { + setDescription_Cardinality(null); + } + + public void setDescription_Cardinality(ConditionOptionCall opLambda) { + setDescription_Cardinality("description", opLambda); + } + + public void setDescription_Cardinality(String name, ConditionOptionCall opLambda) { + CardinalityAggregationBuilder builder = regCardinalityA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Missing() { + setDescription_Missing(null); + } + + public void setDescription_Missing(ConditionOptionCall opLambda) { + setDescription_Missing("description", opLambda, null); + } + + public void setDescription_Missing(ConditionOptionCall opLambda, OperatorCall aggsLambda) { + setDescription_Missing("description", opLambda, aggsLambda); + } + + public void setDescription_Missing(String name, ConditionOptionCall opLambda, + OperatorCall aggsLambda) { + MissingAggregationBuilder builder = regMissingA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + if (aggsLambda != null) { + FileConfigCA ca = new FileConfigCA(); + aggsLambda.callback(ca); + ca.getAggregationBuilderList().forEach(builder::subAggregation); + } + } + public void setExcludedDocPaths_Terms() { setExcludedDocPaths_Terms(null); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java index 2b9691e3f1e3d0d3d631df6d4f06861bf70e078d..0722e5072803e268c9c473760518a75687f50306 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java @@ -1266,6 +1266,61 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation { } } + public void setDescription_Count() { + setDescription_Count(null); + } + + public void setDescription_Count(ConditionOptionCall opLambda) { + setDescription_Count("description", opLambda); + } + + public void setDescription_Count(String name, ConditionOptionCall opLambda) { + ValueCountAggregationBuilder builder = regCountA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Cardinality() { + setDescription_Cardinality(null); + } + + public void setDescription_Cardinality(ConditionOptionCall opLambda) { + setDescription_Cardinality("description", opLambda); + } + + public void setDescription_Cardinality(String name, ConditionOptionCall opLambda) { + CardinalityAggregationBuilder builder = regCardinalityA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Missing() { + setDescription_Missing(null); + } + + public void setDescription_Missing(ConditionOptionCall opLambda) { + setDescription_Missing("description", opLambda, null); + } + + public void setDescription_Missing(ConditionOptionCall opLambda, OperatorCall aggsLambda) { + setDescription_Missing("description", opLambda, aggsLambda); + } + + public void setDescription_Missing(String name, ConditionOptionCall opLambda, + OperatorCall aggsLambda) { + MissingAggregationBuilder builder = regMissingA(name, "description"); + if (opLambda != null) { + opLambda.callback(builder); + } + if (aggsLambda != null) { + WebConfigCA ca = new WebConfigCA(); + aggsLambda.callback(ca); + ca.getAggregationBuilderList().forEach(builder::subAggregation); + } + } + public void setExcludedDocUrls_Terms() { setExcludedDocUrls_Terms(null); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java index 7ed51221c8f1e5b12dfc712255fae3999758808a..3f207f245d7d157a521b3975865e42ccfdec4536 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java @@ -942,6 +942,218 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery { return this; } + public void setDescription_Equal(String description) { + setDescription_Term(description, null); + } + + public void setDescription_Equal(String description, ConditionOptionCall opLambda) { + setDescription_Term(description, opLambda); + } + + public void setDescription_Term(String description) { + setDescription_Term(description, null); + } + + public void setDescription_Term(String description, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_NotEqual(String description) { + setDescription_NotTerm(description, null); + } + + public void setDescription_NotTerm(String description) { + setDescription_NotTerm(description, null); + } + + public void setDescription_NotEqual(String description, ConditionOptionCall opLambda) { + setDescription_NotTerm(description, opLambda); + } + + public void setDescription_NotTerm(String description, ConditionOptionCall opLambda) { + not(not -> not.setDescription_Term(description), opLambda); + } + + public void setDescription_Terms(Collection descriptionList) { + setDescription_Terms(descriptionList, null); + } + + public void setDescription_Terms(Collection descriptionList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("description", descriptionList); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_InScope(Collection descriptionList) { + setDescription_Terms(descriptionList, null); + } + + public void setDescription_InScope(Collection descriptionList, ConditionOptionCall opLambda) { + setDescription_Terms(descriptionList, opLambda); + } + + public void setDescription_Match(String description) { + setDescription_Match(description, null); + } + + public void setDescription_Match(String description, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_MatchPhrase(String description) { + setDescription_MatchPhrase(description, null); + } + + public void setDescription_MatchPhrase(String description, ConditionOptionCall opLambda) { + MatchPhraseQueryBuilder builder = regMatchPhraseQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_MatchPhrasePrefix(String description) { + setDescription_MatchPhrasePrefix(description, null); + } + + public void setDescription_MatchPhrasePrefix(String description, ConditionOptionCall opLambda) { + MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Fuzzy(String description) { + setDescription_Fuzzy(description, null); + } + + public void setDescription_Fuzzy(String description, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regFuzzyQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Prefix(String description) { + setDescription_Prefix(description, null); + } + + public void setDescription_Prefix(String description, ConditionOptionCall opLambda) { + PrefixQueryBuilder builder = regPrefixQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Wildcard(String description) { + setDescription_Wildcard(description, null); + } + + public void setDescription_Wildcard(String description, ConditionOptionCall opLambda) { + WildcardQueryBuilder builder = regWildcardQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Regexp(String description) { + setDescription_Regexp(description, null); + } + + public void setDescription_Regexp(String description, ConditionOptionCall opLambda) { + RegexpQueryBuilder builder = regRegexpQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_SpanTerm(String description) { + setDescription_SpanTerm("description", null); + } + + public void setDescription_SpanTerm(String description, ConditionOptionCall opLambda) { + SpanTermQueryBuilder builder = regSpanTermQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_GreaterThan(String description) { + setDescription_GreaterThan(description, null); + } + + public void setDescription_GreaterThan(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_THAN, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_LessThan(String description) { + setDescription_LessThan(description, null); + } + + public void setDescription_LessThan(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_THAN, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_GreaterEqual(String description) { + setDescription_GreaterEqual(description, null); + } + + public void setDescription_GreaterEqual(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_EQUAL, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_LessEqual(String description) { + setDescription_LessEqual(description, null); + } + + public void setDescription_LessEqual(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_EQUAL, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Exists() { + setDescription_Exists(null); + } + + public void setDescription_Exists(ConditionOptionCall opLambda) { + ExistsQueryBuilder builder = regExistsQ("description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_CommonTerms(String description) { + setDescription_CommonTerms(description, null); + } + + public void setDescription_CommonTerms(String description, ConditionOptionCall opLambda) { + CommonTermsQueryBuilder builder = regCommonTermsQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + public void setHandlerName_Equal(String handlerName) { setHandlerName_Term(handlerName, null); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java index b09fda08c802f81b54ac70711e1d64e75d408446..ce26963de3611094f07f5ae97b732d836923a253 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java @@ -1342,6 +1342,218 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery { return this; } + public void setDescription_Equal(String description) { + setDescription_Term(description, null); + } + + public void setDescription_Equal(String description, ConditionOptionCall opLambda) { + setDescription_Term(description, opLambda); + } + + public void setDescription_Term(String description) { + setDescription_Term(description, null); + } + + public void setDescription_Term(String description, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_NotEqual(String description) { + setDescription_NotTerm(description, null); + } + + public void setDescription_NotTerm(String description) { + setDescription_NotTerm(description, null); + } + + public void setDescription_NotEqual(String description, ConditionOptionCall opLambda) { + setDescription_NotTerm(description, opLambda); + } + + public void setDescription_NotTerm(String description, ConditionOptionCall opLambda) { + not(not -> not.setDescription_Term(description), opLambda); + } + + public void setDescription_Terms(Collection descriptionList) { + setDescription_Terms(descriptionList, null); + } + + public void setDescription_Terms(Collection descriptionList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("description", descriptionList); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_InScope(Collection descriptionList) { + setDescription_Terms(descriptionList, null); + } + + public void setDescription_InScope(Collection descriptionList, ConditionOptionCall opLambda) { + setDescription_Terms(descriptionList, opLambda); + } + + public void setDescription_Match(String description) { + setDescription_Match(description, null); + } + + public void setDescription_Match(String description, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_MatchPhrase(String description) { + setDescription_MatchPhrase(description, null); + } + + public void setDescription_MatchPhrase(String description, ConditionOptionCall opLambda) { + MatchPhraseQueryBuilder builder = regMatchPhraseQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_MatchPhrasePrefix(String description) { + setDescription_MatchPhrasePrefix(description, null); + } + + public void setDescription_MatchPhrasePrefix(String description, ConditionOptionCall opLambda) { + MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Fuzzy(String description) { + setDescription_Fuzzy(description, null); + } + + public void setDescription_Fuzzy(String description, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regFuzzyQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Prefix(String description) { + setDescription_Prefix(description, null); + } + + public void setDescription_Prefix(String description, ConditionOptionCall opLambda) { + PrefixQueryBuilder builder = regPrefixQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Wildcard(String description) { + setDescription_Wildcard(description, null); + } + + public void setDescription_Wildcard(String description, ConditionOptionCall opLambda) { + WildcardQueryBuilder builder = regWildcardQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Regexp(String description) { + setDescription_Regexp(description, null); + } + + public void setDescription_Regexp(String description, ConditionOptionCall opLambda) { + RegexpQueryBuilder builder = regRegexpQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_SpanTerm(String description) { + setDescription_SpanTerm("description", null); + } + + public void setDescription_SpanTerm(String description, ConditionOptionCall opLambda) { + SpanTermQueryBuilder builder = regSpanTermQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_GreaterThan(String description) { + setDescription_GreaterThan(description, null); + } + + public void setDescription_GreaterThan(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_THAN, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_LessThan(String description) { + setDescription_LessThan(description, null); + } + + public void setDescription_LessThan(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_THAN, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_GreaterEqual(String description) { + setDescription_GreaterEqual(description, null); + } + + public void setDescription_GreaterEqual(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_EQUAL, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_LessEqual(String description) { + setDescription_LessEqual(description, null); + } + + public void setDescription_LessEqual(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_EQUAL, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Exists() { + setDescription_Exists(null); + } + + public void setDescription_Exists(ConditionOptionCall opLambda) { + ExistsQueryBuilder builder = regExistsQ("description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_CommonTerms(String description) { + setDescription_CommonTerms(description, null); + } + + public void setDescription_CommonTerms(String description, ConditionOptionCall opLambda) { + CommonTermsQueryBuilder builder = regCommonTermsQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + public void setExcludedDocPaths_Equal(String excludedDocPaths) { setExcludedDocPaths_Term(excludedDocPaths, null); } diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java index 3647bbe063491fa3633d78bf7694b501dd2c2484..ab7ddc2b78f68914cc5421f991a842377d946aa2 100644 --- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java +++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java @@ -1341,6 +1341,218 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery { return this; } + public void setDescription_Equal(String description) { + setDescription_Term(description, null); + } + + public void setDescription_Equal(String description, ConditionOptionCall opLambda) { + setDescription_Term(description, opLambda); + } + + public void setDescription_Term(String description) { + setDescription_Term(description, null); + } + + public void setDescription_Term(String description, ConditionOptionCall opLambda) { + TermQueryBuilder builder = regTermQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_NotEqual(String description) { + setDescription_NotTerm(description, null); + } + + public void setDescription_NotTerm(String description) { + setDescription_NotTerm(description, null); + } + + public void setDescription_NotEqual(String description, ConditionOptionCall opLambda) { + setDescription_NotTerm(description, opLambda); + } + + public void setDescription_NotTerm(String description, ConditionOptionCall opLambda) { + not(not -> not.setDescription_Term(description), opLambda); + } + + public void setDescription_Terms(Collection descriptionList) { + setDescription_Terms(descriptionList, null); + } + + public void setDescription_Terms(Collection descriptionList, ConditionOptionCall opLambda) { + TermsQueryBuilder builder = regTermsQ("description", descriptionList); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_InScope(Collection descriptionList) { + setDescription_Terms(descriptionList, null); + } + + public void setDescription_InScope(Collection descriptionList, ConditionOptionCall opLambda) { + setDescription_Terms(descriptionList, opLambda); + } + + public void setDescription_Match(String description) { + setDescription_Match(description, null); + } + + public void setDescription_Match(String description, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regMatchQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_MatchPhrase(String description) { + setDescription_MatchPhrase(description, null); + } + + public void setDescription_MatchPhrase(String description, ConditionOptionCall opLambda) { + MatchPhraseQueryBuilder builder = regMatchPhraseQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_MatchPhrasePrefix(String description) { + setDescription_MatchPhrasePrefix(description, null); + } + + public void setDescription_MatchPhrasePrefix(String description, ConditionOptionCall opLambda) { + MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Fuzzy(String description) { + setDescription_Fuzzy(description, null); + } + + public void setDescription_Fuzzy(String description, ConditionOptionCall opLambda) { + MatchQueryBuilder builder = regFuzzyQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Prefix(String description) { + setDescription_Prefix(description, null); + } + + public void setDescription_Prefix(String description, ConditionOptionCall opLambda) { + PrefixQueryBuilder builder = regPrefixQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Wildcard(String description) { + setDescription_Wildcard(description, null); + } + + public void setDescription_Wildcard(String description, ConditionOptionCall opLambda) { + WildcardQueryBuilder builder = regWildcardQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Regexp(String description) { + setDescription_Regexp(description, null); + } + + public void setDescription_Regexp(String description, ConditionOptionCall opLambda) { + RegexpQueryBuilder builder = regRegexpQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_SpanTerm(String description) { + setDescription_SpanTerm("description", null); + } + + public void setDescription_SpanTerm(String description, ConditionOptionCall opLambda) { + SpanTermQueryBuilder builder = regSpanTermQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_GreaterThan(String description) { + setDescription_GreaterThan(description, null); + } + + public void setDescription_GreaterThan(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_THAN, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_LessThan(String description) { + setDescription_LessThan(description, null); + } + + public void setDescription_LessThan(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_THAN, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_GreaterEqual(String description) { + setDescription_GreaterEqual(description, null); + } + + public void setDescription_GreaterEqual(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_EQUAL, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_LessEqual(String description) { + setDescription_LessEqual(description, null); + } + + public void setDescription_LessEqual(String description, ConditionOptionCall opLambda) { + final Object _value = description; + RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_EQUAL, _value); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_Exists() { + setDescription_Exists(null); + } + + public void setDescription_Exists(ConditionOptionCall opLambda) { + ExistsQueryBuilder builder = regExistsQ("description"); + if (opLambda != null) { + opLambda.callback(builder); + } + } + + public void setDescription_CommonTerms(String description) { + setDescription_CommonTerms(description, null); + } + + public void setDescription_CommonTerms(String description, ConditionOptionCall opLambda) { + CommonTermsQueryBuilder builder = regCommonTermsQ("description", description); + if (opLambda != null) { + opLambda.callback(builder); + } + } + public void setExcludedDocUrls_Equal(String excludedDocUrls) { setExcludedDocUrls_Term(excludedDocUrls, null); } diff --git a/src/main/resources/fess_indices/.fess_config/access_token.json b/src/main/resources/fess_indices/.fess_config/access_token.json index fc9efebb01591d396ceb9b60d06e5f0ac0eab9ae..9b5dfd9bce20a8175f1bd466ee66265f3d86517d 100644 --- a/src/main/resources/fess_indices/.fess_config/access_token.json +++ b/src/main/resources/fess_indices/.fess_config/access_token.json @@ -8,34 +8,28 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "token": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "permissions": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "parameter_name" : { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "expiredTime": { "type": "long" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/bad_word.json b/src/main/resources/fess_indices/.fess_config/bad_word.json index e7490f3b0a0861dfcca2a854858b851f275562e9..a0988d12cfc6390641df0aaece64bb2bf336a09c 100644 --- a/src/main/resources/fess_indices/.fess_config/bad_word.json +++ b/src/main/resources/fess_indices/.fess_config/bad_word.json @@ -8,27 +8,22 @@ }, "properties": { "suggestWord": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "targetRole": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "targetLabel": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/boost_document_rule.json b/src/main/resources/fess_indices/.fess_config/boost_document_rule.json index 04d46ea5ba50b5485c30a235710f8c521be72ee6..5f1a9dede799ed863d9da2290492eb74a362609c 100644 --- a/src/main/resources/fess_indices/.fess_config/boost_document_rule.json +++ b/src/main/resources/fess_indices/.fess_config/boost_document_rule.json @@ -8,26 +8,22 @@ }, "properties": { "urlExpr": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "boostExpr": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/crawling_info.json b/src/main/resources/fess_indices/.fess_config/crawling_info.json index f3b418090d5e32f87e323190009722cfd90810f5..313409f3f4b0a0c5496ba55fd158ce48fe09da07 100644 --- a/src/main/resources/fess_indices/.fess_config/crawling_info.json +++ b/src/main/resources/fess_indices/.fess_config/crawling_info.json @@ -8,12 +8,10 @@ }, "properties": { "sessionId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "expiredTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/crawling_info_param.json b/src/main/resources/fess_indices/.fess_config/crawling_info_param.json index d0d018c939c8f9b12b1ccd2ef4fa522d9403b9f7..92241de4fd655c33cc1c20392c8cd75619f6ffb1 100644 --- a/src/main/resources/fess_indices/.fess_config/crawling_info_param.json +++ b/src/main/resources/fess_indices/.fess_config/crawling_info_param.json @@ -8,16 +8,13 @@ }, "properties": { "crawlingInfoId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "key": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "value": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/data_config.json b/src/main/resources/fess_indices/.fess_config/data_config.json index 0291af14bd2f227393b59fc5593e74a46a7d6ef0..710b5999ca9f5c3120dd146facc40b04f5fc869a 100644 --- a/src/main/resources/fess_indices/.fess_config/data_config.json +++ b/src/main/resources/fess_indices/.fess_config/data_config.json @@ -8,20 +8,16 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "handlerName": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "handlerParameter": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "handlerScript": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "boost": { "type": "float" @@ -30,25 +26,25 @@ "type": "boolean" }, "permissions": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" + }, + "description" : { + "type": "text" } } } diff --git a/src/main/resources/fess_indices/.fess_config/data_config_to_label.json b/src/main/resources/fess_indices/.fess_config/data_config_to_label.json index 9acd486becfd9254f491fb9dcd094004a4cdff7c..2e1bcd0874b1739989be02863039f506525c77ab 100644 --- a/src/main/resources/fess_indices/.fess_config/data_config_to_label.json +++ b/src/main/resources/fess_indices/.fess_config/data_config_to_label.json @@ -8,12 +8,10 @@ }, "properties": { "dataConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "labelTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/data_config_to_role.json b/src/main/resources/fess_indices/.fess_config/data_config_to_role.json index 69b7d387d0800f8821c9e4690f895c8236a56155..53a5dc7b9564fbf2927ee603096d986334389ab0 100644 --- a/src/main/resources/fess_indices/.fess_config/data_config_to_role.json +++ b/src/main/resources/fess_indices/.fess_config/data_config_to_role.json @@ -8,12 +8,10 @@ }, "properties": { "dataConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "roleTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/duplicate_host.json b/src/main/resources/fess_indices/.fess_config/duplicate_host.json index 3319ca6754192298c2aba85060c33efec78d8997..c8e78dba01945cd793e066f0bd6a6691b67ccc6d 100644 --- a/src/main/resources/fess_indices/.fess_config/duplicate_host.json +++ b/src/main/resources/fess_indices/.fess_config/duplicate_host.json @@ -8,26 +8,22 @@ }, "properties": { "regularName": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "duplicateHostName": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/elevate_word.json b/src/main/resources/fess_indices/.fess_config/elevate_word.json index 0afe431be1042e94a4e0cfe2ba4fc8ba321f934c..d9dd2db537f254c386ca1f091ddb86ddae2968aa 100644 --- a/src/main/resources/fess_indices/.fess_config/elevate_word.json +++ b/src/main/resources/fess_indices/.fess_config/elevate_word.json @@ -8,38 +8,31 @@ }, "properties": { "suggestWord": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "reading": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "targetRole": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "targetLabel": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "permissions": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "boost": { "type": "float" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json b/src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json index 3b858c0523eb97658efc7a272af1afd52fe30fba..b69876ddd5b80684fb1e78b3c743d4743ca86727 100644 --- a/src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json +++ b/src/main/resources/fess_indices/.fess_config/elevate_word_to_label.json @@ -8,12 +8,10 @@ }, "properties": { "elevateWordId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "labelTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/failure_url.json b/src/main/resources/fess_indices/.fess_config/failure_url.json index b878641071158bc1909e6b0c54f9caa3bcfa43c7..59e8094c829fbe64ce830a369cace740957a9eb3 100644 --- a/src/main/resources/fess_indices/.fess_config/failure_url.json +++ b/src/main/resources/fess_indices/.fess_config/failure_url.json @@ -8,20 +8,16 @@ }, "properties": { "url": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "threadName": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "errorName": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "errorLog": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "errorCount": { "type": "integer" @@ -30,8 +26,7 @@ "type": "long" }, "configId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/file_authentication.json b/src/main/resources/fess_indices/.fess_config/file_authentication.json index fb6683d144af0c53d65b6006874bb85f1d552990..8d3f9edb3e6c16bda8d945c6b741ca6ed895242f 100644 --- a/src/main/resources/fess_indices/.fess_config/file_authentication.json +++ b/src/main/resources/fess_indices/.fess_config/file_authentication.json @@ -8,42 +8,34 @@ }, "properties": { "hostname": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "port": { "type": "integer" }, "protocolScheme": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "username": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "password": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "parameters": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "fileConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/file_config.json b/src/main/resources/fess_indices/.fess_config/file_config.json index e10042ebbac718fe1b17c17d545e7ccab397bb6f..43e56fbcf82f14eb0d755a8ce2f818b644405f22 100644 --- a/src/main/resources/fess_indices/.fess_config/file_config.json +++ b/src/main/resources/fess_indices/.fess_config/file_config.json @@ -8,32 +8,25 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "paths": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "includedPaths": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "excludedPaths": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "includedDocPaths": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "excludedDocPaths": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "configParameter": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "depth": { "type": "integer" @@ -57,25 +50,25 @@ "type": "boolean" }, "permissions": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" + }, + "description" : { + "type": "text" } } } diff --git a/src/main/resources/fess_indices/.fess_config/file_config_to_label.json b/src/main/resources/fess_indices/.fess_config/file_config_to_label.json index efab44c1aea108f849cff9752060bdcbc5acf6e4..6cfde946902522de3da56cead5aefa8e320418a4 100644 --- a/src/main/resources/fess_indices/.fess_config/file_config_to_label.json +++ b/src/main/resources/fess_indices/.fess_config/file_config_to_label.json @@ -8,12 +8,10 @@ }, "properties": { "fileConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "labelTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/file_config_to_role.json b/src/main/resources/fess_indices/.fess_config/file_config_to_role.json index a055d619f37b61e472de8c0f0e7207d2c68d8a91..b10aca4bba24a0c4ef538e11d54864dd36cd9136 100644 --- a/src/main/resources/fess_indices/.fess_config/file_config_to_role.json +++ b/src/main/resources/fess_indices/.fess_config/file_config_to_role.json @@ -8,12 +8,10 @@ }, "properties": { "fileConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "roleTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/job_log.json b/src/main/resources/fess_indices/.fess_config/job_log.json index 7af56c48cf7ac6cb58c4347a3db599b9dcb974ac..af2239a672e84d9ffb67105f0c65bbf56e85e14b 100644 --- a/src/main/resources/fess_indices/.fess_config/job_log.json +++ b/src/main/resources/fess_indices/.fess_config/job_log.json @@ -8,28 +8,22 @@ }, "properties": { "jobName": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "jobStatus": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "target": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "scriptType": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "scriptData": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "scriptResult": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "lastUpdated": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/key_match.json b/src/main/resources/fess_indices/.fess_config/key_match.json index 4de9e522387155b3928f1b32cfd9c8d47b869c8a..0bf21e9cba38de34563fa60859a05dbdcc22b3e7 100644 --- a/src/main/resources/fess_indices/.fess_config/key_match.json +++ b/src/main/resources/fess_indices/.fess_config/key_match.json @@ -8,12 +8,10 @@ }, "properties": { "term": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "query": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "maxSize": { "type": "integer" @@ -22,15 +20,13 @@ "type": "float" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/label_to_role.json b/src/main/resources/fess_indices/.fess_config/label_to_role.json index df1db26eb2fb6779b56f4e455d59350137269e3b..2b7a7a7fe5a4119949baf4758c0767b25df883bd 100644 --- a/src/main/resources/fess_indices/.fess_config/label_to_role.json +++ b/src/main/resources/fess_indices/.fess_config/label_to_role.json @@ -8,12 +8,10 @@ }, "properties": { "labelTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "roleTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/label_type.json b/src/main/resources/fess_indices/.fess_config/label_type.json index 510d09284cac339309d2055584a5fda43c41759f..fe9e9398a9408899eadc6bec1874c9299ae3c65d 100644 --- a/src/main/resources/fess_indices/.fess_config/label_type.json +++ b/src/main/resources/fess_indices/.fess_config/label_type.json @@ -8,38 +8,31 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "value": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "includedPaths": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "excludedPaths": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "permissions": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/path_mapping.json b/src/main/resources/fess_indices/.fess_config/path_mapping.json index 047c5956d842ceaeffc076c0c2d2bc936e3c023e..fbd5c89f47955fd13ba566ec0558998b261f493e 100644 --- a/src/main/resources/fess_indices/.fess_config/path_mapping.json +++ b/src/main/resources/fess_indices/.fess_config/path_mapping.json @@ -8,34 +8,28 @@ }, "properties": { "regex": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "replacement": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "processType": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "userAgent": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/request_header.json b/src/main/resources/fess_indices/.fess_config/request_header.json index ecf3a4be3699858f588375075cc43e2ed5cee1cf..464757b06d63835a0450f2a42fe569c5835f4953 100644 --- a/src/main/resources/fess_indices/.fess_config/request_header.json +++ b/src/main/resources/fess_indices/.fess_config/request_header.json @@ -8,27 +8,22 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "value": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "webConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/role_type.json b/src/main/resources/fess_indices/.fess_config/role_type.json index db22571df1ebb2e8acd65e7b7c55aa2cc82e0820..40b163e9c7435129dc1c2357a478d184edb4331f 100644 --- a/src/main/resources/fess_indices/.fess_config/role_type.json +++ b/src/main/resources/fess_indices/.fess_config/role_type.json @@ -8,26 +8,22 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "value": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/scheduled_job.json b/src/main/resources/fess_indices/.fess_config/scheduled_job.json index 51b2d2cb92eb26073740ca3a2174c6ea0eedd739..5a6addf6ff2acbacfa7c5af6a8f52509be24d588 100644 --- a/src/main/resources/fess_indices/.fess_config/scheduled_job.json +++ b/src/main/resources/fess_indices/.fess_config/scheduled_job.json @@ -8,28 +8,22 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "target": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "cronExpression": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "scriptType": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "scriptData": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "crawler": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "jobLogging": { "type": "boolean" @@ -41,15 +35,13 @@ "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/thumbnail_queue.json b/src/main/resources/fess_indices/.fess_config/thumbnail_queue.json index 4457e2b41ad685b0cea9d05bdb38550bd76669e9..007c36246989b67af8757616dbf544e30a6a9537 100644 --- a/src/main/resources/fess_indices/.fess_config/thumbnail_queue.json +++ b/src/main/resources/fess_indices/.fess_config/thumbnail_queue.json @@ -8,27 +8,22 @@ }, "properties": { "url": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "path": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "generator": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "target": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/web_authentication.json b/src/main/resources/fess_indices/.fess_config/web_authentication.json index 5ffb32a23678a8a044e8c44b33040a84645d8213..818a77eb72ff9738126d737b5f5753df72ae8760 100644 --- a/src/main/resources/fess_indices/.fess_config/web_authentication.json +++ b/src/main/resources/fess_indices/.fess_config/web_authentication.json @@ -8,46 +8,37 @@ }, "properties": { "hostname": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "port": { "type": "integer" }, "authRealm": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "protocolScheme": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "username": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "password": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "parameters": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "webConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" diff --git a/src/main/resources/fess_indices/.fess_config/web_config.json b/src/main/resources/fess_indices/.fess_config/web_config.json index e1b20af3ea165de2576f35808503df1268ddf41b..fc3e6d581ebc9493156fec3edd9e428d0549c89d 100644 --- a/src/main/resources/fess_indices/.fess_config/web_config.json +++ b/src/main/resources/fess_indices/.fess_config/web_config.json @@ -8,32 +8,25 @@ }, "properties": { "name": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "urls": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "includedUrls": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "excludedUrls": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "includedDocUrls": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "excludedDocUrls": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "configParameter": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "depth": { "type": "integer" @@ -42,8 +35,7 @@ "type": "long" }, "userAgent": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "numOfThread": { "type": "integer" @@ -61,25 +53,25 @@ "type": "boolean" }, "permissions": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "sortOrder": { "type": "integer" }, "createdBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "createdTime": { "type": "long" }, "updatedBy": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "updatedTime": { "type": "long" + }, + "description" : { + "type": "text" } } } diff --git a/src/main/resources/fess_indices/.fess_config/web_config_to_label.json b/src/main/resources/fess_indices/.fess_config/web_config_to_label.json index c29f27b6fb8eb456d7925458b43627b4a06cc22f..16a2c20760f348bf8e6fe133729efcd1bbe613cf 100644 --- a/src/main/resources/fess_indices/.fess_config/web_config_to_label.json +++ b/src/main/resources/fess_indices/.fess_config/web_config_to_label.json @@ -8,12 +8,10 @@ }, "properties": { "webConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "labelTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/.fess_config/web_config_to_role.json b/src/main/resources/fess_indices/.fess_config/web_config_to_role.json index baed9a200206a0b3b21869ed1d163df048870ab5..730da0cd04a038fb95f00ae1b514f0015a97c9c1 100644 --- a/src/main/resources/fess_indices/.fess_config/web_config_to_role.json +++ b/src/main/resources/fess_indices/.fess_config/web_config_to_role.json @@ -8,12 +8,10 @@ }, "properties": { "webConfigId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" }, "roleTypeId": { - "type": "string", - "index": "not_analyzed" + "type": "keyword" } } } diff --git a/src/main/resources/fess_indices/fess/doc.json b/src/main/resources/fess_indices/fess/doc.json index b09349a55080d83facf1b0e982c11a37af1f8918..8adc945f12198343e574c908fa114181bf200260 100644 --- a/src/main/resources/fess_indices/fess/doc.json +++ b/src/main/resources/fess_indices/fess/doc.json @@ -448,7 +448,7 @@ "type": "langstring", "lang_field": "lang", "lang_base_name": "title", - "index": "no" + "index": false }, "content": { "type": "langstring", @@ -473,7 +473,7 @@ }, "digest": { "type": "text", - "index": "no" + "index": false }, "doc_id": { "type": "keyword" diff --git a/src/main/resources/fess_indices/fess_log/search_log.json b/src/main/resources/fess_indices/fess_log/search_log.json index aff5d691ab7cd8af1c625834a02412abdd20592e..bde00d7df2e09734cdc8104a41359e0a916bd8b6 100644 --- a/src/main/resources/fess_indices/fess_log/search_log.json +++ b/src/main/resources/fess_indices/fess_log/search_log.json @@ -57,8 +57,7 @@ "type": "keyword" }, "languages" : { - "type" : "string", - "index" : "not_analyzed" + "type" : "keyword" } } }