From de36272e570c29f0dbf82f36990ec5da14f53409 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Sat, 23 Jan 2021 17:08:55 +0900
Subject: [PATCH] fix #2517 replace elasticsearch with fesen
---
plugin.xml | 14 +-
pom.xml | 36 ++--
.../fess/api/json/JsonApiManager.java | 2 +-
.../fess/app/service/SearchLogService.java | 14 +-
.../maintenance/AdminMaintenanceAction.java | 10 +-
.../searchlist/AdminSearchlistAction.java | 4 +-
.../web/admin/upgrade/AdminUpgradeAction.java | 2 +-
.../searchlist/ApiAdminSearchlistAction.java | 4 +-
.../codelibs/fess/dict/DictionaryManager.java | 2 +-
.../FileListIndexUpdateCallbackImpl.java | 2 +-
.../org/codelibs/fess/entity/FacetInfo.java | 2 +-
.../org/codelibs/fess/entity/GeoInfo.java | 6 +-
.../codelibs/fess/entity/PingResponse.java | 6 +-
.../codelibs/fess/entity/QueryContext.java | 12 +-
.../codelibs/fess/es/client/FessEsClient.java | 202 +++++++++---------
.../config/allcommon/EsAbstractBehavior.java | 36 ++--
.../EsAbstractConditionAggregation.java | 52 ++---
.../allcommon/EsAbstractConditionBean.java | 4 +-
.../allcommon/EsAbstractConditionQuery.java | 52 ++---
.../es/config/allcommon/EsAbstractEntity.java | 4 +-
.../config/allcommon/EsPagingResultBean.java | 4 +-
.../es/config/bsbhv/BsAccessTokenBhv.java | 6 +-
.../fess/es/config/bsbhv/BsBadWordBhv.java | 6 +-
.../config/bsbhv/BsBoostDocumentRuleBhv.java | 6 +-
.../es/config/bsbhv/BsCrawlingInfoBhv.java | 6 +-
.../config/bsbhv/BsCrawlingInfoParamBhv.java | 6 +-
.../fess/es/config/bsbhv/BsDataConfigBhv.java | 6 +-
.../es/config/bsbhv/BsDuplicateHostBhv.java | 6 +-
.../es/config/bsbhv/BsElevateWordBhv.java | 6 +-
.../config/bsbhv/BsElevateWordToLabelBhv.java | 6 +-
.../fess/es/config/bsbhv/BsFailureUrlBhv.java | 6 +-
.../config/bsbhv/BsFileAuthenticationBhv.java | 6 +-
.../fess/es/config/bsbhv/BsFileConfigBhv.java | 6 +-
.../fess/es/config/bsbhv/BsJobLogBhv.java | 6 +-
.../fess/es/config/bsbhv/BsKeyMatchBhv.java | 6 +-
.../fess/es/config/bsbhv/BsLabelTypeBhv.java | 6 +-
.../es/config/bsbhv/BsPathMappingBhv.java | 6 +-
.../es/config/bsbhv/BsRelatedContentBhv.java | 6 +-
.../es/config/bsbhv/BsRelatedQueryBhv.java | 6 +-
.../es/config/bsbhv/BsRequestHeaderBhv.java | 6 +-
.../fess/es/config/bsbhv/BsRoleTypeBhv.java | 6 +-
.../es/config/bsbhv/BsScheduledJobBhv.java | 6 +-
.../es/config/bsbhv/BsThumbnailQueueBhv.java | 6 +-
.../config/bsbhv/BsWebAuthenticationBhv.java | 6 +-
.../fess/es/config/bsbhv/BsWebConfigBhv.java | 6 +-
.../es/config/cbean/bs/BsAccessTokenCB.java | 4 +-
.../fess/es/config/cbean/bs/BsBadWordCB.java | 4 +-
.../cbean/bs/BsBoostDocumentRuleCB.java | 4 +-
.../es/config/cbean/bs/BsCrawlingInfoCB.java | 4 +-
.../cbean/bs/BsCrawlingInfoParamCB.java | 4 +-
.../es/config/cbean/bs/BsDataConfigCB.java | 4 +-
.../es/config/cbean/bs/BsDuplicateHostCB.java | 4 +-
.../es/config/cbean/bs/BsElevateWordCB.java | 4 +-
.../cbean/bs/BsElevateWordToLabelCB.java | 4 +-
.../es/config/cbean/bs/BsFailureUrlCB.java | 4 +-
.../cbean/bs/BsFileAuthenticationCB.java | 4 +-
.../es/config/cbean/bs/BsFileConfigCB.java | 4 +-
.../fess/es/config/cbean/bs/BsJobLogCB.java | 4 +-
.../fess/es/config/cbean/bs/BsKeyMatchCB.java | 4 +-
.../es/config/cbean/bs/BsLabelTypeCB.java | 4 +-
.../es/config/cbean/bs/BsPathMappingCB.java | 4 +-
.../config/cbean/bs/BsRelatedContentCB.java | 4 +-
.../es/config/cbean/bs/BsRelatedQueryCB.java | 4 +-
.../es/config/cbean/bs/BsRequestHeaderCB.java | 4 +-
.../fess/es/config/cbean/bs/BsRoleTypeCB.java | 4 +-
.../es/config/cbean/bs/BsScheduledJobCB.java | 4 +-
.../config/cbean/bs/BsThumbnailQueueCB.java | 4 +-
.../cbean/bs/BsWebAuthenticationCB.java | 4 +-
.../es/config/cbean/bs/BsWebConfigCB.java | 4 +-
.../config/cbean/ca/bs/BsAccessTokenCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsBadWordCA.java | 42 ++--
.../cbean/ca/bs/BsBoostDocumentRuleCA.java | 42 ++--
.../config/cbean/ca/bs/BsCrawlingInfoCA.java | 42 ++--
.../cbean/ca/bs/BsCrawlingInfoParamCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsDataConfigCA.java | 42 ++--
.../config/cbean/ca/bs/BsDuplicateHostCA.java | 42 ++--
.../config/cbean/ca/bs/BsElevateWordCA.java | 42 ++--
.../cbean/ca/bs/BsElevateWordToLabelCA.java | 22 +-
.../es/config/cbean/ca/bs/BsFailureUrlCA.java | 42 ++--
.../cbean/ca/bs/BsFileAuthenticationCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsFileConfigCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsJobLogCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsKeyMatchCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsLabelTypeCA.java | 42 ++--
.../config/cbean/ca/bs/BsPathMappingCA.java | 42 ++--
.../cbean/ca/bs/BsRelatedContentCA.java | 42 ++--
.../config/cbean/ca/bs/BsRelatedQueryCA.java | 42 ++--
.../config/cbean/ca/bs/BsRequestHeaderCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsRoleTypeCA.java | 42 ++--
.../config/cbean/ca/bs/BsScheduledJobCA.java | 42 ++--
.../cbean/ca/bs/BsThumbnailQueueCA.java | 42 ++--
.../cbean/ca/bs/BsWebAuthenticationCA.java | 42 ++--
.../es/config/cbean/ca/bs/BsWebConfigCA.java | 42 ++--
.../config/cbean/cq/bs/BsAccessTokenCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsBadWordCQ.java | 32 +--
.../cbean/cq/bs/BsBoostDocumentRuleCQ.java | 32 +--
.../config/cbean/cq/bs/BsCrawlingInfoCQ.java | 32 +--
.../cbean/cq/bs/BsCrawlingInfoParamCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsDataConfigCQ.java | 32 +--
.../config/cbean/cq/bs/BsDuplicateHostCQ.java | 32 +--
.../config/cbean/cq/bs/BsElevateWordCQ.java | 32 +--
.../cbean/cq/bs/BsElevateWordToLabelCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsFailureUrlCQ.java | 32 +--
.../cbean/cq/bs/BsFileAuthenticationCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsFileConfigCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsJobLogCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsKeyMatchCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsLabelTypeCQ.java | 32 +--
.../config/cbean/cq/bs/BsPathMappingCQ.java | 32 +--
.../cbean/cq/bs/BsRelatedContentCQ.java | 32 +--
.../config/cbean/cq/bs/BsRelatedQueryCQ.java | 32 +--
.../config/cbean/cq/bs/BsRequestHeaderCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsRoleTypeCQ.java | 32 +--
.../config/cbean/cq/bs/BsScheduledJobCQ.java | 32 +--
.../cbean/cq/bs/BsThumbnailQueueCQ.java | 32 +--
.../cbean/cq/bs/BsWebAuthenticationCQ.java | 32 +--
.../es/config/cbean/cq/bs/BsWebConfigCQ.java | 32 +--
.../es/log/allcommon/EsAbstractBehavior.java | 36 ++--
.../EsAbstractConditionAggregation.java | 52 ++---
.../allcommon/EsAbstractConditionBean.java | 4 +-
.../allcommon/EsAbstractConditionQuery.java | 52 ++---
.../es/log/allcommon/EsAbstractEntity.java | 4 +-
.../es/log/allcommon/EsPagingResultBean.java | 4 +-
.../fess/es/log/bsbhv/BsClickLogBhv.java | 6 +-
.../fess/es/log/bsbhv/BsFavoriteLogBhv.java | 6 +-
.../fess/es/log/bsbhv/BsSearchLogBhv.java | 6 +-
.../fess/es/log/bsbhv/BsUserInfoBhv.java | 6 +-
.../fess/es/log/cbean/bs/BsClickLogCB.java | 4 +-
.../fess/es/log/cbean/bs/BsFavoriteLogCB.java | 4 +-
.../fess/es/log/cbean/bs/BsSearchLogCB.java | 4 +-
.../fess/es/log/cbean/bs/BsUserInfoCB.java | 4 +-
.../fess/es/log/cbean/ca/bs/BsClickLogCA.java | 46 ++--
.../es/log/cbean/ca/bs/BsFavoriteLogCA.java | 26 +--
.../es/log/cbean/ca/bs/BsSearchLogCA.java | 46 ++--
.../fess/es/log/cbean/ca/bs/BsUserInfoCA.java | 20 +-
.../fess/es/log/cbean/cq/bs/BsClickLogCQ.java | 32 +--
.../es/log/cbean/cq/bs/BsFavoriteLogCQ.java | 32 +--
.../es/log/cbean/cq/bs/BsSearchLogCQ.java | 32 +--
.../fess/es/log/cbean/cq/bs/BsUserInfoCQ.java | 24 +--
.../fess/es/query/StoredLtrQueryBuilder.java | 18 +-
.../es/user/allcommon/EsAbstractBehavior.java | 36 ++--
.../EsAbstractConditionAggregation.java | 52 ++---
.../allcommon/EsAbstractConditionBean.java | 4 +-
.../allcommon/EsAbstractConditionQuery.java | 52 ++---
.../es/user/allcommon/EsAbstractEntity.java | 4 +-
.../es/user/allcommon/EsPagingResultBean.java | 4 +-
.../fess/es/user/bsbhv/BsGroupBhv.java | 6 +-
.../fess/es/user/bsbhv/BsRoleBhv.java | 6 +-
.../fess/es/user/bsbhv/BsUserBhv.java | 6 +-
.../fess/es/user/cbean/bs/BsGroupCB.java | 4 +-
.../fess/es/user/cbean/bs/BsRoleCB.java | 4 +-
.../fess/es/user/cbean/bs/BsUserCB.java | 4 +-
.../fess/es/user/cbean/ca/bs/BsGroupCA.java | 42 ++--
.../fess/es/user/cbean/ca/bs/BsRoleCA.java | 22 +-
.../fess/es/user/cbean/ca/bs/BsUserCA.java | 42 ++--
.../fess/es/user/cbean/cq/bs/BsGroupCQ.java | 32 +--
.../fess/es/user/cbean/cq/bs/BsRoleCQ.java | 32 +--
.../fess/es/user/cbean/cq/bs/BsUserCQ.java | 32 +--
.../java/org/codelibs/fess/exec/Crawler.java | 10 +-
.../codelibs/fess/exec/SuggestCreator.java | 10 +-
.../fess/exec/ThumbnailGenerator.java | 10 +-
.../fess/helper/CrawlingInfoHelper.java | 12 +-
.../org/codelibs/fess/helper/CurlHelper.java | 2 +-
.../codelibs/fess/helper/DataIndexHelper.java | 4 +-
.../codelibs/fess/helper/IndexingHelper.java | 6 +-
.../codelibs/fess/helper/KeyMatchHelper.java | 12 +-
.../codelibs/fess/helper/LanguageHelper.java | 2 +-
.../org/codelibs/fess/helper/QueryHelper.java | 26 +--
.../codelibs/fess/helper/SearchHelper.java | 20 +-
.../codelibs/fess/helper/SearchLogHelper.java | 4 +-
.../codelibs/fess/helper/SuggestHelper.java | 12 +-
.../codelibs/fess/helper/SystemHelper.java | 2 +-
.../codelibs/fess/indexer/IndexUpdater.java | 8 +-
.../java/org/codelibs/fess/job/CrawlJob.java | 2 +-
.../java/org/codelibs/fess/job/ExecJob.java | 6 +-
.../fess/job/GenerateThumbnailJob.java | 2 +-
.../org/codelibs/fess/job/PurgeDocJob.java | 4 +-
.../org/codelibs/fess/job/SuggestJob.java | 2 +-
.../org/codelibs/fess/job/UpdateLabelJob.java | 4 +-
.../fess/mylasta/direction/FessConfig.java | 6 +-
.../fess/mylasta/direction/FessProp.java | 6 +-
.../codelibs/fess/score/LtrQueryRescorer.java | 4 +-
.../codelibs/fess/score/QueryRescorer.java | 2 +-
.../org/codelibs/fess/score/ScoreBooster.java | 16 +-
.../fess/sso/aad/AzureAdAuthenticator.java | 2 +-
.../codelibs/fess/taglib/FessFunctions.java | 2 +-
.../fess/thumbnail/ThumbnailManager.java | 2 +-
.../fess/timer/SystemMonitorTarget.java | 32 +--
.../java/org/codelibs/fess/util/EsUtil.java | 8 +-
.../org/codelibs/fess/util/FacetResponse.java | 6 +-
.../codelibs/fess/util/QueryResponseList.java | 14 +-
.../org/codelibs/fess/util/ResourceUtil.java | 4 +-
.../org/codelibs/fess/util/UpgradeUtil.java | 26 +--
src/main/resources/crawler/es.xml | 2 +-
.../scheduled_job.bulk | 2 +-
.../codelibs/fess/helper/QueryHelperTest.java | 12 +-
196 files changed, 1813 insertions(+), 1811 deletions(-)
diff --git a/plugin.xml b/plugin.xml
index 04facf49f..179c5fe62 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -5,7 +5,9 @@
<!-- Maven Repository -->
<property name="maven.snapshot.repo.url" value="https://oss.sonatype.org/content/repositories/snapshots" />
- <property name="maven.release.repo.url" value="https://oss.sonatype.org/content/repositories/releases" />
+ <!-- property name="maven.release.repo.url" value="https://oss.sonatype.org/content/repositories/releases" / -->
+ <!-- WORKAROUND -->
+ <property name="maven.release.repo.url" value="https://maven.codelibs.org" />
<target name="install.plugins">
<mkdir dir="${target.dir}" />
@@ -14,7 +16,7 @@
<!-- analysis-extension -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs" />
+ <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-extension" />
<param name="plugin.version" value="7.10.0" />
@@ -23,7 +25,7 @@
<!-- analysis-fess -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs" />
+ <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-fess" />
<param name="plugin.version" value="7.10.0" />
@@ -32,7 +34,7 @@
<!-- configsync -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs" />
+ <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="configsync" />
<param name="plugin.version" value="7.10.0" />
@@ -41,7 +43,7 @@
<!-- dataformat -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs" />
+ <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="dataformat" />
<param name="plugin.version" value="7.10.0" />
@@ -50,7 +52,7 @@
<!-- minhash -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs" />
+ <param name="plugin.groupId" value="org/codelibs/fesen/relocated" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="minhash" />
<param name="plugin.version" value="7.10.0" />
diff --git a/pom.xml b/pom.xml
index f794c3c34..3f2673eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.codelibs.fess</groupId>
<artifactId>fess</artifactId>
- <version>13.10.3-SNAPSHOT</version>
+ <version>13.11.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Fess</name>
<description>Fess is Full tExt Search System.</description>
@@ -54,15 +54,15 @@
<okhttp.version>3.14.9</okhttp.version>
<!-- Crawler -->
- <crawler.version>3.10.1</crawler.version>
+ <crawler.version>3.11.0-SNAPSHOT</crawler.version>
<!-- Suggest -->
- <suggest.version>7.10.0</suggest.version>
+ <suggest.version>7.11.0-SNAPSHOT</suggest.version>
- <!-- Elasticsearch -->
- <elasticsearch.version>7.10.1</elasticsearch.version>
- <elasticsearch.httpclient.version>7.10.0</elasticsearch.httpclient.version>
- <cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
+ <!-- Fesen -->
+ <fesen.version>0.10.0-SNAPSHOT</fesen.version>
+ <fesen.httpclient.version>0.10.0-SNAPSHOT</fesen.httpclient.version>
+ <fesen.runner.version>0.10.0-SNAPSHOT</fesen.runner.version>
<!-- Tomcat -->
<tomcat.version>9.0.41</tomcat.version>
@@ -90,7 +90,7 @@
<packaging.fess.systemd.dir>/usr/lib/systemd/system</packaging.fess.systemd.dir>
<packaging.fess.systemd.sysctl.dir>/usr/lib/sysctl.d</packaging.fess.systemd.sysctl.dir>
<packaging.fess.tmpfilesd.dir>/usr/lib/tmpfiles.d</packaging.fess.tmpfilesd.dir>
- <packaging.fess.dictionary.dir>/var/lib/elasticsearch/config</packaging.fess.dictionary.dir>
+ <packaging.fess.dictionary.dir>/var/lib/fesen/config</packaging.fess.dictionary.dir>
</properties>
<profiles>
@@ -1082,16 +1082,16 @@
<version>${log4j.version}</version>
</dependency>
- <!-- elasticsearch -->
+ <!-- fesen -->
<dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elasticsearch.version}</version>
+ <groupId>org.codelibs.fesen</groupId>
+ <artifactId>fesen-engine-server</artifactId>
+ <version>${fesen.version}</version>
</dependency>
<dependency>
- <groupId>org.codelibs</groupId>
- <artifactId>elasticsearch-cluster-runner</artifactId>
- <version>${cluster.runner.version}</version>
+ <groupId>org.codelibs.fesen</groupId>
+ <artifactId>fesen-runner</artifactId>
+ <version>${fesen.runner.version}</version>
<exclusions>
<exclusion>
<groupId>org.ow2.asm</groupId>
@@ -1116,9 +1116,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.codelibs</groupId>
- <artifactId>elasticsearch-httpclient</artifactId>
- <version>${elasticsearch.httpclient.version}</version>
+ <groupId>org.codelibs.fesen.client</groupId>
+ <artifactId>fesen-httpclient</artifactId>
+ <version>${fesen.httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
index 81d1a4aa5..8ff707f7b 100644
--- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
@@ -34,6 +34,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.exception.IORuntimeException;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.script.Script;
import org.codelibs.fess.Constants;
import org.codelibs.fess.api.BaseJsonApiManager;
import org.codelibs.fess.app.service.FavoriteLogService;
@@ -59,7 +60,6 @@ import org.codelibs.fess.util.DocumentUtil;
import org.codelibs.fess.util.FacetResponse;
import org.codelibs.fess.util.FacetResponse.Field;
import org.dbflute.optional.OptionalThing;
-import org.elasticsearch.script.Script;
public class JsonApiManager extends BaseJsonApiManager {
diff --git a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
index 2612d279f..829010f72 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@@ -33,6 +33,13 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.beans.util.BeanUtil;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.BucketOrder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramInterval;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.Histogram;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
+import org.codelibs.fesen.search.aggregations.metrics.Avg;
+import org.codelibs.fesen.search.aggregations.metrics.Cardinality;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.pager.SearchLogPager;
import org.codelibs.fess.es.log.allcommon.EsPagingResultBean;
@@ -53,13 +60,6 @@ import org.codelibs.fess.helper.SystemHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.taglib.FessFunctions;
import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.BucketOrder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
-import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.metrics.Avg;
-import org.elasticsearch.search.aggregations.metrics.Cardinality;
public class SearchLogService {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
index 00589388c..8bbc56f80 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
@@ -35,13 +35,13 @@ import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.curl.CurlResponse;
+import org.codelibs.fesen.action.ActionListener;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Secured;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.mylasta.direction.FessConfig.SimpleImpl;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.action.ActionListener;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
@@ -154,13 +154,13 @@ public class AdminMaintenanceAction extends FessAdminAction {
writeSystemProperties(zos, diagnosticId);
writeFessBasicConfig(zos, diagnosticId);
writeFessConfig(zos, diagnosticId);
- writeElasticsearchCat(zos, diagnosticId);
- writeElasticsearchJson(zos, diagnosticId);
+ writeFesenCat(zos, diagnosticId);
+ writeFesenJson(zos, diagnosticId);
}
});
}
- protected void writeElasticsearchJson(final ZipOutputStream zos, final String id) {
+ protected void writeFesenJson(final ZipOutputStream zos, final String id) {
writeElastisearchJsonApi(zos, id, "cluster", "health");
writeElastisearchJsonApi(zos, id, "cluster", "state");
writeElastisearchJsonApi(zos, id, "cluster", "stats");
@@ -185,7 +185,7 @@ public class AdminMaintenanceAction extends FessAdminAction {
}
}
- protected void writeElasticsearchCat(final ZipOutputStream zos, final String id) {
+ protected void writeFesenCat(final ZipOutputStream zos, final String id) {
Arrays.stream(ES_CAT_NAMES).forEach(name -> {
final ZipEntry entry = new ZipEntry(id + "/es_cat_" + name + ".txt");
try {
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
index 771aac068..42b2f4e1d 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
@@ -27,6 +27,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.net.URLUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.annotation.Secured;
import org.codelibs.fess.app.web.CrudMode;
@@ -43,8 +45,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.RenderDataUtil;
import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
index f5cb7b2e9..0c2792418 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@@ -19,6 +19,7 @@ import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.codelibs.fesen.client.IndicesAdminClient;
import org.codelibs.fess.annotation.Secured;
import org.codelibs.fess.app.service.ScheduledJobService;
import org.codelibs.fess.app.web.base.FessAdminAction;
@@ -32,7 +33,6 @@ import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
import org.codelibs.fess.es.user.exbhv.RoleBhv;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.UpgradeUtil;
-import org.elasticsearch.client.IndicesAdminClient;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
index 890e2b828..78fa84cef 100644
--- a/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
@@ -25,6 +25,8 @@ import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.CrudMode;
import org.codelibs.fess.app.web.api.ApiResult;
@@ -41,8 +43,6 @@ import org.codelibs.fess.exception.InvalidQueryException;
import org.codelibs.fess.exception.ResultOffsetExceededException;
import org.codelibs.fess.helper.SearchHelper;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.JsonResponse;
diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
index 6a366cc9b..e7d4a75f4 100644
--- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
+++ b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.FileUtil;
import org.codelibs.curl.CurlResponse;
-import org.codelibs.elasticsearch.runner.net.EcrCurl;
+import org.codelibs.fesen.runner.net.EcrCurl;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalEntity;
diff --git a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
index cf369281a..a5771bd5d 100644
--- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
@@ -31,6 +31,7 @@ import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.io.SerializeUtil;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.builder.RequestDataBuilder;
import org.codelibs.fess.crawler.client.CrawlerClient;
@@ -50,7 +51,6 @@ import org.codelibs.fess.exception.DataStoreCrawlingException;
import org.codelibs.fess.helper.IndexingHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.di.core.SingletonLaContainer;
public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
diff --git a/src/main/java/org/codelibs/fess/entity/FacetInfo.java b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
index 4f3ecd3f3..f7d76809d 100644
--- a/src/main/java/org/codelibs/fess/entity/FacetInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
@@ -23,9 +23,9 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.stream.StreamUtil;
+import org.codelibs.fesen.search.aggregations.BucketOrder;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.search.aggregations.BucketOrder;
public class FacetInfo {
private static final Logger logger = LogManager.getLogger(FacetInfo.class);
diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
index 516d0f3b8..12da406c5 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -25,12 +25,12 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.exception.InvalidQueryException;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.core.message.UserMessages;
public class GeoInfo {
diff --git a/src/main/java/org/codelibs/fess/entity/PingResponse.java b/src/main/java/org/codelibs/fess/entity/PingResponse.java
index baf6418ff..298ffffcb 100644
--- a/src/main/java/org/codelibs/fess/entity/PingResponse.java
+++ b/src/main/java/org/codelibs/fess/entity/PingResponse.java
@@ -22,11 +22,11 @@ import java.util.Locale;
import org.apache.commons.text.StringEscapeUtils;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.action.admin.cluster.health.ClusterHealthResponse;
+import org.codelibs.fesen.cluster.health.ClusterHealthStatus;
+import org.codelibs.fesen.common.xcontent.XContentType;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.EsUtil;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.cluster.health.ClusterHealthStatus;
-import org.elasticsearch.common.xcontent.XContentType;
public class PingResponse {
private static final String CLUSTER_NAME = "cluster_name";
diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java
index 38c25cbbf..f2a4488dd 100644
--- a/src/main/java/org/codelibs/fess/entity/QueryContext.java
+++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java
@@ -27,14 +27,14 @@ import java.util.Set;
import java.util.function.Consumer;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.search.sort.SortBuilder;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
import org.lastaflute.web.util.LaRequestUtil;
public class QueryContext {
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index cafb68067..d4e8ddb8f 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -17,7 +17,7 @@ package org.codelibs.fess.es.client;
import static org.codelibs.core.stream.StreamUtil.split;
import static org.codelibs.core.stream.StreamUtil.stream;
-import static org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.newConfigs;
+import static org.codelibs.fesen.runner.FesenRunner.newConfigs;
import java.io.File;
import java.io.IOException;
@@ -51,9 +51,92 @@ import org.codelibs.core.io.ResourceUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.curl.CurlResponse;
-import org.codelibs.elasticsearch.client.HttpClient;
-import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner;
-import org.codelibs.elasticsearch.runner.ElasticsearchClusterRunner.Configs;
+import org.codelibs.fesen.FesenException;
+import org.codelibs.fesen.action.ActionFuture;
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.ActionRequest;
+import org.codelibs.fesen.action.ActionResponse;
+import org.codelibs.fesen.action.ActionType;
+import org.codelibs.fesen.action.DocWriteRequest;
+import org.codelibs.fesen.action.DocWriteRequest.OpType;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.cluster.health.ClusterHealthResponse;
+import org.codelibs.fesen.action.admin.indices.alias.IndicesAliasesRequestBuilder;
+import org.codelibs.fesen.action.admin.indices.create.CreateIndexResponse;
+import org.codelibs.fesen.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.codelibs.fesen.action.admin.indices.flush.FlushResponse;
+import org.codelibs.fesen.action.admin.indices.get.GetIndexResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse.Failure;
+import org.codelibs.fesen.action.bulk.BulkRequest;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequest;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.explain.ExplainRequest;
+import org.codelibs.fesen.action.explain.ExplainRequestBuilder;
+import org.codelibs.fesen.action.explain.ExplainResponse;
+import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesRequest;
+import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesRequestBuilder;
+import org.codelibs.fesen.action.fieldcaps.FieldCapabilitiesResponse;
+import org.codelibs.fesen.action.get.GetRequest;
+import org.codelibs.fesen.action.get.GetRequestBuilder;
+import org.codelibs.fesen.action.get.GetResponse;
+import org.codelibs.fesen.action.get.MultiGetRequest;
+import org.codelibs.fesen.action.get.MultiGetRequestBuilder;
+import org.codelibs.fesen.action.get.MultiGetResponse;
+import org.codelibs.fesen.action.index.IndexRequest;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.ClearScrollRequest;
+import org.codelibs.fesen.action.search.ClearScrollRequestBuilder;
+import org.codelibs.fesen.action.search.ClearScrollResponse;
+import org.codelibs.fesen.action.search.MultiSearchRequest;
+import org.codelibs.fesen.action.search.MultiSearchRequestBuilder;
+import org.codelibs.fesen.action.search.MultiSearchResponse;
+import org.codelibs.fesen.action.search.SearchPhaseExecutionException;
+import org.codelibs.fesen.action.search.SearchRequest;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.search.SearchScrollRequest;
+import org.codelibs.fesen.action.search.SearchScrollRequestBuilder;
+import org.codelibs.fesen.action.support.WriteRequest.RefreshPolicy;
+import org.codelibs.fesen.action.support.master.AcknowledgedResponse;
+import org.codelibs.fesen.action.termvectors.MultiTermVectorsRequest;
+import org.codelibs.fesen.action.termvectors.MultiTermVectorsRequestBuilder;
+import org.codelibs.fesen.action.termvectors.MultiTermVectorsResponse;
+import org.codelibs.fesen.action.termvectors.TermVectorsRequest;
+import org.codelibs.fesen.action.termvectors.TermVectorsRequestBuilder;
+import org.codelibs.fesen.action.termvectors.TermVectorsResponse;
+import org.codelibs.fesen.action.update.UpdateRequest;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.action.update.UpdateResponse;
+import org.codelibs.fesen.client.AdminClient;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.client.HttpClient;
+import org.codelibs.fesen.cluster.metadata.MappingMetadata;
+import org.codelibs.fesen.common.collect.ImmutableOpenMap;
+import org.codelibs.fesen.common.document.DocumentField;
+import org.codelibs.fesen.common.settings.Settings;
+import org.codelibs.fesen.common.settings.Settings.Builder;
+import org.codelibs.fesen.common.unit.TimeValue;
+import org.codelibs.fesen.common.xcontent.XContentType;
+import org.codelibs.fesen.index.query.InnerHitBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.runner.FesenRunner;
+import org.codelibs.fesen.runner.FesenRunner.Configs;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.collapse.CollapseBuilder;
+import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightBuilder;
+import org.codelibs.fesen.threadpool.ThreadPool;
import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.FacetInfo;
import org.codelibs.fess.entity.GeoInfo;
@@ -73,89 +156,6 @@ import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocMap;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.ActionFuture;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.ActionRequest;
-import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.action.ActionType;
-import org.elasticsearch.action.DocWriteRequest;
-import org.elasticsearch.action.DocWriteRequest.OpType;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
-import org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
-import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.admin.indices.flush.FlushResponse;
-import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
-import org.elasticsearch.action.bulk.BulkRequest;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequest;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.explain.ExplainRequest;
-import org.elasticsearch.action.explain.ExplainRequestBuilder;
-import org.elasticsearch.action.explain.ExplainResponse;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequest;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
-import org.elasticsearch.action.fieldcaps.FieldCapabilitiesResponse;
-import org.elasticsearch.action.get.GetRequest;
-import org.elasticsearch.action.get.GetRequestBuilder;
-import org.elasticsearch.action.get.GetResponse;
-import org.elasticsearch.action.get.MultiGetRequest;
-import org.elasticsearch.action.get.MultiGetRequestBuilder;
-import org.elasticsearch.action.get.MultiGetResponse;
-import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.ClearScrollRequest;
-import org.elasticsearch.action.search.ClearScrollRequestBuilder;
-import org.elasticsearch.action.search.ClearScrollResponse;
-import org.elasticsearch.action.search.MultiSearchRequest;
-import org.elasticsearch.action.search.MultiSearchRequestBuilder;
-import org.elasticsearch.action.search.MultiSearchResponse;
-import org.elasticsearch.action.search.SearchPhaseExecutionException;
-import org.elasticsearch.action.search.SearchRequest;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchScrollRequest;
-import org.elasticsearch.action.search.SearchScrollRequestBuilder;
-import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
-import org.elasticsearch.action.termvectors.MultiTermVectorsRequestBuilder;
-import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
-import org.elasticsearch.action.termvectors.TermVectorsRequest;
-import org.elasticsearch.action.termvectors.TermVectorsRequestBuilder;
-import org.elasticsearch.action.termvectors.TermVectorsResponse;
-import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.client.AdminClient;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.cluster.metadata.MappingMetadata;
-import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.document.DocumentField;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.settings.Settings.Builder;
-import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.xcontent.XContentType;
-import org.elasticsearch.index.query.InnerHitBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.collapse.CollapseBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
-import org.elasticsearch.threadpool.ThreadPool;
import org.lastaflute.core.message.UserMessages;
import org.lastaflute.di.exception.ContainerInitFailureException;
@@ -173,7 +173,7 @@ public class FessEsClient implements Client {
private static final String CONFIG_INDEX_PREFIX = ".fess_config";
- protected ElasticsearchClusterRunner runner;
+ protected FesenRunner runner;
protected Client client;
@@ -218,7 +218,7 @@ public class FessEsClient implements Client {
.name();
}
- public void setRunner(final ElasticsearchClusterRunner runner) {
+ public void setRunner(final FesenRunner runner) {
this.runner = runner;
}
@@ -244,7 +244,7 @@ public class FessEsClient implements Client {
String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
if (StringUtil.isBlank(httpAddress)) {
if (runner == null) {
- runner = new ElasticsearchClusterRunner();
+ runner = new FesenRunner();
final Configs config = newConfigs().clusterName(clusterName).numOfNode(1).useLogger();
final String esDir = System.getProperty("fess.es.dir");
if (esDir != null) {
@@ -266,7 +266,7 @@ public class FessEsClient implements Client {
}
final int port = runner.node().settings().getAsInt("http.port", 9200);
httpAddress = "http://localhost:" + port;
- logger.warn("Embedded Elasticsearch is running. This configuration is not recommended for production use.");
+ logger.warn("Embedded Fesen is running. This configuration is not recommended for production use.");
}
client = createHttpClient(fessConfig, httpAddress);
@@ -581,19 +581,19 @@ public class FessEsClient implements Client {
final ClusterHealthResponse response = client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute()
.actionGet(fessConfig.getIndexHealthTimeout());
if (logger.isDebugEnabled()) {
- logger.debug("Elasticsearch Cluster Status: {}", response.getStatus());
+ logger.debug("Fesen Cluster Status: {}", response.getStatus());
}
return;
} catch (final Exception e) {
cause = e;
}
if (logger.isDebugEnabled()) {
- logger.debug("Failed to access to Elasticsearch:{}", i, cause);
+ logger.debug("Failed to access to Fesen:{}", i, cause);
}
ThreadUtil.sleep(1000L);
}
- final String message = "Elasticsearch (" + System.getProperty(Constants.FESS_ES_HTTP_ADDRESS)
- + ") is not available. Check the state of your Elasticsearch cluster (" + clusterName + ") in "
+ final String message = "Fesen (" + System.getProperty(Constants.FESS_ES_HTTP_ADDRESS)
+ + ") is not available. Check the state of your Fesen cluster (" + clusterName + ") in "
+ (System.currentTimeMillis() - startTime) + "ms.";
throw new ContainerInitFailureException(message, cause);
}
@@ -638,7 +638,7 @@ public class FessEsClient implements Client {
}
try {
client.close();
- } catch (final ElasticsearchException e) {
+ } catch (final FesenException e) {
logger.warn("Failed to close Client: {}", client, e);
}
}
@@ -904,7 +904,7 @@ public class FessEsClient implements Client {
final Result result = client.prepareUpdate().setIndex(index).setId(id).setDoc(field, value).execute()
.actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
return result == Result.CREATED || result == Result.UPDATED;
- } catch (final ElasticsearchException e) {
+ } catch (final FesenException e) {
throw new FessEsClientException("Failed to set " + value + " to " + field + " for doc " + id, e);
}
}
@@ -949,7 +949,7 @@ public class FessEsClient implements Client {
final ClusterHealthResponse response =
client.admin().cluster().prepareHealth().execute().actionGet(ComponentUtil.getFessConfig().getIndexHealthTimeout());
return new PingResponse(response);
- } catch (final ElasticsearchException e) {
+ } catch (final FesenException e) {
throw new FessEsClientException("Failed to process a ping request.", e);
}
}
@@ -1265,7 +1265,7 @@ public class FessEsClient implements Client {
}
final Result result = response.getResult();
return result == Result.CREATED || result == Result.UPDATED;
- } catch (final ElasticsearchException e) {
+ } catch (final FesenException e) {
throw new FessEsClientException("Failed to store: " + obj, e);
}
}
@@ -1285,7 +1285,7 @@ public class FessEsClient implements Client {
}
final DeleteResponse response = builder.execute().actionGet(ComponentUtil.getFessConfig().getIndexDeleteTimeout());
return response.getResult() == Result.DELETED;
- } catch (final ElasticsearchException e) {
+ } catch (final FesenException e) {
throw new FessEsClientException("Failed to delete: " + index + "/" + id + "@" + seqNo + ":" + primaryTerm, e);
}
}
@@ -1311,7 +1311,7 @@ public class FessEsClient implements Client {
}
//
- // Elasticsearch Client
+ // Fesen Client
//
@Override
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 1abb14b4e..ddfbe03bc 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
@@ -27,6 +27,23 @@ import java.util.function.Function;
import javax.annotation.Resource;
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.index.seqno.SequenceNumbers;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.DocMeta;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.dbflute.Entity;
@@ -41,23 +58,6 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
/**
* @param <ENTITY> The type of entity.
@@ -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);
// ===================================================================================
- // Elasticsearch
+ // Fesen
// ======
public RefreshResponse refresh() {
return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
index 52c72176c..cb86f34b4 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
index ab58022d6..e262709e1 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
@@ -15,6 +15,8 @@
*/
package org.codelibs.fess.es.config.allcommon;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.TimeValue;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.chelper.HpCBPurpose;
import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -37,8 +39,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
import org.dbflute.jdbc.StatementConfig;
import org.dbflute.system.DBFluteSystem;
import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.TimeValue;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index 9ccb959d8..2e55c33c2 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
@@ -26,6 +26,32 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.search.sort.FieldSortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.ConditionQuery;
import org.dbflute.cbean.ckey.ConditionKey;
@@ -38,32 +64,6 @@ import org.dbflute.dbmeta.name.ColumnRealName;
import org.dbflute.dbmeta.name.ColumnSqlName;
import org.dbflute.exception.InvalidQueryRegisteredException;
import org.dbflute.util.Srl;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
index 4c5f078bc..6a18ba96c 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
import java.util.Map;
import java.util.Set;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.dbflute.Entity;
import org.dbflute.FunCustodial;
import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
import org.dbflute.util.DfCollectionUtil;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
index 69b7a8b4e..150eccd9b 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
package org.codelibs.fess.es.config.allcommon;
import org.apache.lucene.search.TotalHits;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.search.aggregations.Aggregations;
import org.dbflute.cbean.result.PagingResultBean;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.search.aggregations.Aggregations;
/**
* @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
index 075c84d0b..3fdb76628 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.AccessTokenDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
index 9b6fb59e8..3d2f0414b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
index 10f205a2a..a36f9389a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
index 3d3e74529..73b5d0547 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
index abc1bb5ee..031bde82e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
index ae022a510..79062d5de 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
index 398bdd033..1510f413e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
index 60c19e94d..64268de2d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
index d8ae15442..af596f645 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
index f305288af..341b1cd62 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
index c6036ad50..f054e105f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
index 481742639..b0059cea2 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
index e55b76e50..519d982b4 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
index 4a5bcb6a4..9708b722f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
index c47de4522..ddef85445 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
index 56fe232db..9f7f7c6ea 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
index abd9a2261..d9bc3321d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedContentDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
index 715f4bd56..45634ce30 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedQueryDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
index 2a88d7834..20b05b3f7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
index ec02e3b5e..c89d687be 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
index 98d90c82f..109fc5ed3 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
index 20da14bac..5f13bd94e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.ThumbnailQueueDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
index 41fd6bdfe..e30c47480 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
index dd3c1a611..edc8cfbaf 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.config.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.config.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
index e4e4d553f..830336955 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.AccessTokenDbm;
import org.codelibs.fess.es.config.cbean.AccessTokenCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsAccessTokenCA;
import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
index de29342e6..afbe9d65a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.BadWordDbm;
import org.codelibs.fess.es.config.cbean.BadWordCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsBadWordCA;
import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
index dda3a63df..016144c47 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.BoostDocumentRuleDbm;
import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsBoostDocumentRuleCA;
import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
index 9505c66fb..159bcf643 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoDbm;
import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoCA;
import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
index 0db560ad8..aa0b1d9c9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.CrawlingInfoParamDbm;
import org.codelibs.fess.es.config.cbean.CrawlingInfoParamCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsCrawlingInfoParamCA;
import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
index 6091b52e8..94f75a461 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.DataConfigDbm;
import org.codelibs.fess.es.config.cbean.DataConfigCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsDataConfigCA;
import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
index c90b74287..d773969cd 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.DuplicateHostDbm;
import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsDuplicateHostCA;
import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
index 9c5daacf1..a6f9bee86 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordDbm;
import org.codelibs.fess.es.config.cbean.ElevateWordCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordCA;
import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
index c3272a05d..4061d3f25 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.ElevateWordToLabelDbm;
import org.codelibs.fess.es.config.cbean.ElevateWordToLabelCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsElevateWordToLabelCA;
import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
index ea28143c7..46a3674a0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.FailureUrlDbm;
import org.codelibs.fess.es.config.cbean.FailureUrlCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFailureUrlCA;
import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
index 1cfbfd552..618487d13 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.FileAuthenticationDbm;
import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFileAuthenticationCA;
import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
index 6ea7cd469..d7c21f47d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.FileConfigDbm;
import org.codelibs.fess.es.config.cbean.FileConfigCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsFileConfigCA;
import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
index a21a83e36..0a5752cdc 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.JobLogDbm;
import org.codelibs.fess.es.config.cbean.JobLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsJobLogCA;
import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
index 5d2a258f9..1734acf35 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.KeyMatchDbm;
import org.codelibs.fess.es.config.cbean.KeyMatchCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsKeyMatchCA;
import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
index 10bf02c7c..ca9b531b4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.LabelTypeDbm;
import org.codelibs.fess.es.config.cbean.LabelTypeCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsLabelTypeCA;
import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
index b6b631fd0..e77545afe 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.PathMappingDbm;
import org.codelibs.fess.es.config.cbean.PathMappingCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsPathMappingCA;
import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
index fd98ea69d..33531f3e5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedContentDbm;
import org.codelibs.fess.es.config.cbean.RelatedContentCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedContentCA;
import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedContentCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
index b243f4a7e..934c02438 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.RelatedQueryDbm;
import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRelatedQueryCA;
import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedQueryCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
index 611f839c3..37c864d71 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.RequestHeaderDbm;
import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRequestHeaderCA;
import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
index cf55c0b06..1f9903b3a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.RoleTypeDbm;
import org.codelibs.fess.es.config.cbean.RoleTypeCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsRoleTypeCA;
import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
index 5bdc93f0a..5da5ff00d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.ScheduledJobDbm;
import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsScheduledJobCA;
import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
index 496933e81..d6616d990 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.ThumbnailQueueDbm;
import org.codelibs.fess.es.config.cbean.ThumbnailQueueCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsThumbnailQueueCA;
import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
index a1e31f3e6..a17be06d1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.WebAuthenticationDbm;
import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsWebAuthenticationCA;
import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
index f8f49fe7c..29da09766 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.config.bsentity.dbmeta.WebConfigDbm;
import org.codelibs.fess.es.config.cbean.WebConfigCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.config.cbean.ca.bs.BsWebConfigCA;
import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
index 261a96bc7..58a7d1f6e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.AccessTokenCA;
import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
index 066f7cf80..978ac3703 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.BadWordCA;
import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
index a843ddbc6..083d1e3f4 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.BoostDocumentRuleCA;
import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
index 0765391ad..2dbacd4cf 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoCA;
import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
index 84dbd8c54..da973c629 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoParamCA;
import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
index b0ef16960..1de4b4075 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.DataConfigCA;
import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
index 8da93deef..8d317141c 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.DuplicateHostCA;
import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
index 9ce996682..bf9a07130 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.ElevateWordCA;
import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
index 42fce158a..1dbe34f53 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
@@ -15,22 +15,22 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.ElevateWordToLabelCA;
import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
index 19a2d0c15..67bbca95b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.FailureUrlCA;
import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
index 38fb05055..20fcbf89a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.FileAuthenticationCA;
import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
index caa4eaa26..deae9c08b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.FileConfigCA;
import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
index 15a874620..467d4dc1e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.JobLogCA;
import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
index 0e0634224..b99463fb1 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.KeyMatchCA;
import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
index c91093678..507d3b46e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.LabelTypeCA;
import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
index 56c34f94c..e5b5f722f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.PathMappingCA;
import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
index 2aaffd261..2795801ee 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.RelatedContentCA;
import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedContentCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
index 1cb457792..587581232 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.RelatedQueryCA;
import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRelatedQueryCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
index 745da108e..7e49f549f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.RequestHeaderCA;
import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
index c5d388166..f555dd0b3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.RoleTypeCA;
import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
index 73207f840..f8d2b4949 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.ScheduledJobCA;
import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
index e9311fa76..6e38c77b8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.ThumbnailQueueCA;
import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
index 3b2d2caf9..b056e524b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.WebAuthenticationCA;
import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
index f20cc379a..70fd150d0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.config.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.ca.WebConfigCA;
import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
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 aa6c65e41..d3c42b1c2 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 66a5f470e..220aeece3 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 73a4cb0a7..58b454984 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 fdfa385d2..3d4da6533 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 0858ff414..36b209064 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 2f3667788..b3746a185 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 86ab58298..75279d9a8 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 88fa6ce3e..08db3f2ab 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 e5b401333..f2dbf89b0 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 4689188ba..776829549 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 4a963ddbf..62d24e706 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 b252cc538..147381698 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 8d4cd2f24..cf40d52ba 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 e67c1b563..b0779006c 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 f63b049dd..7061987c9 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 61e4a51d5..737c7f658 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 41b484f4b..f8c7481d3 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.RelatedContentCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 091002e4c..53e9e1541 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.RelatedQueryCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 9d7ad8e83..96f905041 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 acf2b7583..ddfd630f0 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 0166d8840..0a9b748c0 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 e576d17ef..e8dfb86bc 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 df249a62d..6801e74f1 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 767d66222..001d6ff46 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 9db032a46..b12974333 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
@@ -27,6 +27,23 @@ import java.util.function.Function;
import javax.annotation.Resource;
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.index.seqno.SequenceNumbers;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.DocMeta;
import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
import org.dbflute.Entity;
@@ -41,23 +58,6 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
/**
* @param <ENTITY> The type of entity.
@@ -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);
// ===================================================================================
- // Elasticsearch
+ // Fesen
// ======
public RefreshResponse refresh() {
return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
index 5789a8301..9308de039 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
index 78e2ceac7..629763e0c 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionBean.java
@@ -15,6 +15,8 @@
*/
package org.codelibs.fess.es.log.allcommon;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.TimeValue;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.chelper.HpCBPurpose;
import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -37,8 +39,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
import org.dbflute.jdbc.StatementConfig;
import org.dbflute.system.DBFluteSystem;
import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.TimeValue;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
index 1a1e68818..db7c31e71 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
@@ -26,6 +26,32 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.search.sort.FieldSortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.ConditionQuery;
import org.dbflute.cbean.ckey.ConditionKey;
@@ -38,32 +64,6 @@ import org.dbflute.dbmeta.name.ColumnRealName;
import org.dbflute.dbmeta.name.ColumnSqlName;
import org.dbflute.exception.InvalidQueryRegisteredException;
import org.dbflute.util.Srl;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
index 17dd2c907..02ea9ca6f 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
import java.util.Map;
import java.util.Set;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.dbflute.Entity;
import org.dbflute.FunCustodial;
import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
import org.dbflute.util.DfCollectionUtil;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
index c98c250dc..d63b8b5b1 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
package org.codelibs.fess.es.log.allcommon;
import org.apache.lucene.search.TotalHits;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.search.aggregations.Aggregations;
import org.dbflute.cbean.result.PagingResultBean;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.search.aggregations.Aggregations;
/**
* @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
index c92976545..df31f34f2 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsClickLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
index 26b88446f..9a20c5068 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsFavoriteLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
index 512fcba13..c4b2d9c16 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsSearchLogBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
index e13ed4133..7cdfdb964 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsbhv/BsUserInfoBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.log.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.log.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
@@ -31,9 +34,6 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
index 64e00a914..342fe9845 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsClickLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.log.bsentity.dbmeta.ClickLogDbm;
import org.codelibs.fess.es.log.cbean.ClickLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsClickLogCA;
import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
index cd05226ef..5cd97a39c 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsFavoriteLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.log.bsentity.dbmeta.FavoriteLogDbm;
import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsFavoriteLogCA;
import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
index 6f79391c5..160c04a41 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsSearchLogCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.log.bsentity.dbmeta.SearchLogDbm;
import org.codelibs.fess.es.log.cbean.SearchLogCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsSearchLogCA;
import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
index 98c6676ea..258a698ad 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/bs/BsUserInfoCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.log.bsentity.dbmeta.UserInfoDbm;
import org.codelibs.fess.es.log.cbean.UserInfoCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.log.cbean.ca.bs.BsUserInfoCA;
import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
index a84588a6f..e5b108ac4 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
@@ -15,34 +15,34 @@
*/
package org.codelibs.fess.es.log.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.ca.ClickLogCA;
import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
index 433d3f48c..19a4ace5a 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
@@ -15,24 +15,24 @@
*/
package org.codelibs.fess.es.log.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.ca.FavoriteLogCA;
import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
index fbb7b6919..de49f4d98 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
@@ -15,34 +15,34 @@
*/
package org.codelibs.fess.es.log.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.ca.SearchLogCA;
import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
index 5805e59ad..144799629 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
@@ -15,21 +15,21 @@
*/
package org.codelibs.fess.es.log.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.ca.UserInfoCA;
import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
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 e9bab4868..46c956268 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 120546b19..2dcc6e1fa 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 eb16c4c47..6de0ddc8d 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 08f0bf59d..b42ac4ac1 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
@@ -19,21 +19,21 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
index 3b3985262..36eb36c9a 100644
--- a/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
+++ b/src/main/java/org/codelibs/fess/es/query/StoredLtrQueryBuilder.java
@@ -21,15 +21,15 @@ import java.util.Map;
import java.util.Objects;
import org.apache.lucene.search.Query;
-import org.elasticsearch.common.ParseField;
-import org.elasticsearch.common.io.stream.NamedWriteable;
-import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ObjectParser;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.query.AbstractQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.codelibs.fesen.common.ParseField;
+import org.codelibs.fesen.common.io.stream.NamedWriteable;
+import org.codelibs.fesen.common.io.stream.StreamOutput;
+import org.codelibs.fesen.common.xcontent.ObjectParser;
+import org.codelibs.fesen.common.xcontent.XContentBuilder;
+import org.codelibs.fesen.common.xcontent.XContentParser;
+import org.codelibs.fesen.index.query.AbstractQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryShardContext;
public class StoredLtrQueryBuilder extends AbstractQueryBuilder<StoredLtrQueryBuilder> implements NamedWriteable {
public static final String NAME = "sltr";
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 ac339a544..fc047cecb 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
@@ -27,6 +27,23 @@ import java.util.function.Function;
import javax.annotation.Resource;
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.admin.indices.refresh.RefreshResponse;
+import org.codelibs.fesen.action.bulk.BulkItemResponse;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteResponse;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
+import org.codelibs.fesen.action.index.IndexResponse;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.index.seqno.SequenceNumbers;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.DocMeta;
import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
import org.dbflute.Entity;
@@ -41,23 +58,6 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
-import org.elasticsearch.action.bulk.BulkItemResponse;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.index.IndexRequestBuilder;
-import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
/**
* @param <ENTITY> The type of entity.
@@ -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);
// ===================================================================================
- // Elasticsearch
+ // Fesen
// ======
public RefreshResponse refresh() {
return client.admin().indices().prepareRefresh(asEsIndex()).execute().actionGet(refreshTimeout);
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
index a12a000ce..b46224fe1 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
@@ -20,33 +20,33 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.search.aggregations.AbstractAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.dbflute.exception.InvalidQueryRegisteredException;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
index 453c90b9e..436694426 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionBean.java
@@ -15,6 +15,8 @@
*/
package org.codelibs.fess.es.user.allcommon;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.TimeValue;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.chelper.HpCBPurpose;
import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -37,8 +39,6 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
import org.dbflute.jdbc.StatementConfig;
import org.dbflute.system.DBFluteSystem;
import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.TimeValue;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
index b7f21a55b..56740c7d6 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
@@ -26,6 +26,32 @@ import java.util.Date;
import java.util.List;
import java.util.TimeZone;
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchAllQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.MoreLikeThisQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.QueryStringQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.search.sort.FieldSortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.ConditionQuery;
import org.dbflute.cbean.ckey.ConditionKey;
@@ -38,32 +64,6 @@ import org.dbflute.dbmeta.name.ColumnRealName;
import org.dbflute.dbmeta.name.ColumnSqlName;
import org.dbflute.exception.InvalidQueryRegisteredException;
import org.dbflute.util.Srl;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.search.sort.FieldSortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
index 80923164a..059159227 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractEntity.java
@@ -19,13 +19,13 @@ import java.io.Serializable;
import java.util.Map;
import java.util.Set;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.dbflute.Entity;
import org.dbflute.FunCustodial;
import org.dbflute.dbmeta.accessory.EntityModifiedProperties;
import org.dbflute.dbmeta.accessory.EntityUniqueDrivenProperties;
import org.dbflute.util.DfCollectionUtil;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
index 1988400e2..69d14908d 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsPagingResultBean.java
@@ -16,9 +16,9 @@
package org.codelibs.fess.es.user.allcommon;
import org.apache.lucene.search.TotalHits;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.search.aggregations.Aggregations;
import org.dbflute.cbean.result.PagingResultBean;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.search.aggregations.Aggregations;
/**
* @param <ENTITY> The type of entity.
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
index 3289efe84..e945802a2 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsGroupBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.user.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
index f511c254e..20b1833d2 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsRoleBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.user.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
index 7a2f408de..0b8b24635 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsbhv/BsUserBhv.java
@@ -18,6 +18,9 @@ package org.codelibs.fess.es.user.bsbhv;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.delete.DeleteRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequestBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractBehavior;
import org.codelibs.fess.es.user.allcommon.EsAbstractEntity.RequestOptionCall;
import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
@@ -32,9 +35,6 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.delete.DeleteRequestBuilder;
-import org.elasticsearch.action.index.IndexRequestBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
index 1b0c66099..fae2b0236 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsGroupCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.user.bsentity.dbmeta.GroupDbm;
import org.codelibs.fess.es.user.cbean.GroupCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsGroupCA;
import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
index 246f21c30..38dc8d188 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsRoleCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.user.bsentity.dbmeta.RoleDbm;
import org.codelibs.fess.es.user.cbean.RoleCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsRoleCA;
import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
index 35b6caca7..c5337b973 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/bs/BsUserCB.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionBean;
import org.codelibs.fess.es.user.bsentity.dbmeta.UserDbm;
import org.codelibs.fess.es.user.cbean.UserCB;
@@ -27,8 +29,6 @@ import org.codelibs.fess.es.user.cbean.ca.bs.BsUserCA;
import org.codelibs.fess.es.user.cbean.cq.UserCQ;
import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
import org.dbflute.cbean.ConditionQuery;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
index 041d93c96..3e26a6a21 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.user.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.user.cbean.ca.GroupCA;
import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
index c963f0bf9..712cb3c34 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
@@ -15,22 +15,22 @@
*/
package org.codelibs.fess.es.user.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.user.cbean.ca.RoleCA;
import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
index fb43a1865..a69f1d332 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
@@ -15,32 +15,32 @@
*/
package org.codelibs.fess.es.user.cbean.ca.bs;
+import org.codelibs.fesen.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.AvgAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MaxAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.MinAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.StatsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.SumAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.codelibs.fesen.search.aggregations.metrics.ValueCountAggregationBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionAggregation;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.user.cbean.ca.UserCA;
import org.codelibs.fess.es.user.cbean.cq.UserCQ;
import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
-import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.AvgAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.CardinalityAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.MinAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.PercentilesAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.StatsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.SumAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.ValueCountAggregationBuilder;
/**
* @author ESFlute (using FreeGen)
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 2d04f00a2..a09ba2e57 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 82a08c524..d780feaf0 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
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 8f0a411e7..64082f662 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
@@ -19,25 +19,25 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.CommonTermsQueryBuilder;
+import org.codelibs.fesen.index.query.ExistsQueryBuilder;
+import org.codelibs.fesen.index.query.IdsQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhrasePrefixQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.MatchQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.RegexpQueryBuilder;
+import org.codelibs.fesen.index.query.SpanTermQueryBuilder;
+import org.codelibs.fesen.index.query.TermQueryBuilder;
+import org.codelibs.fesen.index.query.TermsQueryBuilder;
+import org.codelibs.fesen.index.query.WildcardQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
import org.codelibs.fess.es.user.cbean.cq.UserCQ;
import org.dbflute.cbean.ckey.ConditionKey;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.CommonTermsQueryBuilder;
-import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.IdsQueryBuilder;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.RegexpQueryBuilder;
-import org.elasticsearch.index.query.SpanTermQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.TermsQueryBuilder;
-import org.elasticsearch.index.query.WildcardQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
/**
* @author ESFlute (using FreeGen)
diff --git a/src/main/java/org/codelibs/fess/exec/Crawler.java b/src/main/java/org/codelibs/fess/exec/Crawler.java
index 00c81e644..75caee062 100644
--- a/src/main/java/org/codelibs/fess/exec/Crawler.java
+++ b/src/main/java/org/codelibs/fess/exec/Crawler.java
@@ -44,10 +44,13 @@ import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.core.timer.TimeoutManager;
import org.codelibs.core.timer.TimeoutTask;
+import org.codelibs.fesen.monitor.jvm.JvmInfo;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.CrawlingInfoService;
import org.codelibs.fess.app.service.PathMappingService;
-import org.codelibs.fess.crawler.client.EsClient;
+import org.codelibs.fess.crawler.client.FesenClient;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.exception.ContainerNotAvailableException;
import org.codelibs.fess.helper.CrawlingInfoHelper;
@@ -62,9 +65,6 @@ import org.codelibs.fess.timer.SystemMonitorTarget;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.ThreadDumpUtil;
import org.dbflute.mail.send.hook.SMailCallbackContext;
-import org.elasticsearch.monitor.jvm.JvmInfo;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.process.ProcessProbe;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
@@ -209,7 +209,7 @@ public class Crawler {
final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
if (StringUtil.isNotBlank(httpAddress)) {
- System.setProperty(EsClient.HTTP_ADDRESS, httpAddress);
+ System.setProperty(FesenClient.HTTP_ADDRESS, httpAddress);
}
TimeoutTask systemMonitorTask = null;
diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
index bcedbddc0..1248b0399 100644
--- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
+++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
@@ -29,16 +29,16 @@ import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.core.timer.TimeoutManager;
import org.codelibs.core.timer.TimeoutTask;
+import org.codelibs.fesen.monitor.jvm.JvmInfo;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
import org.codelibs.fess.Constants;
-import org.codelibs.fess.crawler.client.EsClient;
+import org.codelibs.fess.crawler.client.FesenClient;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.exception.ContainerNotAvailableException;
import org.codelibs.fess.helper.SuggestHelper;
import org.codelibs.fess.timer.SystemMonitorTarget;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.monitor.jvm.JvmInfo;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.process.ProcessProbe;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
@@ -105,7 +105,7 @@ public class SuggestCreator {
final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
if (StringUtil.isNotBlank(httpAddress)) {
- System.setProperty(EsClient.HTTP_ADDRESS, httpAddress);
+ System.setProperty(FesenClient.HTTP_ADDRESS, httpAddress);
}
TimeoutTask systemMonitorTask = null;
diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
index 1779bc373..8253197e7 100644
--- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
@@ -29,15 +29,15 @@ import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.core.timer.TimeoutManager;
import org.codelibs.core.timer.TimeoutTask;
+import org.codelibs.fesen.monitor.jvm.JvmInfo;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
import org.codelibs.fess.Constants;
-import org.codelibs.fess.crawler.client.EsClient;
+import org.codelibs.fess.crawler.client.FesenClient;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.exception.ContainerNotAvailableException;
import org.codelibs.fess.timer.SystemMonitorTarget;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.monitor.jvm.JvmInfo;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.process.ProcessProbe;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.Option;
@@ -113,7 +113,7 @@ public class ThumbnailGenerator {
final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
if (StringUtil.isNotBlank(httpAddress)) {
- System.setProperty(EsClient.HTTP_ADDRESS, httpAddress);
+ System.setProperty(FesenClient.HTTP_ADDRESS, httpAddress);
}
TimeoutTask systemMonitorTask = null;
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index bc1b80a8e..397cdb0ce 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -31,6 +31,12 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.security.MessageDigestUtil;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.search.aggregations.AggregationBuilders;
+import org.codelibs.fesen.search.aggregations.BucketOrder;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms.Bucket;
+import org.codelibs.fesen.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.CrawlingInfoService;
import org.codelibs.fess.es.client.FessEsClient;
@@ -40,12 +46,6 @@ import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.BucketOrder;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
public class CrawlingInfoHelper {
private static final Logger logger = LogManager.getLogger(CrawlingInfoHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/CurlHelper.java b/src/main/java/org/codelibs/fess/helper/CurlHelper.java
index 4933028e8..c1e0b56ea 100644
--- a/src/main/java/org/codelibs/fess/helper/CurlHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CurlHelper.java
@@ -38,6 +38,6 @@ public class CurlHelper {
}
public CurlRequest request(final Method method, final String path) {
- return new CurlRequest(method, ResourceUtil.getElasticsearchHttpUrl() + path);
+ return new CurlRequest(method, ResourceUtil.getFesenHttpUrl() + path);
}
}
diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index b30ff1767..57e42f6b4 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -25,6 +25,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.FailureUrlService;
import org.codelibs.fess.ds.DataStore;
@@ -34,8 +36,6 @@ import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.es.config.exentity.DataConfig;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
public class DataIndexHelper {
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index 813ebaa0a..feb5f55a7 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -21,15 +21,15 @@ import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.thumbnail.ThumbnailManager;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocList;
import org.codelibs.fess.util.MemoryUtil;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
public class IndexingHelper {
private static final Logger logger = LogManager.getLogger(IndexingHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
index 1f80ceb42..c8cf23e7f 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -29,6 +29,12 @@ import org.codelibs.core.concurrent.CommonPoolUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
import org.codelibs.fess.es.client.FessEsClient;
@@ -38,12 +44,6 @@ import org.codelibs.fess.es.config.exentity.KeyMatch;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
public class KeyMatchHelper {
private static final Logger logger = LogManager.getLogger(KeyMatchHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
index ee4dc6247..49d4444c3 100644
--- a/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/LanguageHelper.java
@@ -26,10 +26,10 @@ import org.apache.logging.log4j.Logger;
import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.language.detect.LanguageResult;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.script.Script;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
-import org.elasticsearch.script.Script;
public class LanguageHelper {
private static final Logger logger = LogManager.getLogger(LanguageHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
index 8c2a56292..b6fe561ea 100644
--- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
@@ -53,6 +53,19 @@ import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.util.BytesRef;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.common.unit.Fuzziness;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.RangeQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
+import org.codelibs.fesen.search.rescore.RescorerBuilder;
+import org.codelibs.fesen.search.sort.SortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.FacetInfo;
import org.codelibs.fess.entity.GeoInfo;
@@ -64,19 +77,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.score.QueryRescorer;
import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalThing;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.common.unit.Fuzziness;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.RangeQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
-import org.elasticsearch.search.rescore.RescorerBuilder;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
import org.lastaflute.core.message.UserMessages;
import org.lastaflute.web.util.LaRequestUtil;
diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
index 782706d63..2e7bc1096 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
@@ -33,6 +33,15 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.FesenException;
+import org.codelibs.fesen.action.DocWriteResponse.Result;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.action.update.UpdateResponse;
+import org.codelibs.fesen.common.document.DocumentField;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.QueryContext;
import org.codelibs.fess.entity.SearchRenderData;
@@ -48,15 +57,6 @@ import org.codelibs.fess.util.QueryResponseList;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.action.DocWriteResponse.Result;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.common.document.DocumentField;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
import org.lastaflute.taglib.function.LaFunctions;
import org.lastaflute.web.util.LaRequestUtil;
@@ -330,7 +330,7 @@ public class SearchHelper {
builderLambda.accept(builder);
final UpdateResponse response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
return response.getResult() == Result.CREATED || response.getResult() == Result.UPDATED;
- } catch (final ElasticsearchException e) {
+ } catch (final FesenException e) {
throw new FessEsClientException("Failed to update doc " + id, e);
}
}
diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
index d51a6c46e..b60c66a4b 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -37,6 +37,8 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.concurrent.CommonPoolUtil;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.action.update.UpdateRequest;
+import org.codelibs.fesen.script.Script;
import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.SearchLogEvent;
import org.codelibs.fess.entity.SearchRequestParams;
@@ -55,8 +57,6 @@ import org.codelibs.fess.util.DocumentUtil;
import org.codelibs.fess.util.QueryResponseList;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
-import org.elasticsearch.action.update.UpdateRequest;
-import org.elasticsearch.script.Script;
import org.lastaflute.web.util.LaRequestUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index 86fbd3404..d14304579 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -37,6 +37,12 @@ import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.common.lucene.search.function.CombineFunction;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
+import org.codelibs.fesen.search.sort.SortBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.es.config.exbhv.BadWordBhv;
@@ -56,12 +62,6 @@ import org.codelibs.fess.suggest.settings.SuggestSettings;
import org.codelibs.fess.suggest.settings.SuggestSettingsBuilder;
import org.codelibs.fess.suggest.util.SuggestUtil;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.common.lucene.search.function.CombineFunction;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
-import org.elasticsearch.search.sort.SortBuilders;
public class SuggestHelper {
private static final Logger logger = LogManager.getLogger(SuggestHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index 1da1acf8a..8ceac2d2e 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -59,6 +59,7 @@ import org.codelibs.core.exception.IORuntimeException;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.core.misc.Pair;
+import org.codelibs.fesen.monitor.os.OsProbe;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.util.CharUtil;
import org.codelibs.fess.exception.FessSystemException;
@@ -70,7 +71,6 @@ import org.codelibs.fess.util.GsaConfigParser;
import org.codelibs.fess.util.ParameterUtil;
import org.codelibs.fess.util.ResourceUtil;
import org.codelibs.fess.validation.FessActionValidator;
-import org.elasticsearch.monitor.os.OsProbe;
import org.lastaflute.core.message.supplier.UserMessagesCreator;
import org.lastaflute.web.TypicalAction;
import org.lastaflute.web.response.HtmlResponse;
diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
index 047c4e05b..d443d86d0 100644
--- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
+++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
@@ -28,6 +28,10 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
+import org.codelibs.fesen.action.search.SearchRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.Crawler;
import org.codelibs.fess.crawler.entity.AccessResult;
@@ -56,10 +60,6 @@ import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocList;
import org.codelibs.fess.util.MemoryUtil;
import org.codelibs.fess.util.ThreadDumpUtil;
-import org.elasticsearch.action.search.SearchRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.search.sort.SortOrder;
public class IndexUpdater extends Thread {
private static final Logger logger = LogManager.getLogger(IndexUpdater.class);
diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java
index 9d6c06a83..63b4fc56f 100644
--- a/src/main/java/org/codelibs/fess/job/CrawlJob.java
+++ b/src/main/java/org/codelibs/fess/job/CrawlJob.java
@@ -244,7 +244,7 @@ public class CrawlJob extends ExecJob {
}
cmdList.add(buf.toString());
- if (useLocalElasticsearch) {
+ if (useLocalFesen) {
final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
if (StringUtil.isNotBlank(httpAddress)) {
cmdList.add("-D" + Constants.FESS_ES_HTTP_ADDRESS + "=" + httpAddress);
diff --git a/src/main/java/org/codelibs/fess/job/ExecJob.java b/src/main/java/org/codelibs/fess/job/ExecJob.java
index 1c56b8471..5dee8c1af 100644
--- a/src/main/java/org/codelibs/fess/job/ExecJob.java
+++ b/src/main/java/org/codelibs/fess/job/ExecJob.java
@@ -42,7 +42,7 @@ public abstract class ExecJob {
protected String sessionId;
- protected boolean useLocalElasticsearch = true;
+ protected boolean useLocalFesen = true;
protected String logFilePath;
@@ -90,8 +90,8 @@ public abstract class ExecJob {
return this;
}
- public ExecJob useLocalElasticsearch(final boolean useLocalElasticsearch) {
- this.useLocalElasticsearch = useLocalElasticsearch;
+ public ExecJob useLocalFesen(final boolean useLocalFesen) {
+ this.useLocalFesen = useLocalFesen;
return this;
}
diff --git a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
index 24c301faf..5fbaf2edc 100644
--- a/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
+++ b/src/main/java/org/codelibs/fess/job/GenerateThumbnailJob.java
@@ -141,7 +141,7 @@ public class GenerateThumbnailJob extends ExecJob {
}
cmdList.add(buf.toString());
- if (useLocalElasticsearch) {
+ if (useLocalFesen) {
final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
if (StringUtil.isNotBlank(httpAddress)) {
cmdList.add("-D" + Constants.FESS_ES_HTTP_ADDRESS + "=" + httpAddress);
diff --git a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
index 751cbe0ea..b61c0342f 100644
--- a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
+++ b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
@@ -17,11 +17,11 @@ package org.codelibs.fess.job;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
public class PurgeDocJob {
diff --git a/src/main/java/org/codelibs/fess/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java
index df50d2480..0d148e90e 100644
--- a/src/main/java/org/codelibs/fess/job/SuggestJob.java
+++ b/src/main/java/org/codelibs/fess/job/SuggestJob.java
@@ -128,7 +128,7 @@ public class SuggestJob extends ExecJob {
}
cmdList.add(buf.toString());
- if (useLocalElasticsearch) {
+ if (useLocalFesen) {
final String httpAddress = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS);
if (StringUtil.isNotBlank(httpAddress)) {
cmdList.add("-D" + Constants.FESS_ES_HTTP_ADDRESS + "=" + httpAddress);
diff --git a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
index 6c2d5bafa..354aa2bb7 100644
--- a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
+++ b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
@@ -22,14 +22,14 @@ import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.script.Script;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.helper.LabelTypeHelper;
import org.codelibs.fess.helper.LanguageHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.script.Script;
public class UpdateLabelJob {
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 b0641ddea..422256102 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -1679,10 +1679,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'elasticsearch.http.url'. <br>
* The value is, e.g. http://localhost:9201 <br>
- * comment: Elasticsearch
+ * comment: Fesen
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getElasticsearchHttpUrl();
+ String getFesenHttpUrl();
/**
* Get the value for the key 'app.cipher.algorism'. <br>
@@ -6878,7 +6878,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.DOMAIN_TITLE);
}
- public String getElasticsearchHttpUrl() {
+ public String getFesenHttpUrl() {
return get(FessConfig.ELASTICSEARCH_HTTP_URL);
}
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 a4d256ec8..ee70cfcc2 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
@@ -49,6 +49,9 @@ import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Pair;
import org.codelibs.core.misc.Tuple3;
import org.codelibs.core.misc.Tuple4;
+import org.codelibs.fesen.search.sort.SortBuilder;
+import org.codelibs.fesen.search.sort.SortBuilders;
+import org.codelibs.fesen.search.sort.SortOrder;
import org.codelibs.fess.Constants;
import org.codelibs.fess.exception.FessSystemException;
import org.codelibs.fess.helper.PermissionHelper;
@@ -59,9 +62,6 @@ import org.codelibs.fess.util.JvmUtil;
import org.codelibs.fess.util.PrunedTag;
import org.dbflute.optional.OptionalThing;
import org.dbflute.util.DfTypeUtil;
-import org.elasticsearch.search.sort.SortBuilder;
-import org.elasticsearch.search.sort.SortBuilders;
-import org.elasticsearch.search.sort.SortOrder;
import org.lastaflute.job.LaJob;
import org.lastaflute.job.subsidiary.JobConcurrentExec;
import org.lastaflute.web.validation.RequiredValidator;
diff --git a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
index 1b75c1fae..8a29d9cc3 100644
--- a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
@@ -18,11 +18,11 @@ package org.codelibs.fess.score;
import java.util.Map;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.search.rescore.QueryRescorerBuilder;
+import org.codelibs.fesen.search.rescore.RescorerBuilder;
import org.codelibs.fess.es.query.StoredLtrQueryBuilder;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.search.rescore.QueryRescorerBuilder;
-import org.elasticsearch.search.rescore.RescorerBuilder;
public class LtrQueryRescorer implements QueryRescorer {
diff --git a/src/main/java/org/codelibs/fess/score/QueryRescorer.java b/src/main/java/org/codelibs/fess/score/QueryRescorer.java
index b5cd28fba..24e3c149f 100644
--- a/src/main/java/org/codelibs/fess/score/QueryRescorer.java
+++ b/src/main/java/org/codelibs/fess/score/QueryRescorer.java
@@ -17,7 +17,7 @@ package org.codelibs.fess.score;
import java.util.Map;
-import org.elasticsearch.search.rescore.RescorerBuilder;
+import org.codelibs.fesen.search.rescore.RescorerBuilder;
public interface QueryRescorer {
RescorerBuilder<?> evaluate(final Map<String, Object> params);
diff --git a/src/main/java/org/codelibs/fess/score/ScoreBooster.java b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
index cf1577f54..d57bc5be3 100644
--- a/src/main/java/org/codelibs/fess/score/ScoreBooster.java
+++ b/src/main/java/org/codelibs/fess/score/ScoreBooster.java
@@ -22,17 +22,17 @@ import java.util.function.Function;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.action.bulk.BulkRequestBuilder;
+import org.codelibs.fesen.action.bulk.BulkResponse;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.action.update.UpdateRequestBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.script.Script;
+import org.codelibs.fesen.script.ScriptType;
+import org.codelibs.fesen.search.SearchHit;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.action.bulk.BulkRequestBuilder;
-import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.update.UpdateRequestBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.script.Script;
-import org.elasticsearch.script.ScriptType;
-import org.elasticsearch.search.SearchHit;
public abstract class ScoreBooster {
private static final Logger logger = LogManager.getLogger(ScoreBooster.class);
diff --git a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
index 8bff5114a..5d6af1c40 100644
--- a/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
+++ b/src/main/java/org/codelibs/fess/sso/aad/AzureAdAuthenticator.java
@@ -47,7 +47,7 @@ import org.codelibs.core.net.UuidUtil;
import org.codelibs.core.stream.StreamUtil;
import org.codelibs.curl.Curl;
import org.codelibs.curl.CurlResponse;
-import org.codelibs.elasticsearch.runner.net.EcrCurl;
+import org.codelibs.fesen.runner.net.EcrCurl;
import org.codelibs.fess.app.web.base.login.ActionResponseCredential;
import org.codelibs.fess.app.web.base.login.AzureAdCredential;
import org.codelibs.fess.app.web.base.login.AzureAdCredential.AzureAdUser;
diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
index e3dde7513..8be7266b4 100644
--- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
+++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -51,13 +51,13 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.pdfbox.util.DateConverter;
import org.codelibs.core.lang.StringUtil;
+import org.codelibs.fesen.common.joda.Joda;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
import org.codelibs.fess.entity.FacetQueryView;
import org.codelibs.fess.helper.ViewHelper;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.common.joda.Joda;
import org.lastaflute.di.util.LdiURLUtil;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.util.LaResponseUtil;
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index 1143e46ac..22b0d42b3 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -41,6 +41,7 @@ import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.lang.ThreadUtil;
import org.codelibs.core.misc.Tuple3;
+import org.codelibs.fesen.index.query.QueryBuilders;
import org.codelibs.fess.Constants;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv;
@@ -52,7 +53,6 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
import org.codelibs.fess.util.ResourceUtil;
-import org.elasticsearch.index.query.QueryBuilders;
import com.google.common.collect.Lists;
diff --git a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
index 4a6366efa..96f9dcf19 100644
--- a/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
+++ b/src/main/java/org/codelibs/fess/timer/SystemMonitorTarget.java
@@ -26,22 +26,22 @@ import org.apache.commons.text.StringEscapeUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.timer.TimeoutTarget;
+import org.codelibs.fesen.action.admin.cluster.node.stats.NodesStatsResponse;
+import org.codelibs.fesen.common.xcontent.ToXContent;
+import org.codelibs.fesen.common.xcontent.XContentBuilder;
+import org.codelibs.fesen.common.xcontent.XContentFactory;
+import org.codelibs.fesen.monitor.jvm.JvmStats;
+import org.codelibs.fesen.monitor.jvm.JvmStats.BufferPool;
+import org.codelibs.fesen.monitor.jvm.JvmStats.Classes;
+import org.codelibs.fesen.monitor.jvm.JvmStats.GarbageCollectors;
+import org.codelibs.fesen.monitor.jvm.JvmStats.Mem;
+import org.codelibs.fesen.monitor.jvm.JvmStats.Threads;
+import org.codelibs.fesen.monitor.os.OsProbe;
+import org.codelibs.fesen.monitor.os.OsStats;
+import org.codelibs.fesen.monitor.process.ProcessProbe;
import org.codelibs.fess.Constants;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.monitor.jvm.JvmStats;
-import org.elasticsearch.monitor.jvm.JvmStats.BufferPool;
-import org.elasticsearch.monitor.jvm.JvmStats.Classes;
-import org.elasticsearch.monitor.jvm.JvmStats.GarbageCollectors;
-import org.elasticsearch.monitor.jvm.JvmStats.Mem;
-import org.elasticsearch.monitor.jvm.JvmStats.Threads;
-import org.elasticsearch.monitor.os.OsProbe;
-import org.elasticsearch.monitor.os.OsStats;
-import org.elasticsearch.monitor.process.ProcessProbe;
public class SystemMonitorTarget implements TimeoutTarget {
private static final Logger logger = LogManager.getLogger(SystemMonitorTarget.class);
@@ -77,7 +77,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
appendOsStats(buf);
appendProcessStats(buf);
appendJvmStats(buf);
- appendElasticsearchStats(buf);
+ appendFesenStats(buf);
append(buf, "timestamp", System::currentTimeMillis);
buf.append('}');
@@ -175,7 +175,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
buf.append("},");
}
- private void appendElasticsearchStats(final StringBuilder buf) {
+ private void appendFesenStats(final StringBuilder buf) {
String stats = null;
try {
final FessEsClient esClient = ComponentUtil.getFessEsClient();
@@ -189,7 +189,7 @@ public class SystemMonitorTarget implements TimeoutTarget {
stats = ((ByteArrayOutputStream) out).toString(Constants.UTF_8);
}
} catch (final Exception e) {
- logger.debug("Failed to access Elasticsearch stats.", e);
+ logger.debug("Failed to access Fesen stats.", e);
}
buf.append("\"elasticsearch\":").append(stats).append(',');
}
diff --git a/src/main/java/org/codelibs/fess/util/EsUtil.java b/src/main/java/org/codelibs/fess/util/EsUtil.java
index 3acd5470b..caec98c46 100644
--- a/src/main/java/org/codelibs/fess/util/EsUtil.java
+++ b/src/main/java/org/codelibs/fess/util/EsUtil.java
@@ -21,10 +21,10 @@ import java.io.OutputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.elasticsearch.common.xcontent.ToXContent;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.codelibs.fesen.common.xcontent.ToXContent;
+import org.codelibs.fesen.common.xcontent.XContentBuilder;
+import org.codelibs.fesen.common.xcontent.XContentFactory;
+import org.codelibs.fesen.common.xcontent.XContentType;
public final class EsUtil {
diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java
index b091310b1..3c43c8f37 100644
--- a/src/main/java/org/codelibs/fess/util/FacetResponse.java
+++ b/src/main/java/org/codelibs/fess/util/FacetResponse.java
@@ -21,10 +21,10 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import org.codelibs.fesen.search.aggregations.Aggregations;
+import org.codelibs.fesen.search.aggregations.bucket.filter.Filter;
+import org.codelibs.fesen.search.aggregations.bucket.terms.Terms;
import org.codelibs.fess.Constants;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.aggregations.bucket.filter.Filter;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
import com.google.common.io.BaseEncoding;
diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
index 48e3794c1..eb1ee9c6e 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -28,18 +28,18 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.stream.StreamUtil;
+import org.codelibs.fesen.action.search.SearchResponse;
+import org.codelibs.fesen.common.document.DocumentField;
+import org.codelibs.fesen.common.text.Text;
+import org.codelibs.fesen.search.SearchHit;
+import org.codelibs.fesen.search.SearchHits;
+import org.codelibs.fesen.search.aggregations.Aggregations;
+import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightField;
import org.codelibs.fess.Constants;
import org.codelibs.fess.helper.QueryHelper;
import org.codelibs.fess.helper.ViewHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.dbflute.optional.OptionalEntity;
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.common.document.DocumentField;
-import org.elasticsearch.common.text.Text;
-import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
public class QueryResponseList implements List<Map<String, Object>> {
diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
index ba65693f1..6c92393d0 100644
--- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
@@ -42,13 +42,13 @@ public class ResourceUtil {
// nothing
}
- public static String getElasticsearchHttpUrl() {
+ public static String getFesenHttpUrl() {
final String url = System.getProperty("fess.es.http_address");
if (url != null) {
return url;
}
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return fessConfig.getElasticsearchHttpUrl();
+ return fessConfig.getFesenHttpUrl();
}
public static String getAppType() {
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index 2e1bc0bd2..3cd33819f 100644
--- a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
+++ b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
@@ -23,20 +23,20 @@ import org.apache.logging.log4j.Logger;
import org.codelibs.core.exception.ResourceNotFoundRuntimeException;
import org.codelibs.core.io.FileUtil;
import org.codelibs.curl.CurlResponse;
+import org.codelibs.fesen.action.ActionListener;
+import org.codelibs.fesen.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetFieldMappingsResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
+import org.codelibs.fesen.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.codelibs.fesen.action.admin.indices.mapping.put.PutMappingRequestBuilder;
+import org.codelibs.fesen.action.index.IndexRequest;
+import org.codelibs.fesen.action.support.master.AcknowledgedResponse;
+import org.codelibs.fesen.client.Client;
+import org.codelibs.fesen.client.IndicesAdminClient;
+import org.codelibs.fesen.cluster.metadata.MappingMetadata;
+import org.codelibs.fesen.common.collect.ImmutableOpenMap;
+import org.codelibs.fesen.common.xcontent.XContentType;
import org.codelibs.fess.mylasta.direction.FessConfig;
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
-import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
-import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
-import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.support.master.AcknowledgedResponse;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.IndicesAdminClient;
-import org.elasticsearch.cluster.metadata.MappingMetadata;
-import org.elasticsearch.common.collect.ImmutableOpenMap;
-import org.elasticsearch.common.xcontent.XContentType;
public final class UpgradeUtil {
private static final Logger logger = LogManager.getLogger(UpgradeUtil.class);
diff --git a/src/main/resources/crawler/es.xml b/src/main/resources/crawler/es.xml
index 1bc8475aa..ad2cfd0d7 100644
--- a/src/main/resources/crawler/es.xml
+++ b/src/main/resources/crawler/es.xml
@@ -3,6 +3,6 @@
"http://dbflute.org/meta/lastadi10.dtd">
<components>
<component name="esClient"
- class="org.codelibs.fess.crawler.client.EsClient">
+ class="org.codelibs.fess.crawler.client.FesenClient">
</component>
</components>
diff --git a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
index 4b012f379..91a0c8ff0 100644
--- a/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
+++ b/src/main/resources/fess_indices/.fess_config.scheduled_job/scheduled_job.bulk
@@ -15,7 +15,7 @@
{"index":{"_index":".fess_config.scheduled_job","_id":"reload_config"}}
{"name":"Config Reloader","target":"all","cronExpression":"*/10 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"systemHelper\").updateConfiguration();","jobLogging":false,"crawler":false,"available":true,"sortOrder":8,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
{"index":{"_index":".fess_config.scheduled_job","_id":"ping_es"}}
-{"name":"Ping Elasticsearch","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"pingEsJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":9,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
+{"name":"Ping Search Engine","target":"all","cronExpression":"* * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"pingEsJob\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":9,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
{"index":{"_index":".fess_config.scheduled_job","_id":"score_booster"}}
{"name":"Score Updater","target":"all","cronExpression":"0 * * * *","scriptType":"groovy","scriptData":"return container.getComponent(\"scoreUpdater\").execute();","jobLogging":false,"crawler":false,"available":true,"sortOrder":10,"createdBy":"system","createdTime":0,"updatedBy":"system","updatedTime":0}
{"index":{"_index":".fess_config.scheduled_job","_id":"label_updater"}}
diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
index 40510e102..4f48ba1bf 100644
--- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
@@ -26,12 +26,12 @@ import org.codelibs.fess.Constants;
import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
import org.codelibs.fess.unit.UnitFessTestCase;
import org.codelibs.fess.util.ComponentUtil;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.PrefixQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.codelibs.fesen.index.query.BoolQueryBuilder;
+import org.codelibs.fesen.index.query.MatchPhraseQueryBuilder;
+import org.codelibs.fesen.index.query.PrefixQueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilder;
+import org.codelibs.fesen.index.query.QueryBuilders;
+import org.codelibs.fesen.index.query.functionscore.ScoreFunctionBuilders;
public class QueryHelperTest extends UnitFessTestCase {
--
GitLab