diff --git a/dbflute.xml b/dbflute.xml
index e33b2e784fdfd73e08d610094b9cb9d7c41740c8..e16a69a999c26552123560c4536a746481f79ae8 100644
--- a/dbflute.xml
+++ b/dbflute.xml
@@ -2,7 +2,7 @@
<project name="dbflute" basedir=".">
<property name="mydbflute.dir" value="${basedir}/mydbflute" />
<property name="target.dir" value="${basedir}/target" />
- <property name="branch.name" value="master" />
+ <property name="branch.name" value="fess-14.0" />
<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />
<target name="mydbflute.check">
diff --git a/deps.xml b/deps.xml
index 4840c420a22cbaac1c6a277749d446b918873cc2..b58f858eee91334dda0d702e0db16b7e15c16563 100644
--- a/deps.xml
+++ b/deps.xml
@@ -48,24 +48,24 @@
<param name="repo.url" value="${maven.release.repo.url}" />
<param name="jar.groupId" value="org/codelibs/fess" />
<param name="jar.artifactId" value="fess-ds-csv" />
- <param name="jar.version" value="13.15.0" />
- <param name="file.version" value="13.15.0" />
+ <param name="jar.version" value="14.0.0" />
+ <param name="file.version" value="14.0.0" />
</antcall>
<!-- fess-ds-db -->
<antcall target="install.plugin.jar">
<param name="repo.url" value="${maven.release.repo.url}" />
<param name="jar.groupId" value="org/codelibs/fess" />
<param name="jar.artifactId" value="fess-ds-db" />
- <param name="jar.version" value="13.15.0" />
- <param name="file.version" value="13.15.0" />
+ <param name="jar.version" value="14.0.0" />
+ <param name="file.version" value="14.0.0" />
</antcall>
<!-- fess-script-groovy -->
<antcall target="install.plugin.jar">
<param name="repo.url" value="${maven.release.repo.url}" />
<param name="jar.groupId" value="org/codelibs/fess" />
<param name="jar.artifactId" value="fess-script-groovy" />
- <param name="jar.version" value="13.15.0" />
- <param name="file.version" value="13.15.0" />
+ <param name="jar.version" value="14.0.0" />
+ <param name="file.version" value="14.0.0" />
</antcall>
</target>
diff --git a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
index ac9fb33fc51c0d4df68da254658746b813696eb2..e80ada150dc990e35b63907825dc308b4d41df34 100644
--- a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
@@ -30,13 +30,13 @@ public class CrawlerEngineClient extends FesenClient {
protected Client createClient() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final Builder builder = Settings.builder().putList("http.hosts", address).put("processors", fessConfig.getCrawlerHttpProcessors());
- final String username = fessConfig.getOpenSearchUsername();
- final String password = fessConfig.getOpenSearchPassword();
+ final String username = fessConfig.getElasticsearchUsername();
+ final String password = fessConfig.getElasticsearchPassword();
if (StringUtil.isNotBlank(username) && StringUtil.isNotBlank(password)) {
builder.put(Constants.FESEN_USERNAME, username);
builder.put(Constants.FESEN_PASSWORD, password);
}
- final String authorities = fessConfig.getOpenSearchHttpSslCertificateAuthorities();
+ final String authorities = fessConfig.getElasticsearchHttpSslCertificateAuthorities();
if (StringUtil.isNotBlank(authorities)) {
builder.put("http.ssl.certificate_authorities", authorities);
}
diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
index a7439010a63069d2403e30a05a87a055432abc58..f1a34563569f96239464d2550fd71b11610b6ba9 100644
--- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
@@ -341,13 +341,13 @@ public class SearchEngineClient implements Client {
protected Client createHttpClient(final FessConfig fessConfig, final String host) {
final Builder builder = Settings.builder().putList("http.hosts", host).put("processors", fessConfig.availableProcessors());
- final String username = fessConfig.getOpenSearchUsername();
- final String password = fessConfig.getOpenSearchPassword();
+ final String username = fessConfig.getElasticsearchUsername();
+ final String password = fessConfig.getElasticsearchPassword();
if (StringUtil.isNotBlank(username) && StringUtil.isNotBlank(password)) {
builder.put(Constants.FESEN_USERNAME, username);
builder.put(Constants.FESEN_PASSWORD, password);
}
- final String authorities = fessConfig.getOpenSearchHttpSslCertificateAuthorities();
+ final String authorities = fessConfig.getElasticsearchHttpSslCertificateAuthorities();
if (StringUtil.isNotBlank(authorities)) {
builder.put("http.ssl.certificate_authorities", authorities);
}
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
index 8c8071492eb4d2a854578016a77931eb551aaee0..ded20771b1f6f6258ee72764005431796e8b523c 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
// ===================================================================================
- // OpenSearch
+ // Elasticsearch
// ======
public RefreshResponse refresh() {
return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
index 2595838d7d22d449be7e2d1da7314d2d3efa1e8e..cc519893e93a145f5974f173a1608fa3c112a647 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
@@ -175,11 +175,13 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsAccessTokenCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsAccessTokenCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -742,10 +748,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setExpiredTime_CommonTerms(Long expiredTime) {
setExpiredTime_CommonTerms(expiredTime, null);
}
+ @Deprecated
public void setExpiredTime_CommonTerms(Long expiredTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("expiredTime", expiredTime);
if (opLambda != null) {
@@ -964,10 +972,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -1186,10 +1196,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setParameterName_CommonTerms(String parameterName) {
setParameterName_CommonTerms(parameterName, null);
}
+ @Deprecated
public void setParameterName_CommonTerms(String parameterName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("parameter_name", parameterName);
if (opLambda != null) {
@@ -1408,10 +1420,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions) {
setPermissions_CommonTerms(permissions, null);
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
if (opLambda != null) {
@@ -1630,10 +1644,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setToken_CommonTerms(String token) {
setToken_CommonTerms(token, null);
}
+ @Deprecated
public void setToken_CommonTerms(String token, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("token", token);
if (opLambda != null) {
@@ -1852,10 +1868,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -2030,10 +2048,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
index 15723f87fd3bb69ce356885237a320785e217847..d11787129fb93922d680c3ba08fe3570c426da8d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
@@ -174,11 +174,13 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsBadWordCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsBadWordCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -385,10 +387,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -563,10 +567,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -785,10 +791,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSuggestWord_CommonTerms(String suggestWord) {
setSuggestWord_CommonTerms(suggestWord, null);
}
+ @Deprecated
public void setSuggestWord_CommonTerms(String suggestWord, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("suggestWord", suggestWord);
if (opLambda != null) {
@@ -1007,10 +1015,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTargetLabel_CommonTerms(String targetLabel) {
setTargetLabel_CommonTerms(targetLabel, null);
}
+ @Deprecated
public void setTargetLabel_CommonTerms(String targetLabel, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("targetLabel", targetLabel);
if (opLambda != null) {
@@ -1229,10 +1239,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTargetRole_CommonTerms(String targetRole) {
setTargetRole_CommonTerms(targetRole, null);
}
+ @Deprecated
public void setTargetRole_CommonTerms(String targetRole, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("targetRole", targetRole);
if (opLambda != null) {
@@ -1451,10 +1463,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1629,10 +1643,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
index c6b7876aeaa521926b4c0ce14e317347366566ec..c80ccc47f5410506c7033848ed51f460758bef0e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
@@ -176,11 +176,13 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsBoostDocumentRuleCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsBoostDocumentRuleCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -387,10 +389,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setBoostExpr_CommonTerms(String boostExpr) {
setBoostExpr_CommonTerms(boostExpr, null);
}
+ @Deprecated
public void setBoostExpr_CommonTerms(String boostExpr, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("boostExpr", boostExpr);
if (opLambda != null) {
@@ -609,10 +613,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -787,10 +793,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -965,10 +973,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -1187,10 +1197,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1365,10 +1377,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -1587,10 +1601,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUrlExpr_CommonTerms(String urlExpr) {
setUrlExpr_CommonTerms(urlExpr, null);
}
+ @Deprecated
public void setUrlExpr_CommonTerms(String urlExpr, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("urlExpr", urlExpr);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
index 71008b2501f76e7c50c4c64eb7e8c0bef516eaa8..54effb3bc03bdc09ee7731663dcc072b1749cf0d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
@@ -175,11 +175,13 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsCrawlingInfoCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsCrawlingInfoCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -342,10 +344,12 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -520,10 +524,12 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setExpiredTime_CommonTerms(Long expiredTime) {
setExpiredTime_CommonTerms(expiredTime, null);
}
+ @Deprecated
public void setExpiredTime_CommonTerms(Long expiredTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("expiredTime", expiredTime);
if (opLambda != null) {
@@ -742,10 +748,12 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -964,10 +972,12 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSessionId_CommonTerms(String sessionId) {
setSessionId_CommonTerms(sessionId, null);
}
+ @Deprecated
public void setSessionId_CommonTerms(String sessionId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sessionId", sessionId);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
index eb29dae66286847b8c4680d7a5c5c3e23d258948..de77a3922d5f8f2e88b1de7f7e22809642eff7fe 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
@@ -176,11 +176,13 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsCrawlingInfoParamCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsCrawlingInfoParamCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -387,10 +389,12 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCrawlingInfoId_CommonTerms(String crawlingInfoId) {
setCrawlingInfoId_CommonTerms(crawlingInfoId, null);
}
+ @Deprecated
public void setCrawlingInfoId_CommonTerms(String crawlingInfoId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("crawlingInfoId", crawlingInfoId);
if (opLambda != null) {
@@ -565,10 +569,12 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -787,10 +793,12 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setKey_CommonTerms(String key) {
setKey_CommonTerms(key, null);
}
+ @Deprecated
public void setKey_CommonTerms(String key, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("key", key);
if (opLambda != null) {
@@ -1009,10 +1017,12 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setValue_CommonTerms(String value) {
setValue_CommonTerms(value, null);
}
+ @Deprecated
public void setValue_CommonTerms(String value, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("value", value);
if (opLambda != 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 cc5f564a3705805b63639d36948d9f22bbe2152f..8382e1faf512951d90fc45363f675d32223f01ac 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
@@ -174,11 +174,13 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsDataConfigCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsDataConfigCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -341,10 +343,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available) {
setAvailable_CommonTerms(available, null);
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("available", available);
if (opLambda != null) {
@@ -519,10 +523,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost) {
setBoost_CommonTerms(boost, null);
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("boost", boost);
if (opLambda != null) {
@@ -741,10 +747,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -919,10 +927,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -1141,10 +1151,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDescription_CommonTerms(String description) {
setDescription_CommonTerms(description, null);
}
+ @Deprecated
public void setDescription_CommonTerms(String description, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("description", description);
if (opLambda != null) {
@@ -1353,10 +1365,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHandlerName_CommonTerms(String handlerName) {
setHandlerName_CommonTerms(handlerName, null);
}
+ @Deprecated
public void setHandlerName_CommonTerms(String handlerName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("handlerName", handlerName);
if (opLambda != null) {
@@ -1576,10 +1590,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHandlerParameter_CommonTerms(String handlerParameter) {
setHandlerParameter_CommonTerms(handlerParameter, null);
}
+ @Deprecated
public void setHandlerParameter_CommonTerms(String handlerParameter, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("handlerParameter", handlerParameter);
if (opLambda != null) {
@@ -1798,10 +1814,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHandlerScript_CommonTerms(String handlerScript) {
setHandlerScript_CommonTerms(handlerScript, null);
}
+ @Deprecated
public void setHandlerScript_CommonTerms(String handlerScript, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("handlerScript", handlerScript);
if (opLambda != null) {
@@ -2020,10 +2038,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -2242,10 +2262,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions) {
setPermissions_CommonTerms(permissions, null);
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
if (opLambda != null) {
@@ -2420,10 +2442,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -2642,10 +2666,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -2820,10 +2846,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -3042,10 +3070,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHosts_CommonTerms(String virtualHosts) {
setVirtualHosts_CommonTerms(virtualHosts, null);
}
+ @Deprecated
public void setVirtualHosts_CommonTerms(String virtualHosts, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHosts", virtualHosts);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
index 0d2aa67782ddf3cc16196d8daa15a59eb3dcb710..f82b6bf68780982bca56533a2dd09bb8ddb41873 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
@@ -175,11 +175,13 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsDuplicateHostCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsDuplicateHostCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -787,10 +793,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDuplicateHostName_CommonTerms(String duplicateHostName) {
setDuplicateHostName_CommonTerms(duplicateHostName, null);
}
+ @Deprecated
public void setDuplicateHostName_CommonTerms(String duplicateHostName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("duplicateHostName", duplicateHostName);
if (opLambda != null) {
@@ -1009,10 +1017,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRegularName_CommonTerms(String regularName) {
setRegularName_CommonTerms(regularName, null);
}
+ @Deprecated
public void setRegularName_CommonTerms(String regularName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("regularName", regularName);
if (opLambda != null) {
@@ -1187,10 +1197,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -1409,10 +1421,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1587,10 +1601,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
index 39716e443553cd2599dea06168321dca7ac1ef77..fb647dbb8886b4c44e4269bc45aa8439ae0a350f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
@@ -175,11 +175,13 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsElevateWordCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsElevateWordCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -342,10 +344,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost) {
setBoost_CommonTerms(boost, null);
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("boost", boost);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -742,10 +748,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -964,10 +972,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions) {
setPermissions_CommonTerms(permissions, null);
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
if (opLambda != null) {
@@ -1186,10 +1196,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setReading_CommonTerms(String reading) {
setReading_CommonTerms(reading, null);
}
+ @Deprecated
public void setReading_CommonTerms(String reading, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("reading", reading);
if (opLambda != null) {
@@ -1408,10 +1420,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSuggestWord_CommonTerms(String suggestWord) {
setSuggestWord_CommonTerms(suggestWord, null);
}
+ @Deprecated
public void setSuggestWord_CommonTerms(String suggestWord, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("suggestWord", suggestWord);
if (opLambda != null) {
@@ -1630,10 +1644,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1808,10 +1824,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
index 649d1cc275e6c88cbecd72f213d335006221a164..6175de0aeaebcc9d0c01e28931b837bc33e2febd 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
@@ -176,11 +176,13 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsElevateWordToLabelCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsElevateWordToLabelCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -387,10 +389,12 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setElevateWordId_CommonTerms(String elevateWordId) {
setElevateWordId_CommonTerms(elevateWordId, null);
}
+ @Deprecated
public void setElevateWordId_CommonTerms(String elevateWordId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("elevateWordId", elevateWordId);
if (opLambda != null) {
@@ -609,10 +613,12 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setLabelTypeId_CommonTerms(String labelTypeId) {
setLabelTypeId_CommonTerms(labelTypeId, null);
}
+ @Deprecated
public void setLabelTypeId_CommonTerms(String labelTypeId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("labelTypeId", labelTypeId);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
index a7841723fe8c1e54a0678b4b0e6fa9e479cd00fc..6de6e7a1081cd92eabd6f8687b081a3df4ba5845 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
@@ -174,11 +174,13 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsFailureUrlCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsFailureUrlCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -385,10 +387,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setConfigId_CommonTerms(String configId) {
setConfigId_CommonTerms(configId, null);
}
+ @Deprecated
public void setConfigId_CommonTerms(String configId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("configId", configId);
if (opLambda != null) {
@@ -563,10 +567,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setErrorCount_CommonTerms(Integer errorCount) {
setErrorCount_CommonTerms(errorCount, null);
}
+ @Deprecated
public void setErrorCount_CommonTerms(Integer errorCount, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("errorCount", errorCount);
if (opLambda != null) {
@@ -785,10 +791,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setErrorLog_CommonTerms(String errorLog) {
setErrorLog_CommonTerms(errorLog, null);
}
+ @Deprecated
public void setErrorLog_CommonTerms(String errorLog, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("errorLog", errorLog);
if (opLambda != null) {
@@ -1007,10 +1015,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setErrorName_CommonTerms(String errorName) {
setErrorName_CommonTerms(errorName, null);
}
+ @Deprecated
public void setErrorName_CommonTerms(String errorName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("errorName", errorName);
if (opLambda != null) {
@@ -1185,10 +1195,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setLastAccessTime_CommonTerms(Long lastAccessTime) {
setLastAccessTime_CommonTerms(lastAccessTime, null);
}
+ @Deprecated
public void setLastAccessTime_CommonTerms(Long lastAccessTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("lastAccessTime", lastAccessTime);
if (opLambda != null) {
@@ -1407,10 +1419,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setThreadName_CommonTerms(String threadName) {
setThreadName_CommonTerms(threadName, null);
}
+ @Deprecated
public void setThreadName_CommonTerms(String threadName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("threadName", threadName);
if (opLambda != null) {
@@ -1629,10 +1643,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUrl_CommonTerms(String url) {
setUrl_CommonTerms(url, null);
}
+ @Deprecated
public void setUrl_CommonTerms(String url, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("url", url);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
index a7964ea6fce97ea7420a4cd8706f1976c274b8c4..61882cb9bb628774c79cc5d962462339ea1af405 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
@@ -176,11 +176,13 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsFileAuthenticationCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsFileAuthenticationCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -387,10 +389,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -565,10 +569,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -787,10 +793,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setFileConfigId_CommonTerms(String fileConfigId) {
setFileConfigId_CommonTerms(fileConfigId, null);
}
+ @Deprecated
public void setFileConfigId_CommonTerms(String fileConfigId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("fileConfigId", fileConfigId);
if (opLambda != null) {
@@ -1009,10 +1017,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHostname_CommonTerms(String hostname) {
setHostname_CommonTerms(hostname, null);
}
+ @Deprecated
public void setHostname_CommonTerms(String hostname, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("hostname", hostname);
if (opLambda != null) {
@@ -1231,10 +1241,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setParameters_CommonTerms(String parameters) {
setParameters_CommonTerms(parameters, null);
}
+ @Deprecated
public void setParameters_CommonTerms(String parameters, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("parameters", parameters);
if (opLambda != null) {
@@ -1453,10 +1465,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPassword_CommonTerms(String password) {
setPassword_CommonTerms(password, null);
}
+ @Deprecated
public void setPassword_CommonTerms(String password, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("password", password);
if (opLambda != null) {
@@ -1631,10 +1645,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPort_CommonTerms(Integer port) {
setPort_CommonTerms(port, null);
}
+ @Deprecated
public void setPort_CommonTerms(Integer port, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("port", port);
if (opLambda != null) {
@@ -1853,10 +1869,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setProtocolScheme_CommonTerms(String protocolScheme) {
setProtocolScheme_CommonTerms(protocolScheme, null);
}
+ @Deprecated
public void setProtocolScheme_CommonTerms(String protocolScheme, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("protocolScheme", protocolScheme);
if (opLambda != null) {
@@ -2075,10 +2093,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -2253,10 +2273,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -2475,10 +2497,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUsername_CommonTerms(String username) {
setUsername_CommonTerms(username, null);
}
+ @Deprecated
public void setUsername_CommonTerms(String username, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("username", username);
if (opLambda != 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 f958c51422faa7902ed2259bfc0f06955d138df7..af5deb715d115c9ea453ce79e12e728db164fff6 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
@@ -174,11 +174,13 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsFileConfigCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsFileConfigCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -341,10 +343,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available) {
setAvailable_CommonTerms(available, null);
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("available", available);
if (opLambda != null) {
@@ -519,10 +523,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost) {
setBoost_CommonTerms(boost, null);
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("boost", boost);
if (opLambda != null) {
@@ -741,10 +747,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setConfigParameter_CommonTerms(String configParameter) {
setConfigParameter_CommonTerms(configParameter, null);
}
+ @Deprecated
public void setConfigParameter_CommonTerms(String configParameter, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("configParameter", configParameter);
if (opLambda != null) {
@@ -963,10 +971,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -1141,10 +1151,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -1319,10 +1331,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDepth_CommonTerms(Integer depth) {
setDepth_CommonTerms(depth, null);
}
+ @Deprecated
public void setDepth_CommonTerms(Integer depth, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("depth", depth);
if (opLambda != null) {
@@ -1541,10 +1555,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDescription_CommonTerms(String description) {
setDescription_CommonTerms(description, null);
}
+ @Deprecated
public void setDescription_CommonTerms(String description, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("description", description);
if (opLambda != null) {
@@ -1754,10 +1770,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setExcludedDocPaths_CommonTerms(String excludedDocPaths) {
setExcludedDocPaths_CommonTerms(excludedDocPaths, null);
}
+ @Deprecated
public void setExcludedDocPaths_CommonTerms(String excludedDocPaths, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("excludedDocPaths", excludedDocPaths);
if (opLambda != null) {
@@ -1976,10 +1994,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setExcludedPaths_CommonTerms(String excludedPaths) {
setExcludedPaths_CommonTerms(excludedPaths, null);
}
+ @Deprecated
public void setExcludedPaths_CommonTerms(String excludedPaths, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("excludedPaths", excludedPaths);
if (opLambda != null) {
@@ -2199,10 +2219,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setIncludedDocPaths_CommonTerms(String includedDocPaths) {
setIncludedDocPaths_CommonTerms(includedDocPaths, null);
}
+ @Deprecated
public void setIncludedDocPaths_CommonTerms(String includedDocPaths, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("includedDocPaths", includedDocPaths);
if (opLambda != null) {
@@ -2421,10 +2443,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setIncludedPaths_CommonTerms(String includedPaths) {
setIncludedPaths_CommonTerms(includedPaths, null);
}
+ @Deprecated
public void setIncludedPaths_CommonTerms(String includedPaths, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("includedPaths", includedPaths);
if (opLambda != null) {
@@ -2599,10 +2623,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setIntervalTime_CommonTerms(Integer intervalTime) {
setIntervalTime_CommonTerms(intervalTime, null);
}
+ @Deprecated
public void setIntervalTime_CommonTerms(Integer intervalTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("intervalTime", intervalTime);
if (opLambda != null) {
@@ -2777,10 +2803,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setMaxAccessCount_CommonTerms(Long maxAccessCount) {
setMaxAccessCount_CommonTerms(maxAccessCount, null);
}
+ @Deprecated
public void setMaxAccessCount_CommonTerms(Long maxAccessCount, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("maxAccessCount", maxAccessCount);
if (opLambda != null) {
@@ -2999,10 +3027,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -3177,10 +3207,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setNumOfThread_CommonTerms(Integer numOfThread) {
setNumOfThread_CommonTerms(numOfThread, null);
}
+ @Deprecated
public void setNumOfThread_CommonTerms(Integer numOfThread, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("numOfThread", numOfThread);
if (opLambda != null) {
@@ -3399,10 +3431,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPaths_CommonTerms(String paths) {
setPaths_CommonTerms(paths, null);
}
+ @Deprecated
public void setPaths_CommonTerms(String paths, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("paths", paths);
if (opLambda != null) {
@@ -3621,10 +3655,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions) {
setPermissions_CommonTerms(permissions, null);
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
if (opLambda != null) {
@@ -3799,10 +3835,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -3977,10 +4015,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTimeToLive_CommonTerms(Integer timeToLive) {
setTimeToLive_CommonTerms(timeToLive, null);
}
+ @Deprecated
public void setTimeToLive_CommonTerms(Integer timeToLive, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("timeToLive", timeToLive);
if (opLambda != null) {
@@ -4199,10 +4239,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -4377,10 +4419,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -4599,10 +4643,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHosts_CommonTerms(String virtualHosts) {
setVirtualHosts_CommonTerms(virtualHosts, null);
}
+ @Deprecated
public void setVirtualHosts_CommonTerms(String virtualHosts, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHosts", virtualHosts);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
index a454f9cbebfdd17043da22079e0666369854426d..5f2873e5508ce906c5f8ca3dd09a4fccfc54ec54 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
@@ -174,11 +174,13 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsJobLogCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsJobLogCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -341,10 +343,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setEndTime_CommonTerms(Long endTime) {
setEndTime_CommonTerms(endTime, null);
}
+ @Deprecated
public void setEndTime_CommonTerms(Long endTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("endTime", endTime);
if (opLambda != null) {
@@ -563,10 +567,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setJobName_CommonTerms(String jobName) {
setJobName_CommonTerms(jobName, null);
}
+ @Deprecated
public void setJobName_CommonTerms(String jobName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("jobName", jobName);
if (opLambda != null) {
@@ -785,10 +791,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setJobStatus_CommonTerms(String jobStatus) {
setJobStatus_CommonTerms(jobStatus, null);
}
+ @Deprecated
public void setJobStatus_CommonTerms(String jobStatus, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("jobStatus", jobStatus);
if (opLambda != null) {
@@ -963,10 +971,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setLastUpdated_CommonTerms(Long lastUpdated) {
setLastUpdated_CommonTerms(lastUpdated, null);
}
+ @Deprecated
public void setLastUpdated_CommonTerms(Long lastUpdated, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("lastUpdated", lastUpdated);
if (opLambda != null) {
@@ -1185,10 +1195,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setScriptData_CommonTerms(String scriptData) {
setScriptData_CommonTerms(scriptData, null);
}
+ @Deprecated
public void setScriptData_CommonTerms(String scriptData, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("scriptData", scriptData);
if (opLambda != null) {
@@ -1407,10 +1419,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setScriptResult_CommonTerms(String scriptResult) {
setScriptResult_CommonTerms(scriptResult, null);
}
+ @Deprecated
public void setScriptResult_CommonTerms(String scriptResult, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("scriptResult", scriptResult);
if (opLambda != null) {
@@ -1629,10 +1643,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setScriptType_CommonTerms(String scriptType) {
setScriptType_CommonTerms(scriptType, null);
}
+ @Deprecated
public void setScriptType_CommonTerms(String scriptType, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("scriptType", scriptType);
if (opLambda != null) {
@@ -1807,10 +1823,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setStartTime_CommonTerms(Long startTime) {
setStartTime_CommonTerms(startTime, null);
}
+ @Deprecated
public void setStartTime_CommonTerms(Long startTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("startTime", startTime);
if (opLambda != null) {
@@ -2029,10 +2047,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTarget_CommonTerms(String target) {
setTarget_CommonTerms(target, null);
}
+ @Deprecated
public void setTarget_CommonTerms(String target, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("target", target);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
index e90cf8fe31c399184497303965ea33e100351abd..7e35a7b3dd183d705c8b73fe3f3882b7764776da 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
@@ -174,11 +174,13 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsKeyMatchCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsKeyMatchCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -341,10 +343,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost) {
setBoost_CommonTerms(boost, null);
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("boost", boost);
if (opLambda != null) {
@@ -563,10 +567,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -741,10 +747,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -919,10 +927,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setMaxSize_CommonTerms(Integer maxSize) {
setMaxSize_CommonTerms(maxSize, null);
}
+ @Deprecated
public void setMaxSize_CommonTerms(Integer maxSize, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("maxSize", maxSize);
if (opLambda != null) {
@@ -1141,10 +1151,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQuery_CommonTerms(String query) {
setQuery_CommonTerms(query, null);
}
+ @Deprecated
public void setQuery_CommonTerms(String query, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("query", query);
if (opLambda != null) {
@@ -1363,10 +1375,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTerm_CommonTerms(String term) {
setTerm_CommonTerms(term, null);
}
+ @Deprecated
public void setTerm_CommonTerms(String term, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("term", term);
if (opLambda != null) {
@@ -1585,10 +1599,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1763,10 +1779,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -1985,10 +2003,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost) {
setVirtualHost_CommonTerms(virtualHost, null);
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
index ef3b3a2d805e2857be89403a21e54d9026101039..05c8c43c37432598437b23ece2c58f0482e05bc0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
@@ -174,11 +174,13 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsLabelTypeCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsLabelTypeCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -385,10 +387,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -563,10 +567,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -785,10 +791,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setExcludedPaths_CommonTerms(String excludedPaths) {
setExcludedPaths_CommonTerms(excludedPaths, null);
}
+ @Deprecated
public void setExcludedPaths_CommonTerms(String excludedPaths, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("excludedPaths", excludedPaths);
if (opLambda != null) {
@@ -1007,10 +1015,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setIncludedPaths_CommonTerms(String includedPaths) {
setIncludedPaths_CommonTerms(includedPaths, null);
}
+ @Deprecated
public void setIncludedPaths_CommonTerms(String includedPaths, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("includedPaths", includedPaths);
if (opLambda != null) {
@@ -1229,10 +1239,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -1451,10 +1463,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions) {
setPermissions_CommonTerms(permissions, null);
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
if (opLambda != null) {
@@ -1629,10 +1643,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -1851,10 +1867,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -2029,10 +2047,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -2251,10 +2271,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setValue_CommonTerms(String value) {
setValue_CommonTerms(value, null);
}
+ @Deprecated
public void setValue_CommonTerms(String value, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("value", value);
if (opLambda != null) {
@@ -2473,10 +2495,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost) {
setVirtualHost_CommonTerms(virtualHost, null);
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
index bc64f2067b21c1e2e04380b5ebfa55f23409f378..fcc5c725cb7c7005191787017e20c3bdfc287449 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
@@ -175,11 +175,13 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsPathMappingCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsPathMappingCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -786,10 +792,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setProcessType_CommonTerms(String processType) {
setProcessType_CommonTerms(processType, null);
}
+ @Deprecated
public void setProcessType_CommonTerms(String processType, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("processType", processType);
if (opLambda != null) {
@@ -1008,10 +1016,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRegex_CommonTerms(String regex) {
setRegex_CommonTerms(regex, null);
}
+ @Deprecated
public void setRegex_CommonTerms(String regex, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("regex", regex);
if (opLambda != null) {
@@ -1230,10 +1240,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setReplacement_CommonTerms(String replacement) {
setReplacement_CommonTerms(replacement, null);
}
+ @Deprecated
public void setReplacement_CommonTerms(String replacement, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("replacement", replacement);
if (opLambda != null) {
@@ -1408,10 +1420,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -1630,10 +1644,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1808,10 +1824,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -2030,10 +2048,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUserAgent_CommonTerms(String userAgent) {
setUserAgent_CommonTerms(userAgent, null);
}
+ @Deprecated
public void setUserAgent_CommonTerms(String userAgent, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("userAgent", userAgent);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
index 42117e8f692840a8c1c39649be9c3aef36526848..d8ee32639106ef467688d2e7a267fc1bd8725329 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedContentCQ.java
@@ -175,11 +175,13 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsRelatedContentCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsRelatedContentCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setContent_CommonTerms(String content) {
setContent_CommonTerms(content, null);
}
+ @Deprecated
public void setContent_CommonTerms(String content, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("content", content);
if (opLambda != null) {
@@ -608,10 +612,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -786,10 +792,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -964,10 +972,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -1186,10 +1196,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTerm_CommonTerms(String term) {
setTerm_CommonTerms(term, null);
}
+ @Deprecated
public void setTerm_CommonTerms(String term, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("term", term);
if (opLambda != null) {
@@ -1408,10 +1420,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1586,10 +1600,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -1808,10 +1824,12 @@ public abstract class BsRelatedContentCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost) {
setVirtualHost_CommonTerms(virtualHost, null);
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
index 8af53c18f45844d3599d025f8b35842a7ba489e3..18363d1bc4fff5a65d8e13aa0497311dc7236e28 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRelatedQueryCQ.java
@@ -175,11 +175,13 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsRelatedQueryCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsRelatedQueryCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -786,10 +792,12 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueries_CommonTerms(String queries) {
setQueries_CommonTerms(queries, null);
}
+ @Deprecated
public void setQueries_CommonTerms(String queries, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queries", queries);
if (opLambda != null) {
@@ -1008,10 +1016,12 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTerm_CommonTerms(String term) {
setTerm_CommonTerms(term, null);
}
+ @Deprecated
public void setTerm_CommonTerms(String term, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("term", term);
if (opLambda != null) {
@@ -1230,10 +1240,12 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1408,10 +1420,12 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -1630,10 +1644,12 @@ public abstract class BsRelatedQueryCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost) {
setVirtualHost_CommonTerms(virtualHost, null);
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
index 432b4421fb3a8bbd9820b3b3fef0dceed4d46b6d..dcb6a7a645db6c74d3eac68301e8f0c8e221e7c1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
@@ -175,11 +175,13 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsRequestHeaderCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsRequestHeaderCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -786,10 +792,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -1008,10 +1016,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1186,10 +1196,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -1408,10 +1420,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setValue_CommonTerms(String value) {
setValue_CommonTerms(value, null);
}
+ @Deprecated
public void setValue_CommonTerms(String value, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("value", value);
if (opLambda != null) {
@@ -1630,10 +1644,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setWebConfigId_CommonTerms(String webConfigId) {
setWebConfigId_CommonTerms(webConfigId, null);
}
+ @Deprecated
public void setWebConfigId_CommonTerms(String webConfigId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("webConfigId", webConfigId);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
index 78cc7a57ba6f195556a51cdd2cba0764a33aab73..5e8b7aa3ffd2186cd51b41312749cd902d77bf92 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
@@ -174,11 +174,13 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsRoleTypeCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsRoleTypeCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -385,10 +387,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -563,10 +567,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -785,10 +791,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -963,10 +971,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -1185,10 +1195,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -1363,10 +1375,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -1585,10 +1599,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setValue_CommonTerms(String value) {
setValue_CommonTerms(value, null);
}
+ @Deprecated
public void setValue_CommonTerms(String value, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("value", value);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
index d25223c406cc72cef69d0e62763c342c53e261e0..1e0039038dbe7d91a8d32bbe715659599f26a1e7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
@@ -175,11 +175,13 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsScheduledJobCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsScheduledJobCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -342,10 +344,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available) {
setAvailable_CommonTerms(available, null);
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("available", available);
if (opLambda != null) {
@@ -520,10 +524,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCrawler_CommonTerms(Boolean crawler) {
setCrawler_CommonTerms(crawler, null);
}
+ @Deprecated
public void setCrawler_CommonTerms(Boolean crawler, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("crawler", crawler);
if (opLambda != null) {
@@ -742,10 +748,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -920,10 +928,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -1142,10 +1152,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCronExpression_CommonTerms(String cronExpression) {
setCronExpression_CommonTerms(cronExpression, null);
}
+ @Deprecated
public void setCronExpression_CommonTerms(String cronExpression, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("cronExpression", cronExpression);
if (opLambda != null) {
@@ -1320,10 +1332,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setJobLogging_CommonTerms(Boolean jobLogging) {
setJobLogging_CommonTerms(jobLogging, null);
}
+ @Deprecated
public void setJobLogging_CommonTerms(Boolean jobLogging, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("jobLogging", jobLogging);
if (opLambda != null) {
@@ -1542,10 +1556,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -1764,10 +1780,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setScriptData_CommonTerms(String scriptData) {
setScriptData_CommonTerms(scriptData, null);
}
+ @Deprecated
public void setScriptData_CommonTerms(String scriptData, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("scriptData", scriptData);
if (opLambda != null) {
@@ -1986,10 +2004,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setScriptType_CommonTerms(String scriptType) {
setScriptType_CommonTerms(scriptType, null);
}
+ @Deprecated
public void setScriptType_CommonTerms(String scriptType, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("scriptType", scriptType);
if (opLambda != null) {
@@ -2164,10 +2184,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -2386,10 +2408,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTarget_CommonTerms(String target) {
setTarget_CommonTerms(target, null);
}
+ @Deprecated
public void setTarget_CommonTerms(String target, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("target", target);
if (opLambda != null) {
@@ -2608,10 +2632,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -2786,10 +2812,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
index 7fbe5519c19166cf302bbaa8565468b12fc0d724..243d59d62b99d609dbe11ac3a578336f44bffd21 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
@@ -175,11 +175,13 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsThumbnailQueueCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsThumbnailQueueCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -786,10 +792,12 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setGenerator_CommonTerms(String generator) {
setGenerator_CommonTerms(generator, null);
}
+ @Deprecated
public void setGenerator_CommonTerms(String generator, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("generator", generator);
if (opLambda != null) {
@@ -1008,10 +1016,12 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPath_CommonTerms(String path) {
setPath_CommonTerms(path, null);
}
+ @Deprecated
public void setPath_CommonTerms(String path, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("path", path);
if (opLambda != null) {
@@ -1230,10 +1240,12 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTarget_CommonTerms(String target) {
setTarget_CommonTerms(target, null);
}
+ @Deprecated
public void setTarget_CommonTerms(String target, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("target", target);
if (opLambda != null) {
@@ -1452,10 +1464,12 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setThumbnailId_CommonTerms(String thumbnailId) {
setThumbnailId_CommonTerms(thumbnailId, null);
}
+ @Deprecated
public void setThumbnailId_CommonTerms(String thumbnailId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("thumbnail_id", thumbnailId);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
index ed768d758ea323ab5ad2f49872cb7554ce6f5017..13b4569048cb2d48094c1d57c733006ef3383288 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
@@ -176,11 +176,13 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsWebAuthenticationCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsWebAuthenticationCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -387,10 +389,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setAuthRealm_CommonTerms(String authRealm) {
setAuthRealm_CommonTerms(authRealm, null);
}
+ @Deprecated
public void setAuthRealm_CommonTerms(String authRealm, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("authRealm", authRealm);
if (opLambda != null) {
@@ -609,10 +613,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -787,10 +793,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -1009,10 +1017,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHostname_CommonTerms(String hostname) {
setHostname_CommonTerms(hostname, null);
}
+ @Deprecated
public void setHostname_CommonTerms(String hostname, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("hostname", hostname);
if (opLambda != null) {
@@ -1231,10 +1241,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setParameters_CommonTerms(String parameters) {
setParameters_CommonTerms(parameters, null);
}
+ @Deprecated
public void setParameters_CommonTerms(String parameters, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("parameters", parameters);
if (opLambda != null) {
@@ -1453,10 +1465,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPassword_CommonTerms(String password) {
setPassword_CommonTerms(password, null);
}
+ @Deprecated
public void setPassword_CommonTerms(String password, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("password", password);
if (opLambda != null) {
@@ -1631,10 +1645,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPort_CommonTerms(Integer port) {
setPort_CommonTerms(port, null);
}
+ @Deprecated
public void setPort_CommonTerms(Integer port, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("port", port);
if (opLambda != null) {
@@ -1853,10 +1869,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setProtocolScheme_CommonTerms(String protocolScheme) {
setProtocolScheme_CommonTerms(protocolScheme, null);
}
+ @Deprecated
public void setProtocolScheme_CommonTerms(String protocolScheme, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("protocolScheme", protocolScheme);
if (opLambda != null) {
@@ -2075,10 +2093,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -2253,10 +2273,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -2475,10 +2497,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUsername_CommonTerms(String username) {
setUsername_CommonTerms(username, null);
}
+ @Deprecated
public void setUsername_CommonTerms(String username, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("username", username);
if (opLambda != null) {
@@ -2697,10 +2721,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setWebConfigId_CommonTerms(String webConfigId) {
setWebConfigId_CommonTerms(webConfigId, null);
}
+ @Deprecated
public void setWebConfigId_CommonTerms(String webConfigId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("webConfigId", webConfigId);
if (opLambda != 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 1a2a174bebd9c6ee76de9a9352a54c18b378bd7b..87a9038b19cec39bd197e512b27917575994affa 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
@@ -174,11 +174,13 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsWebConfigCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsWebConfigCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -341,10 +343,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available) {
setAvailable_CommonTerms(available, null);
}
+ @Deprecated
public void setAvailable_CommonTerms(Boolean available, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("available", available);
if (opLambda != null) {
@@ -519,10 +523,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost) {
setBoost_CommonTerms(boost, null);
}
+ @Deprecated
public void setBoost_CommonTerms(Float boost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("boost", boost);
if (opLambda != null) {
@@ -741,10 +747,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setConfigParameter_CommonTerms(String configParameter) {
setConfigParameter_CommonTerms(configParameter, null);
}
+ @Deprecated
public void setConfigParameter_CommonTerms(String configParameter, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("configParameter", configParameter);
if (opLambda != null) {
@@ -963,10 +971,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy) {
setCreatedBy_CommonTerms(createdBy, null);
}
+ @Deprecated
public void setCreatedBy_CommonTerms(String createdBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdBy", createdBy);
if (opLambda != null) {
@@ -1141,10 +1151,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime) {
setCreatedTime_CommonTerms(createdTime, null);
}
+ @Deprecated
public void setCreatedTime_CommonTerms(Long createdTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdTime", createdTime);
if (opLambda != null) {
@@ -1319,10 +1331,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDepth_CommonTerms(Integer depth) {
setDepth_CommonTerms(depth, null);
}
+ @Deprecated
public void setDepth_CommonTerms(Integer depth, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("depth", depth);
if (opLambda != null) {
@@ -1541,10 +1555,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDescription_CommonTerms(String description) {
setDescription_CommonTerms(description, null);
}
+ @Deprecated
public void setDescription_CommonTerms(String description, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("description", description);
if (opLambda != null) {
@@ -1753,10 +1769,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setExcludedDocUrls_CommonTerms(String excludedDocUrls) {
setExcludedDocUrls_CommonTerms(excludedDocUrls, null);
}
+ @Deprecated
public void setExcludedDocUrls_CommonTerms(String excludedDocUrls, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("excludedDocUrls", excludedDocUrls);
if (opLambda != null) {
@@ -1975,10 +1993,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setExcludedUrls_CommonTerms(String excludedUrls) {
setExcludedUrls_CommonTerms(excludedUrls, null);
}
+ @Deprecated
public void setExcludedUrls_CommonTerms(String excludedUrls, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("excludedUrls", excludedUrls);
if (opLambda != null) {
@@ -2197,10 +2217,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setIncludedDocUrls_CommonTerms(String includedDocUrls) {
setIncludedDocUrls_CommonTerms(includedDocUrls, null);
}
+ @Deprecated
public void setIncludedDocUrls_CommonTerms(String includedDocUrls, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("includedDocUrls", includedDocUrls);
if (opLambda != null) {
@@ -2419,10 +2441,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setIncludedUrls_CommonTerms(String includedUrls) {
setIncludedUrls_CommonTerms(includedUrls, null);
}
+ @Deprecated
public void setIncludedUrls_CommonTerms(String includedUrls, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("includedUrls", includedUrls);
if (opLambda != null) {
@@ -2597,10 +2621,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setIntervalTime_CommonTerms(Integer intervalTime) {
setIntervalTime_CommonTerms(intervalTime, null);
}
+ @Deprecated
public void setIntervalTime_CommonTerms(Integer intervalTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("intervalTime", intervalTime);
if (opLambda != null) {
@@ -2775,10 +2801,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setMaxAccessCount_CommonTerms(Long maxAccessCount) {
setMaxAccessCount_CommonTerms(maxAccessCount, null);
}
+ @Deprecated
public void setMaxAccessCount_CommonTerms(Long maxAccessCount, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("maxAccessCount", maxAccessCount);
if (opLambda != null) {
@@ -2997,10 +3025,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -3175,10 +3205,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setNumOfThread_CommonTerms(Integer numOfThread) {
setNumOfThread_CommonTerms(numOfThread, null);
}
+ @Deprecated
public void setNumOfThread_CommonTerms(Integer numOfThread, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("numOfThread", numOfThread);
if (opLambda != null) {
@@ -3397,10 +3429,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions) {
setPermissions_CommonTerms(permissions, null);
}
+ @Deprecated
public void setPermissions_CommonTerms(String permissions, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("permissions", permissions);
if (opLambda != null) {
@@ -3575,10 +3609,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder) {
setSortOrder_CommonTerms(sortOrder, null);
}
+ @Deprecated
public void setSortOrder_CommonTerms(Integer sortOrder, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("sortOrder", sortOrder);
if (opLambda != null) {
@@ -3753,10 +3789,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTimeToLive_CommonTerms(Integer timeToLive) {
setTimeToLive_CommonTerms(timeToLive, null);
}
+ @Deprecated
public void setTimeToLive_CommonTerms(Integer timeToLive, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("timeToLive", timeToLive);
if (opLambda != null) {
@@ -3975,10 +4013,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy) {
setUpdatedBy_CommonTerms(updatedBy, null);
}
+ @Deprecated
public void setUpdatedBy_CommonTerms(String updatedBy, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedBy", updatedBy);
if (opLambda != null) {
@@ -4153,10 +4193,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime) {
setUpdatedTime_CommonTerms(updatedTime, null);
}
+ @Deprecated
public void setUpdatedTime_CommonTerms(Long updatedTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedTime", updatedTime);
if (opLambda != null) {
@@ -4375,10 +4417,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUrls_CommonTerms(String urls) {
setUrls_CommonTerms(urls, null);
}
+ @Deprecated
public void setUrls_CommonTerms(String urls, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("urls", urls);
if (opLambda != null) {
@@ -4597,10 +4641,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUserAgent_CommonTerms(String userAgent) {
setUserAgent_CommonTerms(userAgent, null);
}
+ @Deprecated
public void setUserAgent_CommonTerms(String userAgent, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("userAgent", userAgent);
if (opLambda != null) {
@@ -4819,10 +4865,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHosts_CommonTerms(String virtualHosts) {
setVirtualHosts_CommonTerms(virtualHosts, null);
}
+ @Deprecated
public void setVirtualHosts_CommonTerms(String virtualHosts, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHosts", virtualHosts);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
index 63cec37832948456550c37208c302977b41336cc..be49953545341338eb99d5c4439e3895d84ae952 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
// ===================================================================================
- // OpenSearch
+ // Elasticsearch
// ======
public RefreshResponse refresh() {
return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
index e54a059e99cd10937302099ad6a573a16a4344b0..3f63e4d864e59b79d9b1136796a5d459d3e76c1e 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
@@ -174,11 +174,13 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsClickLogCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsClickLogCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -385,10 +387,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUrlId_CommonTerms(String urlId) {
setUrlId_CommonTerms(urlId, null);
}
+ @Deprecated
public void setUrlId_CommonTerms(String urlId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("urlId", urlId);
if (opLambda != null) {
@@ -607,10 +611,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDocId_CommonTerms(String docId) {
setDocId_CommonTerms(docId, null);
}
+ @Deprecated
public void setDocId_CommonTerms(String docId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("docId", docId);
if (opLambda != null) {
@@ -785,10 +791,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setOrder_CommonTerms(Integer order) {
setOrder_CommonTerms(order, null);
}
+ @Deprecated
public void setOrder_CommonTerms(Integer order, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("order", order);
if (opLambda != null) {
@@ -1007,10 +1015,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueryId_CommonTerms(String queryId) {
setQueryId_CommonTerms(queryId, null);
}
+ @Deprecated
public void setQueryId_CommonTerms(String queryId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queryId", queryId);
if (opLambda != null) {
@@ -1187,10 +1197,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueryRequestedAt_CommonTerms(LocalDateTime queryRequestedAt) {
setQueryRequestedAt_CommonTerms(queryRequestedAt, null);
}
+ @Deprecated
public void setQueryRequestedAt_CommonTerms(LocalDateTime queryRequestedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queryRequestedAt", queryRequestedAt);
if (opLambda != null) {
@@ -1365,10 +1377,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRequestedAt_CommonTerms(LocalDateTime requestedAt) {
setRequestedAt_CommonTerms(requestedAt, null);
}
+ @Deprecated
public void setRequestedAt_CommonTerms(LocalDateTime requestedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("requestedAt", requestedAt);
if (opLambda != null) {
@@ -1587,10 +1601,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUrl_CommonTerms(String url) {
setUrl_CommonTerms(url, null);
}
+ @Deprecated
public void setUrl_CommonTerms(String url, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("url", url);
if (opLambda != null) {
@@ -1809,10 +1825,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUserSessionId_CommonTerms(String userSessionId) {
setUserSessionId_CommonTerms(userSessionId, null);
}
+ @Deprecated
public void setUserSessionId_CommonTerms(String userSessionId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("userSessionId", userSessionId);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
index f8d6655ec0e0b41215cf833b70699621953eb9c6..ebdaf4bb3c8fc2de6e1db154ebdad4d537d8b58a 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
@@ -175,11 +175,13 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsFavoriteLogCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsFavoriteLogCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -342,10 +344,12 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedAt_CommonTerms(LocalDateTime createdAt) {
setCreatedAt_CommonTerms(createdAt, null);
}
+ @Deprecated
public void setCreatedAt_CommonTerms(LocalDateTime createdAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdAt", createdAt);
if (opLambda != null) {
@@ -564,10 +568,12 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDocId_CommonTerms(String docId) {
setDocId_CommonTerms(docId, null);
}
+ @Deprecated
public void setDocId_CommonTerms(String docId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("docId", docId);
if (opLambda != null) {
@@ -786,10 +792,12 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueryId_CommonTerms(String queryId) {
setQueryId_CommonTerms(queryId, null);
}
+ @Deprecated
public void setQueryId_CommonTerms(String queryId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queryId", queryId);
if (opLambda != null) {
@@ -1008,10 +1016,12 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUrl_CommonTerms(String url) {
setUrl_CommonTerms(url, null);
}
+ @Deprecated
public void setUrl_CommonTerms(String url, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("url", url);
if (opLambda != null) {
@@ -1230,10 +1240,12 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUserInfoId_CommonTerms(String userInfoId) {
setUserInfoId_CommonTerms(userInfoId, null);
}
+ @Deprecated
public void setUserInfoId_CommonTerms(String userInfoId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("userInfoId", userInfoId);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
index 2dc3e98fdb6f578f957dcd52a316f18858dc39b2..7a63cac8076bce0d9e96c22a4de20b98f3f1176f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
@@ -174,11 +174,13 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsSearchLogCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsSearchLogCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -385,10 +387,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setAccessType_CommonTerms(String accessType) {
setAccessType_CommonTerms(accessType, null);
}
+ @Deprecated
public void setAccessType_CommonTerms(String accessType, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("accessType", accessType);
if (opLambda != null) {
@@ -607,10 +611,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setClientIp_CommonTerms(String clientIp) {
setClientIp_CommonTerms(clientIp, null);
}
+ @Deprecated
public void setClientIp_CommonTerms(String clientIp, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("clientIp", clientIp);
if (opLambda != null) {
@@ -785,10 +791,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHitCount_CommonTerms(Long hitCount) {
setHitCount_CommonTerms(hitCount, null);
}
+ @Deprecated
public void setHitCount_CommonTerms(Long hitCount, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("hitCount", hitCount);
if (opLambda != null) {
@@ -1008,10 +1016,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHitCountRelation_CommonTerms(String hitCountRelation) {
setHitCountRelation_CommonTerms(hitCountRelation, null);
}
+ @Deprecated
public void setHitCountRelation_CommonTerms(String hitCountRelation, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("hitCountRelation", hitCountRelation);
if (opLambda != null) {
@@ -1230,10 +1240,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setLanguages_CommonTerms(String languages) {
setLanguages_CommonTerms(languages, null);
}
+ @Deprecated
public void setLanguages_CommonTerms(String languages, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("languages", languages);
if (opLambda != null) {
@@ -1452,10 +1464,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueryId_CommonTerms(String queryId) {
setQueryId_CommonTerms(queryId, null);
}
+ @Deprecated
public void setQueryId_CommonTerms(String queryId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queryId", queryId);
if (opLambda != null) {
@@ -1630,10 +1644,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueryOffset_CommonTerms(Integer queryOffset) {
setQueryOffset_CommonTerms(queryOffset, null);
}
+ @Deprecated
public void setQueryOffset_CommonTerms(Integer queryOffset, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queryOffset", queryOffset);
if (opLambda != null) {
@@ -1808,10 +1824,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueryPageSize_CommonTerms(Integer queryPageSize) {
setQueryPageSize_CommonTerms(queryPageSize, null);
}
+ @Deprecated
public void setQueryPageSize_CommonTerms(Integer queryPageSize, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queryPageSize", queryPageSize);
if (opLambda != null) {
@@ -1986,10 +2004,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setQueryTime_CommonTerms(Long queryTime) {
setQueryTime_CommonTerms(queryTime, null);
}
+ @Deprecated
public void setQueryTime_CommonTerms(Long queryTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("queryTime", queryTime);
if (opLambda != null) {
@@ -2208,10 +2228,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setReferer_CommonTerms(String referer) {
setReferer_CommonTerms(referer, null);
}
+ @Deprecated
public void setReferer_CommonTerms(String referer, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("referer", referer);
if (opLambda != null) {
@@ -2386,10 +2408,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRequestedAt_CommonTerms(LocalDateTime requestedAt) {
setRequestedAt_CommonTerms(requestedAt, null);
}
+ @Deprecated
public void setRequestedAt_CommonTerms(LocalDateTime requestedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("requestedAt", requestedAt);
if (opLambda != null) {
@@ -2564,10 +2588,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setResponseTime_CommonTerms(Long responseTime) {
setResponseTime_CommonTerms(responseTime, null);
}
+ @Deprecated
public void setResponseTime_CommonTerms(Long responseTime, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("responseTime", responseTime);
if (opLambda != null) {
@@ -2786,10 +2812,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRoles_CommonTerms(String roles) {
setRoles_CommonTerms(roles, null);
}
+ @Deprecated
public void setRoles_CommonTerms(String roles, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("roles", roles);
if (opLambda != null) {
@@ -3008,10 +3036,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSearchWord_CommonTerms(String searchWord) {
setSearchWord_CommonTerms(searchWord, null);
}
+ @Deprecated
public void setSearchWord_CommonTerms(String searchWord, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("searchWord", searchWord);
if (opLambda != null) {
@@ -3230,10 +3260,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUser_CommonTerms(String user) {
setUser_CommonTerms(user, null);
}
+ @Deprecated
public void setUser_CommonTerms(String user, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("user", user);
if (opLambda != null) {
@@ -3452,10 +3484,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUserAgent_CommonTerms(String userAgent) {
setUserAgent_CommonTerms(userAgent, null);
}
+ @Deprecated
public void setUserAgent_CommonTerms(String userAgent, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("userAgent", userAgent);
if (opLambda != null) {
@@ -3674,10 +3708,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUserInfoId_CommonTerms(String userInfoId) {
setUserInfoId_CommonTerms(userInfoId, null);
}
+ @Deprecated
public void setUserInfoId_CommonTerms(String userInfoId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("userInfoId", userInfoId);
if (opLambda != null) {
@@ -3896,10 +3932,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUserSessionId_CommonTerms(String userSessionId) {
setUserSessionId_CommonTerms(userSessionId, null);
}
+ @Deprecated
public void setUserSessionId_CommonTerms(String userSessionId, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("userSessionId", userSessionId);
if (opLambda != null) {
@@ -4118,10 +4156,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost) {
setVirtualHost_CommonTerms(virtualHost, null);
}
+ @Deprecated
public void setVirtualHost_CommonTerms(String virtualHost, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("virtualHost", virtualHost);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
index 3d7fec6770103cb0178322307a90757c5f5f37c9..9d955e1b0a2bd27f43cedc5a6ea2aa8afcfdc02e 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
@@ -170,11 +170,13 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsUserInfoCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsUserInfoCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -337,10 +339,12 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCreatedAt_CommonTerms(LocalDateTime createdAt) {
setCreatedAt_CommonTerms(createdAt, null);
}
+ @Deprecated
public void setCreatedAt_CommonTerms(LocalDateTime createdAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("createdAt", createdAt);
if (opLambda != null) {
@@ -515,10 +519,12 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUpdatedAt_CommonTerms(LocalDateTime updatedAt) {
setUpdatedAt_CommonTerms(updatedAt, null);
}
+ @Deprecated
public void setUpdatedAt_CommonTerms(LocalDateTime updatedAt, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("updatedAt", updatedAt);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
index 0e80bb0d545005fb0f0c8423d0264a6468741ea9..42c47344e11350ccac76f418e76b3229cae9414a 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
@@ -89,7 +89,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
protected abstract <RESULT extends ENTITY> RESULT createEntity(Map<String, Object> source, Class<? extends RESULT> entityType);
// ===================================================================================
- // OpenSearch
+ // Elasticsearch
// ======
public RefreshResponse refresh() {
return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
index 4dd6f66596ce1bf3b5c5259e64f083eccfe86c44..f9895f199f98464748e6abc9090f04d39d417545 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
@@ -174,11 +174,13 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsGroupCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsGroupCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -341,10 +343,12 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setGidNumber_CommonTerms(Long gidNumber) {
setGidNumber_CommonTerms(gidNumber, null);
}
+ @Deprecated
public void setGidNumber_CommonTerms(Long gidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("gidNumber", gidNumber);
if (opLambda != null) {
@@ -563,10 +567,12 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
index 3434f77e2be685fd7199331b2566561eda1fc9b7..3bc7a3f699abc8359ffaa40080d9a527e17fb135 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
@@ -174,11 +174,13 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsRoleCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsRoleCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -385,10 +387,12 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
index 35d001acf0e9c467781789c16f750fab5cd524e8..025993f3d965ac00b2056e8f5c341f6b2a3676a4 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
@@ -174,11 +174,13 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
setId_Terms(idList, opLambda);
}
+ @Deprecated
public BsUserCQ addOrderBy_Id_Asc() {
regOBA("_id");
return this;
}
+ @Deprecated
public BsUserCQ addOrderBy_Id_Desc() {
regOBD("_id");
return this;
@@ -386,10 +388,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setBusinessCategory_CommonTerms(String businessCategory) {
setBusinessCategory_CommonTerms(businessCategory, null);
}
+ @Deprecated
public void setBusinessCategory_CommonTerms(String businessCategory, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("businessCategory", businessCategory);
if (opLambda != null) {
@@ -608,10 +612,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCarLicense_CommonTerms(String carLicense) {
setCarLicense_CommonTerms(carLicense, null);
}
+ @Deprecated
public void setCarLicense_CommonTerms(String carLicense, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("carLicense", carLicense);
if (opLambda != null) {
@@ -830,10 +836,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setCity_CommonTerms(String city) {
setCity_CommonTerms(city, null);
}
+ @Deprecated
public void setCity_CommonTerms(String city, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("city", city);
if (opLambda != null) {
@@ -1053,10 +1061,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDepartmentNumber_CommonTerms(String departmentNumber) {
setDepartmentNumber_CommonTerms(departmentNumber, null);
}
+ @Deprecated
public void setDepartmentNumber_CommonTerms(String departmentNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("departmentNumber", departmentNumber);
if (opLambda != null) {
@@ -1275,10 +1285,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDescription_CommonTerms(String description) {
setDescription_CommonTerms(description, null);
}
+ @Deprecated
public void setDescription_CommonTerms(String description, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("description", description);
if (opLambda != null) {
@@ -1500,10 +1512,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDestinationIndicator_CommonTerms(String destinationIndicator) {
setDestinationIndicator_CommonTerms(destinationIndicator, null);
}
+ @Deprecated
public void setDestinationIndicator_CommonTerms(String destinationIndicator, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("destinationIndicator", destinationIndicator);
if (opLambda != null) {
@@ -1722,10 +1736,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setDisplayName_CommonTerms(String displayName) {
setDisplayName_CommonTerms(displayName, null);
}
+ @Deprecated
public void setDisplayName_CommonTerms(String displayName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("displayName", displayName);
if (opLambda != null) {
@@ -1944,10 +1960,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setEmployeeNumber_CommonTerms(String employeeNumber) {
setEmployeeNumber_CommonTerms(employeeNumber, null);
}
+ @Deprecated
public void setEmployeeNumber_CommonTerms(String employeeNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("employeeNumber", employeeNumber);
if (opLambda != null) {
@@ -2166,10 +2184,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setEmployeeType_CommonTerms(String employeeType) {
setEmployeeType_CommonTerms(employeeType, null);
}
+ @Deprecated
public void setEmployeeType_CommonTerms(String employeeType, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("employeeType", employeeType);
if (opLambda != null) {
@@ -2392,10 +2412,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setFacsimileTelephoneNumber_CommonTerms(String facsimileTelephoneNumber) {
setFacsimileTelephoneNumber_CommonTerms(facsimileTelephoneNumber, null);
}
+ @Deprecated
public void setFacsimileTelephoneNumber_CommonTerms(String facsimileTelephoneNumber,
ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
@@ -2571,10 +2593,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setGidNumber_CommonTerms(Long gidNumber) {
setGidNumber_CommonTerms(gidNumber, null);
}
+ @Deprecated
public void setGidNumber_CommonTerms(Long gidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("gidNumber", gidNumber);
if (opLambda != null) {
@@ -2793,10 +2817,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setGivenName_CommonTerms(String givenName) {
setGivenName_CommonTerms(givenName, null);
}
+ @Deprecated
public void setGivenName_CommonTerms(String givenName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("givenName", givenName);
if (opLambda != null) {
@@ -3015,10 +3041,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setGroups_CommonTerms(String groups) {
setGroups_CommonTerms(groups, null);
}
+ @Deprecated
public void setGroups_CommonTerms(String groups, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("groups", groups);
if (opLambda != null) {
@@ -3237,10 +3265,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHomeDirectory_CommonTerms(String homeDirectory) {
setHomeDirectory_CommonTerms(homeDirectory, null);
}
+ @Deprecated
public void setHomeDirectory_CommonTerms(String homeDirectory, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("homeDirectory", homeDirectory);
if (opLambda != null) {
@@ -3459,10 +3489,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHomePhone_CommonTerms(String homePhone) {
setHomePhone_CommonTerms(homePhone, null);
}
+ @Deprecated
public void setHomePhone_CommonTerms(String homePhone, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("homePhone", homePhone);
if (opLambda != null) {
@@ -3682,10 +3714,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setHomePostalAddress_CommonTerms(String homePostalAddress) {
setHomePostalAddress_CommonTerms(homePostalAddress, null);
}
+ @Deprecated
public void setHomePostalAddress_CommonTerms(String homePostalAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("homePostalAddress", homePostalAddress);
if (opLambda != null) {
@@ -3904,10 +3938,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setInitials_CommonTerms(String initials) {
setInitials_CommonTerms(initials, null);
}
+ @Deprecated
public void setInitials_CommonTerms(String initials, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("initials", initials);
if (opLambda != null) {
@@ -4130,10 +4166,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setInternationaliSDNNumber_CommonTerms(String internationaliSDNNumber) {
setInternationaliSDNNumber_CommonTerms(internationaliSDNNumber, null);
}
+ @Deprecated
public void setInternationaliSDNNumber_CommonTerms(String internationaliSDNNumber,
ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("internationaliSDNNumber", internationaliSDNNumber);
@@ -4353,10 +4391,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setLabeledURI_CommonTerms(String labeledURI) {
setLabeledURI_CommonTerms(labeledURI, null);
}
+ @Deprecated
public void setLabeledURI_CommonTerms(String labeledURI, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("labeledURI", labeledURI);
if (opLambda != null) {
@@ -4575,10 +4615,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setMail_CommonTerms(String mail) {
setMail_CommonTerms(mail, null);
}
+ @Deprecated
public void setMail_CommonTerms(String mail, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("mail", mail);
if (opLambda != null) {
@@ -4797,10 +4839,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setMobile_CommonTerms(String mobile) {
setMobile_CommonTerms(mobile, null);
}
+ @Deprecated
public void setMobile_CommonTerms(String mobile, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("mobile", mobile);
if (opLambda != null) {
@@ -5019,10 +5063,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setName_CommonTerms(String name) {
setName_CommonTerms(name, null);
}
+ @Deprecated
public void setName_CommonTerms(String name, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("name", name);
if (opLambda != null) {
@@ -5241,10 +5287,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPager_CommonTerms(String pager) {
setPager_CommonTerms(pager, null);
}
+ @Deprecated
public void setPager_CommonTerms(String pager, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("pager", pager);
if (opLambda != null) {
@@ -5463,10 +5511,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPassword_CommonTerms(String password) {
setPassword_CommonTerms(password, null);
}
+ @Deprecated
public void setPassword_CommonTerms(String password, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("password", password);
if (opLambda != null) {
@@ -5694,10 +5744,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPhysicalDeliveryOfficeName_CommonTerms(String physicalDeliveryOfficeName) {
setPhysicalDeliveryOfficeName_CommonTerms(physicalDeliveryOfficeName, null);
}
+ @Deprecated
public void setPhysicalDeliveryOfficeName_CommonTerms(String physicalDeliveryOfficeName,
ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
@@ -5917,10 +5969,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPostOfficeBox_CommonTerms(String postOfficeBox) {
setPostOfficeBox_CommonTerms(postOfficeBox, null);
}
+ @Deprecated
public void setPostOfficeBox_CommonTerms(String postOfficeBox, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("postOfficeBox", postOfficeBox);
if (opLambda != null) {
@@ -6139,10 +6193,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPostalAddress_CommonTerms(String postalAddress) {
setPostalAddress_CommonTerms(postalAddress, null);
}
+ @Deprecated
public void setPostalAddress_CommonTerms(String postalAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("postalAddress", postalAddress);
if (opLambda != null) {
@@ -6361,10 +6417,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPostalCode_CommonTerms(String postalCode) {
setPostalCode_CommonTerms(postalCode, null);
}
+ @Deprecated
public void setPostalCode_CommonTerms(String postalCode, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("postalCode", postalCode);
if (opLambda != null) {
@@ -6584,10 +6642,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setPreferredLanguage_CommonTerms(String preferredLanguage) {
setPreferredLanguage_CommonTerms(preferredLanguage, null);
}
+ @Deprecated
public void setPreferredLanguage_CommonTerms(String preferredLanguage, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("preferredLanguage", preferredLanguage);
if (opLambda != null) {
@@ -6807,10 +6867,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRegisteredAddress_CommonTerms(String registeredAddress) {
setRegisteredAddress_CommonTerms(registeredAddress, null);
}
+ @Deprecated
public void setRegisteredAddress_CommonTerms(String registeredAddress, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("registeredAddress", registeredAddress);
if (opLambda != null) {
@@ -7029,10 +7091,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRoles_CommonTerms(String roles) {
setRoles_CommonTerms(roles, null);
}
+ @Deprecated
public void setRoles_CommonTerms(String roles, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("roles", roles);
if (opLambda != null) {
@@ -7251,10 +7315,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setRoomNumber_CommonTerms(String roomNumber) {
setRoomNumber_CommonTerms(roomNumber, null);
}
+ @Deprecated
public void setRoomNumber_CommonTerms(String roomNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("roomNumber", roomNumber);
if (opLambda != null) {
@@ -7473,10 +7539,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setState_CommonTerms(String state) {
setState_CommonTerms(state, null);
}
+ @Deprecated
public void setState_CommonTerms(String state, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("state", state);
if (opLambda != null) {
@@ -7695,10 +7763,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setStreet_CommonTerms(String street) {
setStreet_CommonTerms(street, null);
}
+ @Deprecated
public void setStreet_CommonTerms(String street, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("street", street);
if (opLambda != null) {
@@ -7917,10 +7987,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setSurname_CommonTerms(String surname) {
setSurname_CommonTerms(surname, null);
}
+ @Deprecated
public void setSurname_CommonTerms(String surname, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("surname", surname);
if (opLambda != null) {
@@ -8139,10 +8211,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTelephoneNumber_CommonTerms(String telephoneNumber) {
setTelephoneNumber_CommonTerms(telephoneNumber, null);
}
+ @Deprecated
public void setTelephoneNumber_CommonTerms(String telephoneNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("telephoneNumber", telephoneNumber);
if (opLambda != null) {
@@ -8369,10 +8443,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTeletexTerminalIdentifier_CommonTerms(String teletexTerminalIdentifier) {
setTeletexTerminalIdentifier_CommonTerms(teletexTerminalIdentifier, null);
}
+ @Deprecated
public void setTeletexTerminalIdentifier_CommonTerms(String teletexTerminalIdentifier,
ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
@@ -8592,10 +8668,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setTitle_CommonTerms(String title) {
setTitle_CommonTerms(title, null);
}
+ @Deprecated
public void setTitle_CommonTerms(String title, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("title", title);
if (opLambda != null) {
@@ -8770,10 +8848,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setUidNumber_CommonTerms(Long uidNumber) {
setUidNumber_CommonTerms(uidNumber, null);
}
+ @Deprecated
public void setUidNumber_CommonTerms(Long uidNumber, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("uidNumber", uidNumber);
if (opLambda != null) {
@@ -8992,10 +9072,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
}
}
+ @Deprecated
public void setX121Address_CommonTerms(String x121Address) {
setX121Address_CommonTerms(x121Address, null);
}
+ @Deprecated
public void setX121Address_CommonTerms(String x121Address, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
CommonTermsQueryBuilder builder = regCommonTermsQ("x121Address", x121Address);
if (opLambda != null) {
diff --git a/src/main/java/org/codelibs/fess/helper/CurlHelper.java b/src/main/java/org/codelibs/fess/helper/CurlHelper.java
index 8cc995b405fe9746d850a315b190a2c6d2417a93..e649db4c11c39ee2571a176543ba4257be38b5a9 100644
--- a/src/main/java/org/codelibs/fess/helper/CurlHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CurlHelper.java
@@ -44,7 +44,7 @@ public class CurlHelper {
@PostConstruct
public void init() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- final String authorities = fessConfig.getOpenSearchHttpSslCertificateAuthorities();
+ final String authorities = fessConfig.getElasticsearchHttpSslCertificateAuthorities();
if (StringUtil.isNotBlank(authorities)) {
if (logger.isDebugEnabled()) {
logger.debug("Loading certificate_authorities: {}", authorities);
@@ -87,8 +87,8 @@ public class CurlHelper {
public CurlRequest request(final Method method, final String path) {
final CurlRequest request = new CurlRequest(method, ResourceUtil.getFesenHttpUrl() + path);
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- final String username = fessConfig.getOpenSearchUsername();
- final String password = fessConfig.getOpenSearchPassword();
+ final String username = fessConfig.getElasticsearchUsername();
+ final String password = fessConfig.getElasticsearchPassword();
if (StringUtil.isNotBlank(username) && StringUtil.isNotBlank(password)) {
final String value = username + ":" + password;
final String basicAuth = "Basic " + java.util.Base64.getEncoder().encodeToString(value.getBytes(StandardCharsets.UTF_8));
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index 576d5d96108769320529fd589f236c5c9e51a9c3..bd48921a2030a593535fadf5f251b2a5570f3538 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -1751,24 +1751,24 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'elasticsearch.type'. <br>
* The value is, e.g. default <br>
- * comment: OpenSearch
+ * comment: Elasticsearch
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getFesenType();
+ String getElasticsearchType();
/**
* Get the value for the key 'elasticsearch.http.url'. <br>
* The value is, e.g. http://localhost:9201 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getOpenSearchHttpUrl();
+ String getElasticsearchHttpUrl();
/**
* Get the value for the key 'elasticsearch.http.ssl.certificate_authorities'. <br>
* The value is, e.g. <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getOpenSearchHttpSslCertificateAuthorities();
+ String getElasticsearchHttpSslCertificateAuthorities();
/**
* Get the value for the key 'elasticsearch.http.ssl.certificate_authorities' as {@link Integer}. <br>
@@ -1776,14 +1776,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
*/
- Integer getOpenSearchHttpSslCertificateAuthoritiesAsInteger();
+ Integer getElasticsearchHttpSslCertificateAuthoritiesAsInteger();
/**
* Get the value for the key 'elasticsearch.username'. <br>
* The value is, e.g. <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getOpenSearchUsername();
+ String getElasticsearchUsername();
/**
* Get the value for the key 'elasticsearch.username' as {@link Integer}. <br>
@@ -1791,14 +1791,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
*/
- Integer getOpenSearchUsernameAsInteger();
+ Integer getElasticsearchUsernameAsInteger();
/**
* Get the value for the key 'elasticsearch.password'. <br>
* The value is, e.g. <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getOpenSearchPassword();
+ String getElasticsearchPassword();
/**
* Get the value for the key 'elasticsearch.password' as {@link Integer}. <br>
@@ -1806,7 +1806,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
* @return The value of found property. (NotNull: if not found, exception but basically no way)
* @throws NumberFormatException When the property is not integer.
*/
- Integer getOpenSearchPasswordAsInteger();
+ Integer getElasticsearchPasswordAsInteger();
/**
* Get the value for the key 'app.cipher.algorism'. <br>
@@ -7232,35 +7232,35 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.DOMAIN_TITLE);
}
- public String getFesenType() {
+ public String getElasticsearchType() {
return get(FessConfig.ELASTICSEARCH_TYPE);
}
- public String getOpenSearchHttpUrl() {
+ public String getElasticsearchHttpUrl() {
return get(FessConfig.ELASTICSEARCH_HTTP_URL);
}
- public String getOpenSearchHttpSslCertificateAuthorities() {
+ public String getElasticsearchHttpSslCertificateAuthorities() {
return get(FessConfig.ELASTICSEARCH_HTTP_SSL_certificate_authorities);
}
- public Integer getOpenSearchHttpSslCertificateAuthoritiesAsInteger() {
+ public Integer getElasticsearchHttpSslCertificateAuthoritiesAsInteger() {
return getAsInteger(FessConfig.ELASTICSEARCH_HTTP_SSL_certificate_authorities);
}
- public String getOpenSearchUsername() {
+ public String getElasticsearchUsername() {
return get(FessConfig.ELASTICSEARCH_USERNAME);
}
- public Integer getOpenSearchUsernameAsInteger() {
+ public Integer getElasticsearchUsernameAsInteger() {
return getAsInteger(FessConfig.ELASTICSEARCH_USERNAME);
}
- public String getOpenSearchPassword() {
+ public String getElasticsearchPassword() {
return get(FessConfig.ELASTICSEARCH_PASSWORD);
}
- public Integer getOpenSearchPasswordAsInteger() {
+ public Integer getElasticsearchPasswordAsInteger() {
return getAsInteger(FessConfig.ELASTICSEARCH_PASSWORD);
}
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
index 0f818cf8256f785b8ad35712a9addb173d72455d..5d7aeaebed5447efc2158f01b27b3b69d53a5805 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
@@ -2101,5 +2101,9 @@ public interface FessProp {
.get(stream -> stream.map(String::trim).filter(StringUtil::isNotEmpty).anyMatch(s -> s.equals(password)));
}
- String getFesenType();
+ String getElasticsearchType();
+
+ default String getFesenType() {
+ return getElasticsearchType();
+ }
}
diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
index 9dd35445b6dc6278c6f167aaedc46cce3bb9feda..3764d0a6c25a67de337f907efac29df975f6e6c6 100644
--- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
@@ -48,7 +48,7 @@ public class ResourceUtil {
return url;
}
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return fessConfig.getOpenSearchHttpUrl();
+ return fessConfig.getElasticsearchHttpUrl();
}
public static String getAppType() {