浏览代码

fix #2614 replace with opensearch

Shinsuke Sugaya 3 年之前
父节点
当前提交
bcf23768f9
共有 100 个文件被更改,包括 956 次插入956 次删除
  1. 13 13
      plugin.xml
  2. 10 10
      pom.xml
  3. 1 1
      src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
  4. 7 7
      src/main/java/org/codelibs/fess/app/service/SearchLogService.java
  5. 1 1
      src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java
  6. 2 2
      src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java
  7. 2 2
      src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java
  8. 3 3
      src/main/java/org/codelibs/fess/dict/DictionaryManager.java
  9. 1 1
      src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java
  10. 1 1
      src/main/java/org/codelibs/fess/entity/FacetInfo.java
  11. 3 3
      src/main/java/org/codelibs/fess/entity/GeoInfo.java
  12. 3 3
      src/main/java/org/codelibs/fess/entity/PingResponse.java
  13. 6 6
      src/main/java/org/codelibs/fess/entity/QueryContext.java
  14. 3 3
      src/main/java/org/codelibs/fess/es/client/CrawlerEngineClient.java
  15. 98 98
      src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
  16. 18 18
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
  17. 26 26
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
  18. 2 2
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionBean.java
  19. 26 26
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
  20. 2 2
      src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractEntity.java
  21. 2 2
      src/main/java/org/codelibs/fess/es/config/allcommon/EsPagingResultBean.java
  22. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsAccessTokenBhv.java
  23. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsBadWordBhv.java
  24. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsBoostDocumentRuleBhv.java
  25. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoBhv.java
  26. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsCrawlingInfoParamBhv.java
  27. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsDataConfigBhv.java
  28. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsDuplicateHostBhv.java
  29. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordBhv.java
  30. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsElevateWordToLabelBhv.java
  31. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFailureUrlBhv.java
  32. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileAuthenticationBhv.java
  33. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsFileConfigBhv.java
  34. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsJobLogBhv.java
  35. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsKeyMatchBhv.java
  36. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsLabelTypeBhv.java
  37. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsPathMappingBhv.java
  38. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedContentBhv.java
  39. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsRelatedQueryBhv.java
  40. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsRequestHeaderBhv.java
  41. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsRoleTypeBhv.java
  42. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsScheduledJobBhv.java
  43. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsThumbnailQueueBhv.java
  44. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebAuthenticationBhv.java
  45. 3 3
      src/main/java/org/codelibs/fess/es/config/bsbhv/BsWebConfigBhv.java
  46. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsAccessTokenCB.java
  47. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBadWordCB.java
  48. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsBoostDocumentRuleCB.java
  49. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoCB.java
  50. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsCrawlingInfoParamCB.java
  51. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDataConfigCB.java
  52. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsDuplicateHostCB.java
  53. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordCB.java
  54. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsElevateWordToLabelCB.java
  55. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFailureUrlCB.java
  56. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileAuthenticationCB.java
  57. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsFileConfigCB.java
  58. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsJobLogCB.java
  59. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsKeyMatchCB.java
  60. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsLabelTypeCB.java
  61. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsPathMappingCB.java
  62. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedContentCB.java
  63. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRelatedQueryCB.java
  64. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRequestHeaderCB.java
  65. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsRoleTypeCB.java
  66. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsScheduledJobCB.java
  67. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsThumbnailQueueCB.java
  68. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebAuthenticationCB.java
  69. 2 2
      src/main/java/org/codelibs/fess/es/config/cbean/bs/BsWebConfigCB.java
  70. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
  71. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
  72. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
  73. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
  74. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
  75. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
  76. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
  77. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
  78. 11 11
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
  79. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
  80. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
  81. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
  82. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
  83. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
  84. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
  85. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
  86. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedContentCA.java
  87. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRelatedQueryCA.java
  88. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
  89. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
  90. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
  91. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
  92. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
  93. 21 21
      src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
  94. 16 16
      src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
  95. 16 16
      src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
  96. 16 16
      src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
  97. 16 16
      src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
  98. 16 16
      src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
  99. 16 16
      src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
  100. 16 16
      src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java

+ 13 - 13
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" />

+ 10 - 10
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>

+ 1 - 1
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 {
 

+ 7 - 7
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 {
 

+ 1 - 1
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 {
 

+ 2 - 2
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

+ 2 - 2
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

+ 3 - 3
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());
                 }

+ 1 - 1
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);

+ 1 - 1
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);

+ 3 - 3
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 {
 

+ 3 - 3
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";

+ 6 - 6
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 {
 

+ 3 - 3
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

+ 98 - 98
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);
         }
     }

+ 18 - 18
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);

+ 26 - 26
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)

+ 2 - 2
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)

+ 26 - 26
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)

+ 2 - 2
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)

+ 2 - 2
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.

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 3 - 3
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 2 - 2
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 11 - 11
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 21 - 21
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)

+ 16 - 16
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)

+ 16 - 16
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)

+ 16 - 16
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)

+ 16 - 16
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)

+ 16 - 16
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)

+ 16 - 16
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)

+ 16 - 16
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)

部分文件因为文件数量过多而无法显示