From bcf23768f9ea0e96823d746fdb9a010f1aab6c9b Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Fri, 24 Dec 2021 17:05:03 +0900
Subject: [PATCH] fix #2614 replace with opensearch
---
plugin.xml | 26 +--
pom.xml | 20 +-
.../fess/api/json/JsonApiManager.java | 2 +-
.../fess/app/service/SearchLogService.java | 14 +-
.../maintenance/AdminMaintenanceAction.java | 2 +-
.../searchlist/AdminSearchlistAction.java | 4 +-
.../searchlist/ApiAdminSearchlistAction.java | 4 +-
.../codelibs/fess/dict/DictionaryManager.java | 6 +-
.../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 +-
.../fess/es/client/CrawlerEngineClient.java | 6 +-
.../fess/es/client/SearchEngineClient.java | 196 +++++++++---------
.../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 | 6 +-
.../codelibs/fess/exec/SuggestCreator.java | 6 +-
.../fess/exec/ThumbnailGenerator.java | 6 +-
.../fess/helper/CrawlingInfoHelper.java | 12 +-
.../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 +-
.../org/codelibs/fess/helper/ViewHelper.java | 4 +-
.../codelibs/fess/indexer/IndexUpdater.java | 8 +-
.../org/codelibs/fess/job/PurgeDocJob.java | 4 +-
.../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 | 8 +-
.../codelibs/fess/taglib/FessFunctions.java | 2 +-
.../fess/thumbnail/ThumbnailManager.java | 2 +-
.../fess/timer/SystemMonitorTarget.java | 26 +--
.../org/codelibs/fess/util/FacetResponse.java | 6 +-
.../codelibs/fess/util/QueryResponseList.java | 12 +-
.../org/codelibs/fess/util/ResourceUtil.java | 2 +-
.../codelibs/fess/util/SearchEngineUtil.java | 10 +-
.../org/codelibs/fess/util/UpgradeUtil.java | 26 +--
.../codelibs/fess/helper/QueryHelperTest.java | 12 +-
190 files changed, 1793 insertions(+), 1793 deletions(-)
diff --git a/plugin.xml b/plugin.xml
index 52d94f285..feaad4e97 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,7 +6,7 @@
<!-- 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="use.fesen" value="" />
+ <property name="use.opensearch" value="" />
<property name="name.prefix" value="elasticsearch" />
<target name="install.plugins">
@@ -16,38 +16,38 @@
<!-- analysis-extension -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+ <param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
<param name="plugin.name.prefix" value="${name.prefix}-" />
<param name="plugin.name" value="analysis-extension" />
- <param name="plugin.version" value="0.15.0" />
- <param name="plugin.zip.version" value="0.15.0" />
+ <param name="plugin.version" value="1.2.0" />
+ <param name="plugin.zip.version" value="1.2.0" />
</antcall>
<!-- analysis-fess -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+ <param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
<param name="plugin.name.prefix" value="${name.prefix}-" />
<param name="plugin.name" value="analysis-fess" />
- <param name="plugin.version" value="0.15.0" />
- <param name="plugin.zip.version" value="0.15.0" />
+ <param name="plugin.version" value="1.2.0" />
+ <param name="plugin.zip.version" value="1.2.0" />
</antcall>
<!-- configsync -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+ <param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
<param name="plugin.name.prefix" value="${name.prefix}-" />
<param name="plugin.name" value="configsync" />
- <param name="plugin.version" value="0.15.0" />
- <param name="plugin.zip.version" value="0.15.0" />
+ <param name="plugin.version" value="1.2.0" />
+ <param name="plugin.zip.version" value="1.2.0" />
</antcall>
<!-- minhash -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
- <param name="plugin.groupId" value="org/codelibs${use.fesen}" />
+ <param name="plugin.groupId" value="org/codelibs${use.opensearch}" />
<param name="plugin.name.prefix" value="${name.prefix}-" />
<param name="plugin.name" value="minhash" />
- <param name="plugin.version" value="0.15.0" />
- <param name="plugin.zip.version" value="0.15.0" />
+ <param name="plugin.version" value="1.2.0" />
+ <param name="plugin.zip.version" value="1.2.0" />
</antcall>
<antcall target="remove.jars" />
diff --git a/pom.xml b/pom.xml
index 6282acf92..a1e44cd49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,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/fesen/config</packaging.fess.dictionary.dir>
+ <packaging.fess.dictionary.dir>/var/lib/fess/config</packaging.fess.dictionary.dir>
</properties>
<profiles>
<profile>
@@ -215,8 +215,8 @@
<ant antfile="${basedir}/dbflute.xml" target="download.dbflute" />
<ant antfile="${basedir}/plugin.xml" target="install.plugins">
<property name="with.fess" value="true" />
- <property name="use.fesen" value="/fesen" />
- <property name="name.prefix" value="fesen" />
+ <property name="use.opensearch" value="/opensearch" />
+ <property name="name.prefix" value="opensearch" />
</ant>
<ant antfile="deps.xml" target="install.jars" />
<echo message="fess.version=${project.version}" file="${basedir}/src/main/webapp/WEB-INF/project.properties" />
@@ -972,16 +972,16 @@
<version>${log4j.version}</version>
</dependency>
- <!-- fesen -->
+ <!-- opensearch -->
<dependency>
- <groupId>org.codelibs.fesen</groupId>
- <artifactId>fesen-engine-server</artifactId>
- <version>${fesen.version}</version>
+ <groupId>org.opensearch</groupId>
+ <artifactId>opensearch</artifactId>
+ <version>${opensearch.version}</version>
</dependency>
<dependency>
- <groupId>org.codelibs.fesen</groupId>
- <artifactId>fesen-runner</artifactId>
- <version>${fesen.runner.version}</version>
+ <groupId>org.codelibs.opensearch</groupId>
+ <artifactId>opensearch-runner</artifactId>
+ <version>${opensearch.runner.version}</version>
<exclusions>
<exclusion>
<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 94b7d34a0..010ba1761 100644
--- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
@@ -34,7 +34,6 @@ 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;
@@ -60,6 +59,7 @@ 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.opensearch.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 59876e71c..0d8b8056c 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchLogService.java
@@ -33,13 +33,6 @@ 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;
@@ -60,6 +53,13 @@ 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.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.BucketOrder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramInterval;
+import org.opensearch.search.aggregations.bucket.histogram.Histogram;
+import org.opensearch.search.aggregations.bucket.terms.Terms;
+import org.opensearch.search.aggregations.metrics.Avg;
+import org.opensearch.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 8d49bc9e3..4736c9579 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
@@ -36,7 +36,6 @@ 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;
@@ -48,6 +47,7 @@ import org.lastaflute.web.Execute;
import org.lastaflute.web.response.ActionResponse;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.ruts.process.ActionRuntime;
+import org.opensearch.action.ActionListener;
public class AdminMaintenanceAction extends FessAdminAction {
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 f9412439b..ca36869a9 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,8 +27,6 @@ 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;
@@ -50,6 +48,8 @@ import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.validation.VaMessenger;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
/**
* @author shinsuke
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 18636d3cb..4db509cbb 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,8 +25,6 @@ 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;
@@ -45,6 +43,8 @@ import org.codelibs.fess.helper.SearchHelper;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.JsonResponse;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
/**
* @author shinsuke
diff --git a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
index eb59f6793..aed6b1db6 100644
--- a/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
+++ b/src/main/java/org/codelibs/fess/dict/DictionaryManager.java
@@ -29,9 +29,9 @@ 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.fesen.runner.net.FesenCurl;
import org.codelibs.fess.Constants;
import org.codelibs.fess.util.ComponentUtil;
+import org.codelibs.opensearch.runner.net.OpenSearchCurl;
import org.dbflute.optional.OptionalEntity;
public class DictionaryManager {
@@ -52,7 +52,7 @@ public class DictionaryManager {
public DictionaryFile<? extends DictionaryItem>[] getDictionaryFiles() {
try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("fields", "path,@timestamp")
.param("size", ComponentUtil.getFessConfig().getPageDictionaryMaxFetchSize()).execute()) {
- final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+ final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
@SuppressWarnings("unchecked")
final List<Map<String, Object>> fileList = (List<Map<String, Object>>) contentMap.get("file");
return fileList.stream().map(fileMap -> {
@@ -94,7 +94,7 @@ public class DictionaryManager {
// TODO use stream
try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_configsync/file").param("path", dictFile.getPath())
.body(FileUtil.readUTF8(file)).execute()) {
- final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+ final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
if (!Constants.TRUE.equalsIgnoreCase(contentMap.get("acknowledged").toString())) {
throw new DictionaryException("Failed to update " + dictFile.getPath());
}
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 2722a1cfe..fce3d510b 100644
--- a/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
@@ -31,7 +31,6 @@ 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;
@@ -52,6 +51,7 @@ import org.codelibs.fess.helper.IndexingHelper;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
import org.lastaflute.di.core.SingletonLaContainer;
+import org.opensearch.index.query.QueryBuilders;
public class FileListIndexUpdateCallbackImpl implements IndexUpdateCallback {
private static final Logger logger = LogManager.getLogger(FileListIndexUpdateCallbackImpl.class);
diff --git a/src/main/java/org/codelibs/fess/entity/FacetInfo.java b/src/main/java/org/codelibs/fess/entity/FacetInfo.java
index 0b513c180..e8d0da359 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.opensearch.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 97102bc16..38918be12 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -25,13 +25,13 @@ 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.lastaflute.core.message.UserMessages;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
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 11e42d3b6..2d37f1223 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.SearchEngineUtil;
+import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
+import org.opensearch.cluster.health.ClusterHealthStatus;
+import org.opensearch.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 8703cc22a..214d52517 100644
--- a/src/main/java/org/codelibs/fess/entity/QueryContext.java
+++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java
@@ -27,15 +27,15 @@ 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.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.search.sort.SortBuilder;
public class QueryContext {
diff --git a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
index fbd1ee0d8..c9632bb62 100644
--- a/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
@@ -16,14 +16,14 @@
package org.codelibs.fess.es.client;
import org.codelibs.core.lang.StringUtil;
-import org.codelibs.fesen.client.Client;
import org.codelibs.fesen.client.HttpClient;
-import org.codelibs.fesen.common.settings.Settings;
-import org.codelibs.fesen.common.settings.Settings.Builder;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.client.FesenClient;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.client.Client;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.settings.Settings.Builder;
public class CrawlerEngineClient extends FesenClient {
@Override
diff --git a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
index ae5f2f77a..b43527105 100644
--- a/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/SearchEngineClient.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.fesen.runner.FesenRunner.newConfigs;
+import static org.codelibs.opensearch.runner.OpenSearchRunner.newConfigs;
import java.io.File;
import java.io.IOException;
@@ -51,94 +51,7 @@ 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.fesen.FesenException;
-import org.codelibs.fesen.FesenStatusException;
-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.xcontent.XContentType;
-import org.codelibs.fesen.core.TimeValue;
-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.rest.RestStatus;
-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;
@@ -156,10 +69,97 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.BooleanFunction;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocMap;
+import org.codelibs.opensearch.runner.OpenSearchRunner;
+import org.codelibs.opensearch.runner.OpenSearchRunner.Configs;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.lastaflute.core.message.UserMessages;
import org.lastaflute.di.exception.ContainerInitFailureException;
+import org.opensearch.OpenSearchException;
+import org.opensearch.OpenSearchStatusException;
+import org.opensearch.action.ActionFuture;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.ActionRequest;
+import org.opensearch.action.ActionResponse;
+import org.opensearch.action.ActionType;
+import org.opensearch.action.DocWriteRequest;
+import org.opensearch.action.DocWriteRequest.OpType;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
+import org.opensearch.action.admin.indices.alias.IndicesAliasesRequestBuilder;
+import org.opensearch.action.admin.indices.create.CreateIndexResponse;
+import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.opensearch.action.admin.indices.flush.FlushResponse;
+import org.opensearch.action.admin.indices.get.GetIndexResponse;
+import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkItemResponse.Failure;
+import org.opensearch.action.bulk.BulkRequest;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequest;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.explain.ExplainRequest;
+import org.opensearch.action.explain.ExplainRequestBuilder;
+import org.opensearch.action.explain.ExplainResponse;
+import org.opensearch.action.fieldcaps.FieldCapabilitiesRequest;
+import org.opensearch.action.fieldcaps.FieldCapabilitiesRequestBuilder;
+import org.opensearch.action.fieldcaps.FieldCapabilitiesResponse;
+import org.opensearch.action.get.GetRequest;
+import org.opensearch.action.get.GetRequestBuilder;
+import org.opensearch.action.get.GetResponse;
+import org.opensearch.action.get.MultiGetRequest;
+import org.opensearch.action.get.MultiGetRequestBuilder;
+import org.opensearch.action.get.MultiGetResponse;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.ClearScrollRequest;
+import org.opensearch.action.search.ClearScrollRequestBuilder;
+import org.opensearch.action.search.ClearScrollResponse;
+import org.opensearch.action.search.MultiSearchRequest;
+import org.opensearch.action.search.MultiSearchRequestBuilder;
+import org.opensearch.action.search.MultiSearchResponse;
+import org.opensearch.action.search.SearchPhaseExecutionException;
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.search.SearchScrollRequest;
+import org.opensearch.action.search.SearchScrollRequestBuilder;
+import org.opensearch.action.support.WriteRequest.RefreshPolicy;
+import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.action.termvectors.MultiTermVectorsRequest;
+import org.opensearch.action.termvectors.MultiTermVectorsRequestBuilder;
+import org.opensearch.action.termvectors.MultiTermVectorsResponse;
+import org.opensearch.action.termvectors.TermVectorsRequest;
+import org.opensearch.action.termvectors.TermVectorsRequestBuilder;
+import org.opensearch.action.termvectors.TermVectorsResponse;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.client.AdminClient;
+import org.opensearch.client.Client;
+import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.common.collect.ImmutableOpenMap;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.settings.Settings.Builder;
+import org.opensearch.common.unit.TimeValue;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.index.query.InnerHitBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.rest.RestStatus;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.collapse.CollapseBuilder;
+import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.opensearch.threadpool.ThreadPool;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -175,7 +175,7 @@ public class SearchEngineClient implements Client {
private static final String CONFIG_INDEX_PREFIX = "fess_config";
- protected FesenRunner runner;
+ protected OpenSearchRunner runner;
protected Client client;
@@ -220,7 +220,7 @@ public class SearchEngineClient implements Client {
.name();
}
- public void setRunner(final FesenRunner runner) {
+ public void setRunner(final OpenSearchRunner runner) {
this.runner = runner;
}
@@ -251,7 +251,7 @@ public class SearchEngineClient implements Client {
httpAddress = org.codelibs.fess.util.ResourceUtil.getFesenHttpUrl();
break;
default:
- runner = new FesenRunner();
+ runner = new OpenSearchRunner();
final Configs config = newConfigs().clusterName(clusterName).numOfNode(1).useLogger();
final String esDir = System.getProperty("fess.es.dir");
if (esDir != null) {
@@ -648,8 +648,8 @@ public class SearchEngineClient implements Client {
} catch (final Exception e) {
cause = e;
}
- if (cause instanceof FesenStatusException) {
- final RestStatus status = ((FesenStatusException) cause).status();
+ if (cause instanceof OpenSearchStatusException) {
+ final RestStatus status = ((OpenSearchStatusException) cause).status();
switch (status) {
case UNAUTHORIZED:
logger.warn("[{}] Unauthorized access: {}", i, System.getProperty(Constants.FESS_ES_HTTP_ADDRESS), cause);
@@ -708,7 +708,7 @@ public class SearchEngineClient implements Client {
}
try {
client.close();
- } catch (final FesenException e) {
+ } catch (final OpenSearchException e) {
logger.warn("Failed to close Client: {}", client, e);
}
}
@@ -971,7 +971,7 @@ public class SearchEngineClient 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 FesenException e) {
+ } catch (final OpenSearchException e) {
throw new SearchEngineClientException("Failed to set " + value + " to " + field + " for doc " + id, e);
}
}
@@ -1016,7 +1016,7 @@ public class SearchEngineClient implements Client {
final ClusterHealthResponse response =
client.admin().cluster().prepareHealth().execute().actionGet(ComponentUtil.getFessConfig().getIndexHealthTimeout());
return new PingResponse(response);
- } catch (final FesenException e) {
+ } catch (final OpenSearchException e) {
throw new SearchEngineClientException("Failed to process a ping request.", e);
}
}
@@ -1331,7 +1331,7 @@ public class SearchEngineClient implements Client {
}
final Result result = response.getResult();
return result == Result.CREATED || result == Result.UPDATED;
- } catch (final FesenException e) {
+ } catch (final OpenSearchException e) {
throw new SearchEngineClientException("Failed to store: " + obj, e);
}
}
@@ -1351,7 +1351,7 @@ public class SearchEngineClient implements Client {
}
final DeleteResponse response = builder.execute().actionGet(ComponentUtil.getFessConfig().getIndexDeleteTimeout());
return response.getResult() == Result.DELETED;
- } catch (final FesenException e) {
+ } catch (final OpenSearchException e) {
throw new SearchEngineClientException("Failed to delete: " + index + "/" + id + "@" + seqNo + ":" + primaryTerm, e);
}
}
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 bac8b9998..b7b6c4741 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,23 +27,6 @@ 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;
@@ -58,6 +41,23 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.client.Client;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.search.SearchHit;
+import org.opensearch.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);
// ===================================================================================
- // Fesen
+ // OpenSearch
// ======
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 5b7cf13d0..94e7f8187 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.opensearch.index.query.QueryBuilder;
+import org.opensearch.search.aggregations.AbstractAggregationBuilder;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 69ea3af14..257b43e22 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,8 +15,6 @@
*/
package org.codelibs.fess.es.config.allcommon;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.core.TimeValue;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.chelper.HpCBPurpose;
import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -39,6 +37,8 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
import org.dbflute.jdbc.StatementConfig;
import org.dbflute.system.DBFluteSystem;
import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 475eb0c70..c00541496 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,32 +26,6 @@ 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;
@@ -64,6 +38,32 @@ import org.dbflute.dbmeta.name.ColumnRealName;
import org.dbflute.dbmeta.name.ColumnSqlName;
import org.dbflute.exception.InvalidQueryRegisteredException;
import org.dbflute.util.Srl;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.MoreLikeThisQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.search.sort.FieldSortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.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 e51f50233..5c78e18d5 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.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 f39ac422d..e600362d5 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 e792ed25f..e3ea7a898 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 870cb15c4..f7a6ba625 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 308b802cb..b9b32c841 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 a7b014af3..53a350cc0 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 6719c88ce..7a2f237ae 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 359085ba8..f243680bf 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 8e450bf06..576626361 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 44566968c..ae4e99cd5 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 48a7b5456..12cdafa85 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 a31e0cf4b..3e03d5cf0 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 35902dc7a..c9f86d69c 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 5ce104083..686facf24 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 bc29c7912..7b72d6b02 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 fdafc339f..d3301cd1d 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 e06fcf5ed..a94c46484 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 cb6338aa8..ef9ece225 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 39c4e0942..50606b484 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 75f69cf68..c05348ff8 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 514d8e166..efe375870 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 9e6aacb55..33a404f6a 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 2e8b635a4..60b0f0539 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 763f13e21..632f4a660 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 e0b3b24cd..ddbc36d01 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 c95afa505..1e0cd858a 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 fb23cb899..440144bca 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 d0da9231a..341419320 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 f1c3ee0c4..912be0bdd 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 441950bcc..ebfd82c3f 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 8454ed2e2..ef79f3697 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 69a2b61f7..c5dd18f81 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 049ce240d..a5c8ffb28 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 24a800a66..01458250f 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 381c4c820..ae91373cb 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 3cbc2607e..7c1a84d1a 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 05e646ef1..6cb485697 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 ebb85054c..1c138c0fe 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 98456d4e3..51c8fe9e2 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 8f8dba622..1714cae99 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 f6ad88573..448dbe1a4 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 b6f01c487..7dca53dfc 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 c818ed9cd..4d59e86a0 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 a1b2a2af0..f5c963659 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 77de3eb3c..60b73f68c 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 18cd1c895..7fc02cf86 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 830bedba5..b4e29266f 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 f10904eec..e172eaab0 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 508e5eed3..5e0d91c70 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 636db118c..a6b97fdc3 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 a0256c3f1..04f8a2c11 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 bbd703a38..452182ef7 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 bf25b63c3..7367122ac 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 c74afe967..c5bc611fc 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 1a9de8861..2f9b050b0 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 361441b75..cff30d739 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 2d8988bf6..56664d257 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 c3a0c4682..e6e179ffc 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 ddef827d7..3c0017abf 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 0f7cc7f31..edc6ed7c3 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 dc2d91419..2391c3401 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 17a9acdee..f49b2d929 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 fc9ad211d..dadb50566 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 9d4b84168..2dcd056fe 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 140350eea..d5eec0be2 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 58f6547a0..686f8fa31 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 420724ef9..1880cad5c 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 e78e3141e..f8bb9d9c2 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 025c325d6..76b935582 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 1f1b2ce37..e10022e10 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 de870bf56..6236bf1c3 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 1d2777613..a436254de 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 1c635725b..507e91410 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 82573fd08..d403675f5 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 b1ec27b84..4a23b5d55 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 514a1bd19..149390455 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 ca35994b9..8bad31e72 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 86d36447b..06655a3be 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 b384d3a78..b90da77bc 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 a3d0f8fd4..fc8c4f758 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 6d9f8dab9..62e5234da 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 85d5f71cb..b650f7f87 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 12a37864b..926c174b6 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 f6bbdc02a..d7901756b 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 da03e1003..973d460b9 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 f11c7ac69..615fb96cc 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 aef3e6fad..a5e08756a 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 5636e8b69..e5796fc78 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 571437ddd..e60652783 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 ff773cff6..81124e9c0 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 234734ab5..0fd446927 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 5775a1acc..494068d73 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 959897d49..73fa54f6c 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 d2d8a1e8e..14b03ee38 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 7a6051639..5ecd8b715 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 08243dd02..e1d795adb 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 808638548..a49fe9023 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 752f71ed8..9d54cbcb0 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 7d1050c3e..51df04627 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,23 +27,6 @@ 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;
@@ -58,6 +41,23 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.client.Client;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.search.SearchHit;
+import org.opensearch.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);
// ===================================================================================
- // Fesen
+ // OpenSearch
// ======
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 11e1739e7..58cd8fe05 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.opensearch.index.query.QueryBuilder;
+import org.opensearch.search.aggregations.AbstractAggregationBuilder;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 d152b55cb..e45a814e8 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,8 +15,6 @@
*/
package org.codelibs.fess.es.log.allcommon;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.core.TimeValue;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.chelper.HpCBPurpose;
import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -39,6 +37,8 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
import org.dbflute.jdbc.StatementConfig;
import org.dbflute.system.DBFluteSystem;
import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 e2e88d0b7..f9a8729e6 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,32 +26,6 @@ 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;
@@ -64,6 +38,32 @@ import org.dbflute.dbmeta.name.ColumnRealName;
import org.dbflute.dbmeta.name.ColumnSqlName;
import org.dbflute.exception.InvalidQueryRegisteredException;
import org.dbflute.util.Srl;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.MoreLikeThisQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.search.sort.FieldSortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.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 303adc1c3..7d7feaa34 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.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 f7a021fc0..5ea308c50 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 2e23f6623..15da407e0 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 4724e57e7..f04ddbacb 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 ad69c7705..c2f91007d 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 4ca2eb8b9..7112efe7b 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,9 +18,6 @@ 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;
@@ -34,6 +31,9 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 fa1cf0c98..4b3f3ace0 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 980e35e73..de16a3c2f 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 7e9c6096e..c16c9e6ae 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 340eb04aa..436d564a2 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 fd067694b..0c52d5950 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 d2d439261..042a7e7e9 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 9a5affd4b..7641c6eef 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 1b1636026..d3be567fb 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 7c9bd85fd..be9c16244 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 80c706e45..4527909d1 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 5d323333b..c364e845c 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 0d48d0d31..423b42c94 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 b56cf9e4c..95ad140b7 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.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;
+import org.opensearch.common.ParseField;
+import org.opensearch.common.io.stream.NamedWriteable;
+import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.common.xcontent.ObjectParser;
+import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.common.xcontent.XContentParser;
+import org.opensearch.index.query.AbstractQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.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 6e80e6444..addfe1c82 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,23 +27,6 @@ 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;
@@ -58,6 +41,23 @@ import org.dbflute.cbean.result.ListResultBean;
import org.dbflute.exception.FetchingOverSafetySizeException;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.ActionListener;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.admin.indices.refresh.RefreshResponse;
+import org.opensearch.action.bulk.BulkItemResponse;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.action.delete.DeleteResponse;
+import org.opensearch.action.index.IndexRequestBuilder;
+import org.opensearch.action.index.IndexResponse;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.client.Client;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.search.SearchHit;
+import org.opensearch.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);
// ===================================================================================
- // Fesen
+ // OpenSearch
// ======
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 9a84203f2..e17967b59 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.opensearch.index.query.QueryBuilder;
+import org.opensearch.search.aggregations.AbstractAggregationBuilder;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 ed98652d5..34ddb715c 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,8 +15,6 @@
*/
package org.codelibs.fess.es.user.allcommon;
-import org.codelibs.fesen.action.search.SearchRequestBuilder;
-import org.codelibs.fesen.core.TimeValue;
import org.dbflute.cbean.ConditionBean;
import org.dbflute.cbean.chelper.HpCBPurpose;
import org.dbflute.cbean.chelper.HpColumnSpHandler;
@@ -39,6 +37,8 @@ import org.dbflute.dbmeta.accessory.DerivedTypeHandler;
import org.dbflute.jdbc.StatementConfig;
import org.dbflute.system.DBFluteSystem;
import org.dbflute.twowaysql.style.BoundDateDisplayStyle;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 f23f7af64..7d5bc4232 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,32 +26,6 @@ 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;
@@ -64,6 +38,32 @@ import org.dbflute.dbmeta.name.ColumnRealName;
import org.dbflute.dbmeta.name.ColumnSqlName;
import org.dbflute.exception.InvalidQueryRegisteredException;
import org.dbflute.util.Srl;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.MoreLikeThisQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.search.sort.FieldSortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.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 0931923b2..90ccda015 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.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 db9ceb365..cd1713ffc 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 5f92053b2..111bd3f94 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 1797e6f34..ba89f3472 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 679ffcf0c..ae2bba7ff 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,9 +18,6 @@ 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;
@@ -35,6 +32,9 @@ import org.dbflute.cbean.result.PagingResultBean;
import org.dbflute.exception.IllegalBehaviorStateException;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.util.DfTypeUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.delete.DeleteRequestBuilder;
+import org.opensearch.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 adb0be592..5d2375470 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 42621f465..254aa00dc 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 bf1a5d225..27758527e 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,8 +19,6 @@ 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;
@@ -29,6 +27,8 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.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 9c309a8f4..7b66b21d3 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 3a9a16322..21cef0e85 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 65317353e..9a9cdc427 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.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.IpRangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.AvgAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.CardinalityAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ExtendedStatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MaxAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.MinAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentileRanksAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.PercentilesAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.ScriptedMetricAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.StatsAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
+import org.opensearch.search.aggregations.metrics.TopHitsAggregationBuilder;
+import org.opensearch.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 d457f702a..e1d2a194a 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 221d0984f..24eea5b21 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 1a4256e32..372a27e19 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.CommonTermsQueryBuilder;
+import org.opensearch.index.query.ExistsQueryBuilder;
+import org.opensearch.index.query.IdsQueryBuilder;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.MatchQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.RegexpQueryBuilder;
+import org.opensearch.index.query.SpanTermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermsQueryBuilder;
+import org.opensearch.index.query.WildcardQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.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 3750c8f05..e6cdb1be7 100644
--- a/src/main/java/org/codelibs/fess/exec/Crawler.java
+++ b/src/main/java/org/codelibs/fess/exec/Crawler.java
@@ -45,9 +45,6 @@ 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;
@@ -73,6 +70,9 @@ import org.lastaflute.core.mail.Postbox;
import org.lastaflute.di.core.external.GenericExternalContext;
import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
+import org.opensearch.monitor.jvm.JvmInfo;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.process.ProcessProbe;
public class Crawler {
diff --git a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
index d213982b5..1f23763ca 100644
--- a/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
+++ b/src/main/java/org/codelibs/fess/exec/SuggestCreator.java
@@ -29,9 +29,6 @@ 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.FesenClient;
import org.codelibs.fess.es.client.SearchEngineClient;
@@ -45,6 +42,9 @@ import org.kohsuke.args4j.Option;
import org.lastaflute.di.core.external.GenericExternalContext;
import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
+import org.opensearch.monitor.jvm.JvmInfo;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.process.ProcessProbe;
public class SuggestCreator {
diff --git a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
index 19d9fbe61..610c0ef8c 100644
--- a/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
+++ b/src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java
@@ -29,9 +29,6 @@ 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.FesenClient;
import org.codelibs.fess.es.client.SearchEngineClient;
@@ -44,6 +41,9 @@ import org.kohsuke.args4j.Option;
import org.lastaflute.di.core.external.GenericExternalContext;
import org.lastaflute.di.core.external.GenericExternalContextComponentDefRegister;
import org.lastaflute.di.core.factory.SingletonLaContainerFactory;
+import org.opensearch.monitor.jvm.JvmInfo;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.process.ProcessProbe;
public class ThumbnailGenerator {
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index 24b5b3732..aadf1226f 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -31,12 +31,6 @@ 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.SearchEngineClient;
@@ -46,6 +40,12 @@ 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.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.BucketOrder;
+import org.opensearch.search.aggregations.bucket.terms.Terms;
+import org.opensearch.search.aggregations.bucket.terms.Terms.Bucket;
+import org.opensearch.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/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index 926e31e73..df870552a 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -25,8 +25,6 @@ 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;
@@ -36,6 +34,8 @@ import org.codelibs.fess.es.client.SearchEngineClient;
import org.codelibs.fess.es.config.exentity.DataConfig;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.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 c2cb9b5f9..2a58399a7 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.SearchEngineClient;
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.opensearch.action.search.SearchResponse;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.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 3b029a5d3..7a4dacbdc 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -28,12 +28,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Tuple3;
-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.SearchEngineClient;
@@ -43,6 +37,12 @@ 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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
public class KeyMatchHelper extends AbstractConfigHelper {
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 0d2d4ca12..b6ba2612d 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.opensearch.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 7c097cb49..72202fc18 100644
--- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
@@ -54,19 +54,6 @@ 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;
@@ -80,6 +67,19 @@ import org.codelibs.fess.util.ComponentUtil;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.core.message.UserMessages;
import org.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.RangeQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.opensearch.search.rescore.RescorerBuilder;
+import org.opensearch.search.sort.SortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.search.sort.SortOrder;
public class QueryHelper {
private static final Logger logger = LogManager.getLogger(QueryHelper.class);
diff --git a/src/main/java/org/codelibs/fess/helper/SearchHelper.java b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
index df0f7c741..c28378908 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchHelper.java
@@ -33,15 +33,6 @@ 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;
@@ -60,6 +51,15 @@ import org.dbflute.optional.OptionalThing;
import org.dbflute.util.DfTypeUtil;
import org.lastaflute.taglib.function.LaFunctions;
import org.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.OpenSearchException;
+import org.opensearch.action.DocWriteResponse.Result;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.action.update.UpdateResponse;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
public class SearchHelper {
@@ -334,7 +334,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 FesenException e) {
+ } catch (final OpenSearchException e) {
throw new SearchEngineClientException("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 19cb106fc..0db22cd64 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -37,8 +37,6 @@ 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;
@@ -58,6 +56,8 @@ import org.codelibs.fess.util.QueryResponseList;
import org.dbflute.optional.OptionalEntity;
import org.dbflute.optional.OptionalThing;
import org.lastaflute.web.util.LaRequestUtil;
+import org.opensearch.action.update.UpdateRequest;
+import org.opensearch.script.Script;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
index 742d10830..5d67b48c0 100644
--- a/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SuggestHelper.java
@@ -38,12 +38,6 @@ 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.SearchEngineClient;
import org.codelibs.fess.es.config.exbhv.BadWordBhv;
@@ -63,6 +57,12 @@ 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.opensearch.common.lucene.search.function.CombineFunction;
+import org.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
+import org.opensearch.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 a7c1aa780..434e38c45 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -61,7 +61,6 @@ 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;
@@ -80,6 +79,7 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.util.LaServletContextUtil;
import org.lastaflute.web.validation.ActionValidator;
+import org.opensearch.monitor.os.OsProbe;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
diff --git a/src/main/java/org/codelibs/fess/helper/ViewHelper.java b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
index 8f6233367..e5f68c87d 100644
--- a/src/main/java/org/codelibs/fess/helper/ViewHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/ViewHelper.java
@@ -57,8 +57,6 @@ import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.core.stream.StreamUtil;
-import org.codelibs.fesen.common.text.Text;
-import org.codelibs.fesen.search.fetch.subphase.highlight.HighlightField;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.web.base.SearchForm;
import org.codelibs.fess.app.web.base.login.FessLoginAssist;
@@ -87,6 +85,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.util.LaResponseUtil;
import org.lastaflute.web.util.LaServletContextUtil;
+import org.opensearch.common.text.Text;
+import org.opensearch.search.fetch.subphase.highlight.HighlightField;
import com.github.jknack.handlebars.Context;
import com.github.jknack.handlebars.Handlebars;
diff --git a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
index eb1bbdc59..0b050da22 100644
--- a/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
+++ b/src/main/java/org/codelibs/fess/indexer/IndexUpdater.java
@@ -28,10 +28,6 @@ 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;
@@ -60,6 +56,10 @@ 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.opensearch.action.search.SearchRequestBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.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/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
index 633c70a92..d3d42745d 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.SearchEngineClient;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
public class PurgeDocJob {
diff --git a/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java b/src/main/java/org/codelibs/fess/job/UpdateLabelJob.java
index 4e39c6fe4..c4b717dc7 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.SearchEngineClient;
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.opensearch.index.query.QueryBuilder;
+import org.opensearch.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 360df1c53..cb7345bd3 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -1745,7 +1745,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'elasticsearch.type'. <br>
* The value is, e.g. default <br>
- * comment: Fesen
+ * comment: OpenSearch
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getFesenType();
@@ -1755,7 +1755,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
* The value is, e.g. http://localhost:9201 <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
- String getFesenHttpUrl();
+ String getOpenSearchHttpUrl();
/**
* Get the value for the key 'elasticsearch.username'. <br>
@@ -7210,7 +7210,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
return get(FessConfig.ELASTICSEARCH_TYPE);
}
- public String getFesenHttpUrl() {
+ public String getOpenSearchHttpUrl() {
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 90bf5ea3c..0ceff08c7 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
@@ -48,9 +48,6 @@ 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.helper.PermissionHelper;
import org.codelibs.fess.mylasta.action.FessUserBean;
@@ -67,6 +64,9 @@ import org.lastaflute.web.validation.theme.typed.DoubleTypeValidator;
import org.lastaflute.web.validation.theme.typed.FloatTypeValidator;
import org.lastaflute.web.validation.theme.typed.IntegerTypeValidator;
import org.lastaflute.web.validation.theme.typed.LongTypeValidator;
+import org.opensearch.search.sort.SortBuilder;
+import org.opensearch.search.sort.SortBuilders;
+import org.opensearch.search.sort.SortOrder;
public interface FessProp {
diff --git a/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java b/src/main/java/org/codelibs/fess/score/LtrQueryRescorer.java
index 631da12ef..c11d0f3a3 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.opensearch.search.rescore.QueryRescorerBuilder;
+import org.opensearch.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 fce8b45bd..7bf0c3e4c 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.codelibs.fesen.search.rescore.RescorerBuilder;
+import org.opensearch.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 d3134b11b..6996f9ce3 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.SearchEngineClient;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.action.bulk.BulkRequestBuilder;
+import org.opensearch.action.bulk.BulkResponse;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.action.update.UpdateRequestBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.script.Script;
+import org.opensearch.script.ScriptType;
+import org.opensearch.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 578630a0b..446b9462b 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,6 @@ 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.fesen.runner.net.FesenCurl;
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;
@@ -60,6 +59,7 @@ import org.codelibs.fess.sso.SsoAuthenticator;
import org.codelibs.fess.sso.SsoResponseType;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.DocumentUtil;
+import org.codelibs.opensearch.runner.net.OpenSearchCurl;
import org.dbflute.optional.OptionalEntity;
import org.lastaflute.web.login.credential.LoginCredential;
import org.lastaflute.web.response.ActionResponse;
@@ -369,7 +369,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
}
try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
.header("Accept", "application/json").execute()) {
- final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+ final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
}
@@ -453,7 +453,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
Curl.post(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
.header("Accept", "application/json").header("Content-type", "application/json")
.body("{\"securityEnabledOnly\":false}").execute()) {
- final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+ final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
}
@@ -497,7 +497,7 @@ public class AzureAdAuthenticator implements SsoAuthenticator {
}
try (CurlResponse response = Curl.get(url).header("Authorization", "Bearer " + user.getAuthenticationResult().getAccessToken())
.header("Accept", "application/json").execute()) {
- final Map<String, Object> contentMap = response.getContent(FesenCurl.jsonParser());
+ final Map<String, Object> contentMap = response.getContent(OpenSearchCurl.jsonParser());
if (logger.isDebugEnabled()) {
logger.debug("response: {}", contentMap);
}
diff --git a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
index 94336ac3f..82952ead9 100644
--- a/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
+++ b/src/main/java/org/codelibs/fess/taglib/FessFunctions.java
@@ -51,7 +51,6 @@ 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;
@@ -62,6 +61,7 @@ import org.lastaflute.di.util.LdiURLUtil;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.util.LaResponseUtil;
import org.lastaflute.web.util.LaServletContextUtil;
+import org.opensearch.common.joda.Joda;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
diff --git a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
index eacadca11..c3abcb059 100644
--- a/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
+++ b/src/main/java/org/codelibs/fess/thumbnail/ThumbnailManager.java
@@ -41,7 +41,6 @@ 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.SearchEngineClient;
import org.codelibs.fess.es.config.exbhv.ThumbnailQueueBhv;
@@ -53,6 +52,7 @@ 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.opensearch.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 8c4aaf548..cc2de9bbc 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.SearchEngineClient;
import org.codelibs.fess.util.ComponentUtil;
+import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;
+import org.opensearch.common.xcontent.ToXContent;
+import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.monitor.jvm.JvmStats;
+import org.opensearch.monitor.jvm.JvmStats.BufferPool;
+import org.opensearch.monitor.jvm.JvmStats.Classes;
+import org.opensearch.monitor.jvm.JvmStats.GarbageCollectors;
+import org.opensearch.monitor.jvm.JvmStats.Mem;
+import org.opensearch.monitor.jvm.JvmStats.Threads;
+import org.opensearch.monitor.os.OsProbe;
+import org.opensearch.monitor.os.OsStats;
+import org.opensearch.monitor.process.ProcessProbe;
public class SystemMonitorTarget implements TimeoutTarget {
private static final Logger logger = LogManager.getLogger(SystemMonitorTarget.class);
diff --git a/src/main/java/org/codelibs/fess/util/FacetResponse.java b/src/main/java/org/codelibs/fess/util/FacetResponse.java
index b52c20006..76954b80b 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.opensearch.search.aggregations.Aggregations;
+import org.opensearch.search.aggregations.bucket.filter.Filter;
+import org.opensearch.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 27c4c8aa6..4fca081c5 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -26,17 +26,17 @@ import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.core.stream.StreamUtil;
-import org.codelibs.fesen.action.search.SearchResponse;
-import org.codelibs.fesen.common.document.DocumentField;
-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.opensearch.action.search.SearchResponse;
+import org.opensearch.common.document.DocumentField;
+import org.opensearch.search.SearchHit;
+import org.opensearch.search.SearchHits;
+import org.opensearch.search.aggregations.Aggregations;
+import org.opensearch.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 ea63e12a4..d36b5afb9 100644
--- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java
+++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java
@@ -48,7 +48,7 @@ public class ResourceUtil {
return url;
}
final FessConfig fessConfig = ComponentUtil.getFessConfig();
- return fessConfig.getFesenHttpUrl();
+ return fessConfig.getOpenSearchHttpUrl();
}
public static String getAppType() {
diff --git a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
index 2d21e8fee..194848610 100644
--- a/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
+++ b/src/main/java/org/codelibs/fess/util/SearchEngineUtil.java
@@ -22,12 +22,12 @@ import java.util.function.Function;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-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;
-import org.codelibs.fesen.search.SearchHit;
import org.codelibs.fess.es.client.SearchEngineClient;
+import org.opensearch.common.xcontent.ToXContent;
+import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.search.SearchHit;
public final class SearchEngineUtil {
diff --git a/src/main/java/org/codelibs/fess/util/UpgradeUtil.java b/src/main/java/org/codelibs/fess/util/UpgradeUtil.java
index c87550868..11d28ffec 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.opensearch.action.ActionListener;
+import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse;
+import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
+import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
+import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
+import org.opensearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
+import org.opensearch.action.index.IndexRequest;
+import org.opensearch.action.support.master.AcknowledgedResponse;
+import org.opensearch.client.Client;
+import org.opensearch.client.IndicesAdminClient;
+import org.opensearch.cluster.metadata.MappingMetadata;
+import org.opensearch.common.collect.ImmutableOpenMap;
+import org.opensearch.common.xcontent.XContentType;
public final class UpgradeUtil {
private static final Logger logger = LogManager.getLogger(UpgradeUtil.class);
diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
index 1b19e226e..db51f0848 100644
--- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
@@ -22,16 +22,16 @@ import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.queryparser.ext.ExtendableQueryParser;
import org.codelibs.core.io.FileUtil;
import org.codelibs.core.misc.DynamicProperties;
-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;
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.opensearch.index.query.BoolQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.PrefixQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.query.functionscore.ScoreFunctionBuilders;
public class QueryHelperTest extends UnitFessTestCase {
--
GitLab