esflute update
This commit is contained in:
parent
f698b896a4
commit
7e9c956661
43 changed files with 111 additions and 81 deletions
|
@ -139,7 +139,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
|
|||
esCb.request().build(builder);
|
||||
final SearchResponse response = esCb.build(builder).execute().actionGet(searchTimeout);
|
||||
|
||||
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>();
|
||||
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
|
||||
final SearchHits searchHits = response.getHits();
|
||||
searchHits.forEach(hit -> {
|
||||
final Map<String, Object> source = hit.getSource();
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
package org.codelibs.fess.es.config.allcommon;
|
||||
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.elasticsearch.action.search.SearchRequestBuilder;
|
||||
|
||||
/**
|
||||
* @param <ENTITY> The type of entity.
|
||||
|
@ -29,6 +30,15 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
|
|||
private int totalShards;
|
||||
private int successfulShards;
|
||||
private int failedShards;
|
||||
private SearchRequestBuilder builder;
|
||||
|
||||
public EsPagingResultBean(final SearchRequestBuilder builder) {
|
||||
this.builder = builder;
|
||||
}
|
||||
|
||||
public String getQueryDsl() {
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
public long getTook() {
|
||||
return took;
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsAccessTokenCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsAccessTokenCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -897,7 +897,7 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public void setParameterName_Wildcard(String parameterName, ConditionOptionCall<WildcardQueryBuilder> opLambda) {
|
||||
WildcardQueryBuilder builder = regWildcardQ("parameterName", parameterName);
|
||||
WildcardQueryBuilder builder = regWildcardQ("parameter_name", parameterName);
|
||||
if (opLambda != null) {
|
||||
opLambda.callback(builder);
|
||||
}
|
||||
|
@ -908,7 +908,7 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public void setParameterName_Regexp(String parameterName, ConditionOptionCall<RegexpQueryBuilder> opLambda) {
|
||||
RegexpQueryBuilder builder = regRegexpQ("parameterName", parameterName);
|
||||
RegexpQueryBuilder builder = regRegexpQ("parameter_name", parameterName);
|
||||
if (opLambda != null) {
|
||||
opLambda.callback(builder);
|
||||
}
|
||||
|
@ -963,7 +963,7 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public void setParameterName_Exists(ConditionOptionCall<ExistsQueryBuilder> opLambda) {
|
||||
ExistsQueryBuilder builder = regExistsQ("parameterName");
|
||||
ExistsQueryBuilder builder = regExistsQ("parameter_name");
|
||||
if (opLambda != null) {
|
||||
opLambda.callback(builder);
|
||||
}
|
||||
|
@ -974,7 +974,7 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public void setParameterName_CommonTerms(String parameterName, ConditionOptionCall<CommonTermsQueryBuilder> opLambda) {
|
||||
CommonTermsQueryBuilder builder = regCommonTermsQ("parameterName", parameterName);
|
||||
CommonTermsQueryBuilder builder = regCommonTermsQ("parameter_name", parameterName);
|
||||
if (opLambda != null) {
|
||||
opLambda.callback(builder);
|
||||
}
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsBadWordCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsBadWordCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -154,12 +154,12 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsBoostDocumentRuleCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsBoostDocumentRuleCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsCrawlingInfoCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsCrawlingInfoCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -154,12 +154,12 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsCrawlingInfoParamCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsCrawlingInfoParamCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsDataConfigCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsDataConfigCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -154,12 +154,12 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsDataConfigToLabelCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsDataConfigToLabelCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsDataConfigToRoleCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsDataConfigToRoleCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsDuplicateHostCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsDuplicateHostCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsElevateWordCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsElevateWordCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -154,12 +154,12 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsElevateWordToLabelCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsElevateWordToLabelCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsFailureUrlCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsFailureUrlCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -154,12 +154,12 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsFileAuthenticationCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsFileAuthenticationCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsFileConfigCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsFileConfigCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -154,12 +154,12 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsFileConfigToLabelCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsFileConfigToLabelCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsFileConfigToRoleCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsFileConfigToRoleCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsJobLogCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsJobLogCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsKeyMatchCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsKeyMatchCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsLabelToRoleCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsLabelToRoleCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsLabelTypeCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsLabelTypeCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsPathMappingCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsPathMappingCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsRequestHeaderCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsRequestHeaderCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsRoleTypeCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsRoleTypeCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsScheduledJobCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsScheduledJobCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsThumbnailQueueCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsThumbnailQueueCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -154,12 +154,12 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsWebAuthenticationCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsWebAuthenticationCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsWebConfigCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsWebConfigCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsWebConfigToLabelCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsWebConfigToLabelCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsWebConfigToRoleCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsWebConfigToRoleCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
|
|||
esCb.request().build(builder);
|
||||
final SearchResponse response = esCb.build(builder).execute().actionGet(searchTimeout);
|
||||
|
||||
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>();
|
||||
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
|
||||
final SearchHits searchHits = response.getHits();
|
||||
searchHits.forEach(hit -> {
|
||||
final Map<String, Object> source = hit.getSource();
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
package org.codelibs.fess.es.log.allcommon;
|
||||
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.elasticsearch.action.search.SearchRequestBuilder;
|
||||
|
||||
/**
|
||||
* @param <ENTITY> The type of entity.
|
||||
|
@ -29,6 +30,15 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
|
|||
private int totalShards;
|
||||
private int successfulShards;
|
||||
private int failedShards;
|
||||
private SearchRequestBuilder builder;
|
||||
|
||||
public EsPagingResultBean(final SearchRequestBuilder builder) {
|
||||
this.builder = builder;
|
||||
}
|
||||
|
||||
public String getQueryDsl() {
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
public long getTook() {
|
||||
return took;
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsClickLogCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsClickLogCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsFavoriteLogCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsFavoriteLogCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsSearchFieldLogCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsSearchFieldLogCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsSearchLogCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsSearchLogCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -150,12 +150,12 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsUserInfoCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsUserInfoCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -139,7 +139,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
|
|||
esCb.request().build(builder);
|
||||
final SearchResponse response = esCb.build(builder).execute().actionGet(searchTimeout);
|
||||
|
||||
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>();
|
||||
final EsPagingResultBean<RESULT> list = new EsPagingResultBean<>(builder);
|
||||
final SearchHits searchHits = response.getHits();
|
||||
searchHits.forEach(hit -> {
|
||||
final Map<String, Object> source = hit.getSource();
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
package org.codelibs.fess.es.user.allcommon;
|
||||
|
||||
import org.dbflute.cbean.result.PagingResultBean;
|
||||
import org.elasticsearch.action.search.SearchRequestBuilder;
|
||||
|
||||
/**
|
||||
* @param <ENTITY> The type of entity.
|
||||
|
@ -29,6 +30,15 @@ public class EsPagingResultBean<ENTITY> extends PagingResultBean<ENTITY> {
|
|||
private int totalShards;
|
||||
private int successfulShards;
|
||||
private int failedShards;
|
||||
private SearchRequestBuilder builder;
|
||||
|
||||
public EsPagingResultBean(final SearchRequestBuilder builder) {
|
||||
this.builder = builder;
|
||||
}
|
||||
|
||||
public String getQueryDsl() {
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
public long getTook() {
|
||||
return took;
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsGroupCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsGroupCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsRoleCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsRoleCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
|
@ -153,12 +153,12 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
|
|||
}
|
||||
|
||||
public BsUserCQ addOrderBy_Id_Asc() {
|
||||
regOBA("_id");
|
||||
regOBA("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
public BsUserCQ addOrderBy_Id_Desc() {
|
||||
regOBD("_id");
|
||||
regOBD("_uid");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue