fix #2857 Refactored package from org.codelibs.fess.es to org.codelibs.fess.opensearch

dbflute_fess/dfprop/esfluteMap.dfprop

@@ -1,6 +1,6 @@
 map:{
     # base package of generated classes
-    ; basePackage = org.codelibs.fess.es
+    ; basePackage = org.codelibs.fess.opensearch
 
     # base path to JSON resource, URL or relative path
     ; basePath = ../src/main/config/es

src/main/java/org/codelibs/fess/api/json/SearchApiManager.java

@@ -50,7 +50,6 @@ import org.codelibs.fess.entity.PingResponse;
 import org.codelibs.fess.entity.SearchRenderData;
 import org.codelibs.fess.entity.SearchRequestParams;
 import org.codelibs.fess.entity.SearchRequestParams.SearchRequestType;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidAccessTokenException;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
@@ -65,6 +64,7 @@ import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.helper.UserInfoHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.suggest.entity.SuggestItem;
 import org.codelibs.fess.suggest.request.suggest.SuggestRequestBuilder;
 import org.codelibs.fess.suggest.request.suggest.SuggestResponse;

src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java

@@ -22,10 +22,10 @@ import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.logic.AccessContextLogic;
 import org.codelibs.fess.app.service.ScheduledJobService;
-import org.codelibs.fess.es.config.exbhv.JobLogBhv;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.core.time.TimeManager;

src/main/java/org/codelibs/fess/app/job/ScriptExecutorJob.java

@@ -19,12 +19,12 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
-import org.codelibs.fess.es.config.exentity.JobLog;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.exception.ScheduledJobException;
 import org.codelibs.fess.helper.JobHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.job.JobExecutor;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.job.JobManager;
 import org.lastaflute.job.LaJob;

src/main/java/org/codelibs/fess/app/service/AccessTokenService.java

@@ -25,11 +25,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.AccessTokenPager;
-import org.codelibs.fess.es.config.cbean.AccessTokenCB;
-import org.codelibs.fess.es.config.exbhv.AccessTokenBhv;
-import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.exception.InvalidAccessTokenException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.AccessTokenCB;
+import org.codelibs.fess.opensearch.config.exbhv.AccessTokenBhv;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;

src/main/java/org/codelibs/fess/app/service/BadWordService.java

@@ -27,11 +27,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.BadWordPager;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.cbean.BadWordCB;
-import org.codelibs.fess.es.config.exbhv.BadWordBhv;
-import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.cbean.BadWordCB;
+import org.codelibs.fess.opensearch.config.exbhv.BadWordBhv;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;

src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java

@@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.BoostDocPager;
-import org.codelibs.fess.es.config.cbean.BoostDocumentRuleCB;
-import org.codelibs.fess.es.config.exbhv.BoostDocumentRuleBhv;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.BoostDocumentRuleCB;
+import org.codelibs.fess.opensearch.config.exbhv.BoostDocumentRuleBhv;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 

src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java

@@ -35,13 +35,13 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.CrawlingInfoPager;
-import org.codelibs.fess.es.config.cbean.CrawlingInfoCB;
-import org.codelibs.fess.es.config.exbhv.CrawlingInfoBhv;
-import org.codelibs.fess.es.config.exbhv.CrawlingInfoParamBhv;
-import org.codelibs.fess.es.config.exentity.CrawlingInfo;
-import org.codelibs.fess.es.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.CrawlingInfoCB;
+import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoBhv;
+import org.codelibs.fess.opensearch.config.exbhv.CrawlingInfoParamBhv;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfoParam;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.ListResultBean;

src/main/java/org/codelibs/fess/app/service/DataConfigService.java

@@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.DataConfigPager;
-import org.codelibs.fess.es.config.cbean.DataConfigCB;
-import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.DataConfigCB;
+import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;

src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java

@@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.DuplicateHostPager;
-import org.codelibs.fess.es.config.cbean.DuplicateHostCB;
-import org.codelibs.fess.es.config.exbhv.DuplicateHostBhv;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.DuplicateHostCB;
+import org.codelibs.fess.opensearch.config.exbhv.DuplicateHostBhv;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 

src/main/java/org/codelibs/fess/app/service/ElevateWordService.java

@@ -31,16 +31,16 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ElevateWordPager;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.cbean.ElevateWordCB;
-import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
-import org.codelibs.fess.es.config.exbhv.ElevateWordToLabelBhv;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
-import org.codelibs.fess.es.config.exentity.ElevateWordToLabel;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.cbean.ElevateWordCB;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordToLabelBhv;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWordToLabel;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.bhv.readable.EntityRowHandler;
 import org.dbflute.cbean.result.PagingResultBean;

src/main/java/org/codelibs/fess/app/service/FailureUrlService.java

@@ -26,13 +26,13 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FailureUrlPager;
-import org.codelibs.fess.es.config.cbean.FailureUrlCB;
-import org.codelibs.fess.es.config.exbhv.FailureUrlBhv;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.FailureUrlCB;
+import org.codelibs.fess.opensearch.config.exbhv.FailureUrlBhv;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java

@@ -20,12 +20,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
-import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 

src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java

@@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FileAuthPager;
-import org.codelibs.fess.es.config.cbean.FileAuthenticationCB;
-import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.FileAuthenticationCB;
+import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/FileConfigService.java

@@ -21,11 +21,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FileConfigPager;
-import org.codelibs.fess.es.config.cbean.FileConfigCB;
-import org.codelibs.fess.es.config.exbhv.FileAuthenticationBhv;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.FileConfigCB;
+import org.codelibs.fess.opensearch.config.exbhv.FileAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;

src/main/java/org/codelibs/fess/app/service/GroupService.java

@@ -22,11 +22,11 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.GroupPager;
-import org.codelibs.fess.es.user.cbean.GroupCB;
-import org.codelibs.fess.es.user.exbhv.GroupBhv;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
-import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.cbean.GroupCB;
+import org.codelibs.fess.opensearch.user.exbhv.GroupBhv;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
+import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/JobLogService.java

@@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.JobLogPager;
-import org.codelibs.fess.es.config.cbean.JobLogCB;
-import org.codelibs.fess.es.config.exbhv.JobLogBhv;
-import org.codelibs.fess.es.config.exentity.JobLog;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.JobLogCB;
+import org.codelibs.fess.opensearch.config.exbhv.JobLogBhv;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/KeyMatchService.java

@@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.KeyMatchPager;
-import org.codelibs.fess.es.config.cbean.KeyMatchCB;
-import org.codelibs.fess.es.config.exbhv.KeyMatchBhv;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.KeyMatchCB;
+import org.codelibs.fess.opensearch.config.exbhv.KeyMatchBhv;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 

src/main/java/org/codelibs/fess/app/service/LabelTypeService.java

@@ -21,11 +21,11 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.LabelTypePager;
-import org.codelibs.fess.es.config.cbean.LabelTypeCB;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.LabelTypeHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.LabelTypeCB;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/PathMappingService.java

@@ -22,10 +22,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.PathMapPager;
-import org.codelibs.fess.es.config.cbean.PathMappingCB;
-import org.codelibs.fess.es.config.exbhv.PathMappingBhv;
-import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.PathMappingCB;
+import org.codelibs.fess.opensearch.config.exbhv.PathMappingBhv;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/RelatedContentService.java

@@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RelatedContentPager;
-import org.codelibs.fess.es.config.cbean.RelatedContentCB;
-import org.codelibs.fess.es.config.exbhv.RelatedContentBhv;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RelatedContentCB;
+import org.codelibs.fess.opensearch.config.exbhv.RelatedContentBhv;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java

@@ -21,10 +21,10 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RelatedQueryPager;
-import org.codelibs.fess.es.config.cbean.RelatedQueryCB;
-import org.codelibs.fess.es.config.exbhv.RelatedQueryBhv;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RelatedQueryCB;
+import org.codelibs.fess.opensearch.config.exbhv.RelatedQueryBhv;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java

@@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ReqHeaderPager;
-import org.codelibs.fess.es.config.cbean.RequestHeaderCB;
-import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
-import org.codelibs.fess.es.config.exentity.RequestHeader;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RequestHeaderCB;
+import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 

src/main/java/org/codelibs/fess/app/service/RoleService.java

@@ -22,11 +22,11 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RolePager;
-import org.codelibs.fess.es.user.cbean.RoleCB;
-import org.codelibs.fess.es.user.exbhv.RoleBhv;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
-import org.codelibs.fess.es.user.exentity.Role;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.cbean.RoleCB;
+import org.codelibs.fess.opensearch.user.exbhv.RoleBhv;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/RoleTypeService.java

@@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RoleTypePager;
-import org.codelibs.fess.es.config.cbean.RoleTypeCB;
-import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
-import org.codelibs.fess.es.config.exentity.RoleType;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.RoleTypeCB;
+import org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv;
+import org.codelibs.fess.opensearch.config.exentity.RoleType;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 

src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java

@@ -22,10 +22,10 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SchedulerPager;
-import org.codelibs.fess.es.config.cbean.ScheduledJobCB;
-import org.codelibs.fess.es.config.exbhv.ScheduledJobBhv;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.ScheduledJobCB;
+import org.codelibs.fess.opensearch.config.exbhv.ScheduledJobBhv;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/SearchLogService.java

@@ -33,22 +33,22 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SearchLogPager;
-import org.codelibs.fess.es.log.allcommon.EsPagingResultBean;
-import org.codelibs.fess.es.log.cbean.ClickLogCB;
-import org.codelibs.fess.es.log.cbean.FavoriteLogCB;
-import org.codelibs.fess.es.log.cbean.SearchLogCB;
-import org.codelibs.fess.es.log.cbean.UserInfoCB;
-import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.es.log.exentity.ClickLog;
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
-import org.codelibs.fess.es.log.exentity.SearchLog;
-import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.log.allcommon.EsPagingResultBean;
+import org.codelibs.fess.opensearch.log.cbean.ClickLogCB;
+import org.codelibs.fess.opensearch.log.cbean.FavoriteLogCB;
+import org.codelibs.fess.opensearch.log.cbean.SearchLogCB;
+import org.codelibs.fess.opensearch.log.cbean.UserInfoCB;
+import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.dbflute.optional.OptionalEntity;
 import org.opensearch.search.aggregations.AggregationBuilders;

src/main/java/org/codelibs/fess/app/service/UserInfoService.java

@@ -15,8 +15,8 @@
  */
 package org.codelibs.fess.app.service;
 
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
 
 import jakarta.annotation.Resource;
 

src/main/java/org/codelibs/fess/app/service/UserService.java

@@ -22,11 +22,11 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.UserPager;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
-import org.codelibs.fess.es.user.cbean.UserCB;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
-import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.exception.FessUserNotFoundException;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.cbean.UserCB;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java

@@ -20,10 +20,10 @@ import java.util.List;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.WebAuthPager;
-import org.codelibs.fess.es.config.cbean.WebAuthenticationCB;
-import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.WebAuthenticationCB;
+import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/service/WebConfigService.java

@@ -21,12 +21,12 @@ import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.WebConfigPager;
-import org.codelibs.fess.es.config.cbean.WebConfigCB;
-import org.codelibs.fess.es.config.exbhv.RequestHeaderBhv;
-import org.codelibs.fess.es.config.exbhv.WebAuthenticationBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.cbean.WebConfigCB;
+import org.codelibs.fess.opensearch.config.exbhv.RequestHeaderBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebAuthenticationBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;

src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java

@@ -30,9 +30,9 @@ import org.codelibs.fess.app.pager.AccessTokenPager;
 import org.codelibs.fess.app.service.AccessTokenService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java

@@ -54,19 +54,19 @@ import org.codelibs.curl.CurlResponse;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.log.exbhv.ClickLogBhv;
-import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
-import org.codelibs.fess.es.log.exbhv.SearchLogBhv;
-import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
-import org.codelibs.fess.es.log.exentity.ClickLog;
-import org.codelibs.fess.es.log.exentity.FavoriteLog;
-import org.codelibs.fess.es.log.exentity.SearchLog;
-import org.codelibs.fess.es.log.exentity.UserInfo;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.log.exbhv.ClickLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.FavoriteLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.SearchLogBhv;
+import org.codelibs.fess.opensearch.log.exbhv.UserInfoBhv;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
+import org.codelibs.fess.opensearch.log.exentity.FavoriteLog;
+import org.codelibs.fess.opensearch.log.exentity.SearchLog;
+import org.codelibs.fess.opensearch.log.exentity.UserInfo;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.GsaConfigParser;
 import org.codelibs.fess.util.RenderDataUtil;

src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java

@@ -35,10 +35,10 @@ import org.codelibs.fess.app.pager.BadWordPager;
 import org.codelibs.fess.app.service.BadWordService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java

@@ -24,8 +24,8 @@ import org.codelibs.fess.app.pager.BoostDocPager;
 import org.codelibs.fess.app.service.BoostDocumentRuleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java

@@ -36,10 +36,10 @@ import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.ds.DataStoreFactory;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java

@@ -23,8 +23,8 @@ import org.codelibs.fess.app.pager.DuplicateHostPager;
 import org.codelibs.fess.app.service.DuplicateHostService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java

@@ -42,11 +42,11 @@ import org.codelibs.fess.app.service.ElevateWordService;
 import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SuggestHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java

@@ -30,9 +30,9 @@ import org.codelibs.fess.app.service.FileAuthenticationService;
 import org.codelibs.fess.app.service.FileConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java

@@ -32,10 +32,10 @@ import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java

@@ -27,8 +27,8 @@ import org.codelibs.fess.app.pager.GroupPager;
 import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.user.exentity.Group;
 import org.codelibs.fess.mylasta.action.FessMessages;
+import org.codelibs.fess.opensearch.user.exentity.Group;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java

@@ -27,9 +27,9 @@ import org.codelibs.fess.app.pager.KeyMatchPager;
 import org.codelibs.fess.app.service.KeyMatchService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
 import org.codelibs.fess.helper.KeyMatchHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java

@@ -31,9 +31,9 @@ import org.codelibs.fess.app.service.LabelTypeService;
 import org.codelibs.fess.app.service.RoleTypeService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java

@@ -37,8 +37,8 @@ import org.codelibs.curl.CurlResponse;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.mylasta.direction.FessConfig.SimpleImpl;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.SearchEngineUtil;
 import org.lastaflute.web.Execute;

src/main/java/org/codelibs/fess/app/web/admin/pathmap/AdminPathmapAction.java

@@ -23,8 +23,8 @@ import org.codelibs.fess.app.pager.PathMapPager;
 import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.PathMapping;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/relatedcontent/AdminRelatedcontentAction.java

@@ -24,8 +24,8 @@ import org.codelibs.fess.app.pager.RelatedContentPager;
 import org.codelibs.fess.app.service.RelatedContentService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/relatedquery/AdminRelatedqueryAction.java

@@ -31,8 +31,8 @@ import org.codelibs.fess.app.pager.RelatedQueryPager;
 import org.codelibs.fess.app.service.RelatedQueryService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/reqheader/AdminReqheaderAction.java

@@ -29,9 +29,9 @@ import org.codelibs.fess.app.service.RequestHeaderService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.RequestHeader;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java

@@ -25,7 +25,7 @@ import org.codelibs.fess.app.pager.RolePager;
 import org.codelibs.fess.app.service.RoleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java

@@ -26,9 +26,9 @@ import org.codelibs.fess.app.pager.SchedulerPager;
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
 import org.codelibs.fess.helper.ProcessHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/searchlist/AdminSearchlistAction.java

@@ -29,7 +29,6 @@ import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.entity.SearchRenderData;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.QueryHelper;
@@ -37,6 +36,7 @@ import org.codelibs.fess.helper.SearchHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.action.FessMessages;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -29,15 +29,15 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
-import org.codelibs.fess.es.config.exbhv.ElevateWordBhv;
-import org.codelibs.fess.es.config.exbhv.FileConfigBhv;
-import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
-import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
-import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
-import org.codelibs.fess.es.user.exbhv.RoleBhv;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exbhv.DataConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.ElevateWordBhv;
+import org.codelibs.fess.opensearch.config.exbhv.FileConfigBhv;
+import org.codelibs.fess.opensearch.config.exbhv.LabelTypeBhv;
+import org.codelibs.fess.opensearch.config.exbhv.RoleTypeBhv;
+import org.codelibs.fess.opensearch.config.exbhv.WebConfigBhv;
+import org.codelibs.fess.opensearch.user.exbhv.RoleBhv;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.UpgradeUtil;
 import org.codelibs.opensearch.runner.net.OpenSearchCurl;

src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java

@@ -33,8 +33,8 @@ import org.codelibs.fess.app.service.UserService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.base.login.FessLoginAssist;
-import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.mylasta.action.FessMessages;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/webauth/AdminWebauthAction.java

@@ -30,9 +30,9 @@ import org.codelibs.fess.app.service.WebAuthenticationService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java

@@ -33,10 +33,10 @@ import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.base.FessAdminAction;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigType;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigType;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java

@@ -31,10 +31,10 @@ import org.codelibs.fess.app.service.ScheduledJobService;
 import org.codelibs.fess.app.service.WebConfigService;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.crawler.util.CharUtil;
-import org.codelibs.fess.es.config.exentity.FileConfig;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.ProcessHelper;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.job.JobManager;
 import org.lastaflute.job.key.LaJobUnique;

src/main/java/org/codelibs/fess/app/web/api/admin/accesstoken/ApiAdminAccesstokenAction.java

@@ -35,8 +35,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.AccessToken;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.AccessToken;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/badword/ApiAdminBadwordAction.java

@@ -40,9 +40,9 @@ import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.BadWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.SuggestHelper;
+import org.codelibs.fess.opensearch.config.exentity.BadWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/boostdoc/ApiAdminBoostdocAction.java

@@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.BoostDocumentRule;
+import org.codelibs.fess.opensearch.config.exentity.BoostDocumentRule;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/crawlinginfo/ApiAdminCrawlinginfoAction.java

@@ -27,8 +27,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiLogResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.CrawlingInfo;
 import org.codelibs.fess.helper.ProcessHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingInfo;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/ApiAdminDataconfigAction.java

@@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/documents/ApiAdminDocumentsAction.java

@@ -29,10 +29,10 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiBulkResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
 import org.codelibs.fess.app.web.api.admin.searchlist.ApiAdminSearchlistAction;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.LanguageHelper;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;

src/main/java/org/codelibs/fess/app/web/api/admin/duplicatehost/ApiAdminDuplicatehostAction.java

@@ -31,7 +31,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.DuplicateHost;
+import org.codelibs.fess.opensearch.config.exentity.DuplicateHost;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/elevateword/ApiAdminElevatewordAction.java

@@ -43,10 +43,10 @@ import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.ElevateWord;
 import org.codelibs.fess.exception.FessSystemException;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SuggestHelper;
+import org.codelibs.fess.opensearch.config.exentity.ElevateWord;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/failureurl/ApiAdminFailureurlAction.java

@@ -27,8 +27,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiLogResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.FailureUrl;
 import org.codelibs.fess.helper.ProcessHelper;
+import org.codelibs.fess.opensearch.config.exentity.FailureUrl;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/fileauth/ApiAdminFileauthAction.java

@@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.FileAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.FileAuthentication;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/fileconfig/ApiAdminFileconfigAction.java

@@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.FileConfig;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.FileConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/group/ApiAdminGroupAction.java

@@ -28,8 +28,8 @@ import org.codelibs.fess.app.service.GroupService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.user.exentity.Group;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.Group;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/joblog/ApiAdminJoblogAction.java

@@ -27,7 +27,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiLogResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.JobLog;
+import org.codelibs.fess.opensearch.config.exentity.JobLog;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/keymatch/ApiAdminKeymatchAction.java

@@ -31,7 +31,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.KeyMatch;
+import org.codelibs.fess.opensearch.config.exentity.KeyMatch;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/labeltype/ApiAdminLabeltypeAction.java

@@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.LabelType;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.LabelType;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/pathmap/ApiAdminPathmapAction.java

@@ -28,7 +28,7 @@ import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.PathMapping;
+import org.codelibs.fess.opensearch.config.exentity.PathMapping;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/relatedcontent/ApiAdminRelatedcontentAction.java

@@ -31,7 +31,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedContent;
+import org.codelibs.fess.opensearch.config.exentity.RelatedContent;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/relatedquery/ApiAdminRelatedqueryAction.java

@@ -34,7 +34,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.RelatedQuery;
+import org.codelibs.fess.opensearch.config.exentity.RelatedQuery;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/reqheader/ApiAdminReqheaderAction.java

@@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.RequestHeader;
+import org.codelibs.fess.opensearch.config.exentity.RequestHeader;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/role/ApiAdminRoleAction.java

@@ -27,7 +27,7 @@ import org.codelibs.fess.app.service.RoleService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.user.exentity.Role;
+import org.codelibs.fess.opensearch.user.exentity.Role;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/scheduler/ApiAdminSchedulerAction.java

@@ -30,7 +30,7 @@ import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/searchlist/ApiAdminSearchlistAction.java

@@ -34,10 +34,10 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
 import org.codelibs.fess.entity.SearchRenderData;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.InvalidQueryException;
 import org.codelibs.fess.exception.ResultOffsetExceededException;
 import org.codelibs.fess.helper.SearchHelper;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/stats/ApiAdminStatsAction.java

@@ -24,7 +24,7 @@ import java.util.Locale;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.ApiResult.ApiStatsResponse;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/api/admin/user/ApiAdminUserAction.java

@@ -28,7 +28,7 @@ import org.codelibs.fess.app.service.UserService;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.app.web.api.ApiResult;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/webauth/ApiAdminWebauthAction.java

@@ -33,7 +33,7 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.WebAuthentication;
+import org.codelibs.fess.opensearch.config.exentity.WebAuthentication;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;
 

src/main/java/org/codelibs/fess/app/web/api/admin/webconfig/ApiAdminWebconfigAction.java

@@ -34,8 +34,8 @@ import org.codelibs.fess.app.web.api.ApiResult.ApiResponse;
 import org.codelibs.fess.app.web.api.ApiResult.ApiUpdateResponse;
 import org.codelibs.fess.app.web.api.ApiResult.Status;
 import org.codelibs.fess.app.web.api.admin.FessApiAdminAction;
-import org.codelibs.fess.es.config.exentity.WebConfig;
 import org.codelibs.fess.helper.PermissionHelper;
+import org.codelibs.fess.opensearch.config.exentity.WebConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.JsonResponse;

src/main/java/org/codelibs/fess/app/web/base/login/FessLoginAssist.java

@@ -23,10 +23,10 @@ import org.codelibs.fess.app.web.RootAction;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.app.web.login.LoginAction;
 import org.codelibs.fess.entity.FessUser;
-import org.codelibs.fess.es.user.exbhv.UserBhv;
 import org.codelibs.fess.exception.UserRoleLoginException;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.user.exbhv.UserBhv;
 import org.codelibs.fess.sso.SsoAuthenticator;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.optional.OptionalEntity;

src/main/java/org/codelibs/fess/app/web/go/GoAction.java

@@ -28,10 +28,10 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.base.FessSearchAction;
 import org.codelibs.fess.app.web.error.ErrorAction;
 import org.codelibs.fess.crawler.util.CharUtil;
-import org.codelibs.fess.es.log.exentity.ClickLog;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SearchLogHelper;
 import org.codelibs.fess.helper.ViewHelper;
+import org.codelibs.fess.opensearch.log.exentity.ClickLog;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 import org.dbflute.util.DfTypeUtil;

src/main/java/org/codelibs/fess/auth/AuthenticationManager.java

@@ -20,7 +20,7 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 import org.apache.commons.lang3.ArrayUtils;
 import org.codelibs.core.stream.StreamUtil.StreamOf;
 import org.codelibs.fess.auth.chain.AuthenticationChain;
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 
 public class AuthenticationManager {
 

src/main/java/org/codelibs/fess/auth/chain/AuthenticationChain.java

@@ -15,7 +15,7 @@
  */
 package org.codelibs.fess.auth.chain;
 
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 
 public interface AuthenticationChain {
 

src/main/java/org/codelibs/fess/auth/chain/CommandChain.java

@@ -34,8 +34,8 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
 import org.codelibs.fess.crawler.Constants;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
-import org.codelibs.fess.es.user.exentity.User;
 import org.codelibs.fess.exception.CommandExecutionException;
+import org.codelibs.fess.opensearch.user.exentity.User;
 
 public class CommandChain implements AuthenticationChain {
 

src/main/java/org/codelibs/fess/auth/chain/LdapChain.java

@@ -15,7 +15,7 @@
  */
 package org.codelibs.fess.auth.chain;
 
-import org.codelibs.fess.es.user.exentity.User;
+import org.codelibs.fess.opensearch.user.exentity.User;
 import org.codelibs.fess.util.ComponentUtil;
 
 public class LdapChain implements AuthenticationChain {

src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java

@@ -43,9 +43,6 @@ import org.codelibs.fess.crawler.entity.RequestData;
 import org.codelibs.fess.crawler.entity.ResponseData;
 import org.codelibs.fess.crawler.entity.UrlQueue;
 import org.codelibs.fess.crawler.log.LogType;
-import org.codelibs.fess.es.client.SearchEngineClient;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.exception.ContentNotFoundException;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
@@ -55,6 +52,9 @@ import org.codelibs.fess.helper.IndexingHelper;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocumentUtil;
 

src/main/java/org/codelibs/fess/crawler/service/FessUrlQueueService.java

@@ -23,9 +23,9 @@ import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.crawler.entity.EsUrlQueue;
 import org.codelibs.fess.crawler.service.impl.EsUrlQueueService;
 import org.codelibs.fess.crawler.util.EsCrawlerConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
 import org.codelibs.fess.util.ComponentUtil;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;

src/main/java/org/codelibs/fess/crawler/transformer/AbstractFessFileTransformer.java

@@ -45,9 +45,6 @@ import org.codelibs.fess.crawler.extractor.impl.TikaExtractor;
 import org.codelibs.fess.crawler.transformer.impl.AbstractTransformer;
 import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
 import org.codelibs.fess.crawler.util.FieldConfigs;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.DocumentHelper;
@@ -57,6 +54,9 @@ import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.PermissionHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
 import org.codelibs.fess.taglib.FessFunctions;
 import org.codelibs.fess.util.ComponentUtil;
 

src/main/java/org/codelibs/fess/crawler/transformer/FessXpathTransformer.java

@@ -46,7 +46,6 @@ import org.codelibs.core.io.SerializeUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.Pair;
 import org.codelibs.core.misc.ValueHolder;
-import org.codelibs.core.stream.StreamUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.builder.RequestDataBuilder;
 import org.codelibs.fess.crawler.entity.AccessResultData;
@@ -60,10 +59,6 @@ import org.codelibs.fess.crawler.exception.CrawlingAccessException;
 import org.codelibs.fess.crawler.transformer.impl.XpathTransformer;
 import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
 import org.codelibs.fess.crawler.util.FieldConfigs;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.ConfigName;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.Config;
-import org.codelibs.fess.es.config.exentity.CrawlingConfig.Param.XPath;
 import org.codelibs.fess.helper.CrawlingConfigHelper;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.DocumentHelper;
@@ -73,6 +68,10 @@ import org.codelibs.fess.helper.LabelTypeHelper;
 import org.codelibs.fess.helper.PathMappingHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.ConfigName;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.Config;
+import org.codelibs.fess.opensearch.config.exentity.CrawlingConfig.Param.XPath;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.PrunedTag;
 import org.codelibs.nekohtml.parsers.DOMParser;

src/main/java/org/codelibs/fess/ds/AbstractDataStore.java

@@ -32,10 +32,10 @@ import org.codelibs.core.misc.Pair;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.ds.callback.IndexUpdateCallback;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.config.exentity.DataConfig;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 import org.codelibs.fess.util.ComponentUtil;
 
 public abstract class AbstractDataStore implements DataStore {

src/main/java/org/codelibs/fess/ds/DataStore.java

@@ -17,7 +17,7 @@ package org.codelibs.fess.ds;
 
 import org.codelibs.fess.ds.callback.IndexUpdateCallback;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.config.exentity.DataConfig;
+import org.codelibs.fess.opensearch.config.exentity.DataConfig;
 
 public interface DataStore {
 

src/main/java/org/codelibs/fess/ds/callback/FileListIndexUpdateCallbackImpl.java

@@ -48,7 +48,6 @@ import org.codelibs.fess.crawler.rule.Rule;
 import org.codelibs.fess.crawler.rule.RuleManager;
 import org.codelibs.fess.crawler.transformer.Transformer;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.DataStoreCrawlingException;
 import org.codelibs.fess.helper.CrawlerStatsHelper;
 import org.codelibs.fess.helper.CrawlerStatsHelper.StatsAction;
@@ -56,6 +55,7 @@ import org.codelibs.fess.helper.CrawlerStatsHelper.StatsKeyObject;
 import org.codelibs.fess.helper.IndexingHelper;
 import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.di.core.SingletonLaContainer;
 import org.opensearch.index.query.QueryBuilders;

src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java

@@ -24,7 +24,6 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.stream.StreamUtil;
 import org.codelibs.fess.entity.DataStoreParams;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.DataStoreException;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.IndexingHelper;
@@ -33,6 +32,7 @@ import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.ingest.IngestFactory;
 import org.codelibs.fess.ingest.Ingester;
 import org.codelibs.fess.mylasta.direction.FessConfig;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.DocumentUtil;

src/main/java/org/codelibs/fess/exception/JobNotFoundException.java

@@ -15,7 +15,7 @@
  */
 package org.codelibs.fess.exception;
 
-import org.codelibs.fess.es.config.exentity.ScheduledJob;
+import org.codelibs.fess.opensearch.config.exentity.ScheduledJob;
 
 public class JobNotFoundException extends FessSystemException {
 

src/main/java/org/codelibs/fess/exec/Crawler.java

@@ -47,7 +47,6 @@ import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.service.CrawlingInfoService;
 import org.codelibs.fess.app.service.PathMappingService;
 import org.codelibs.fess.crawler.client.FesenClient;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.CrawlingInfoHelper;
 import org.codelibs.fess.helper.DataIndexHelper;
@@ -58,6 +57,7 @@ import org.codelibs.fess.helper.SystemHelper;
 import org.codelibs.fess.helper.WebFsIndexHelper;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.mylasta.mail.CrawlerPostcard;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.timer.HotThreadMonitorTarget;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;

src/main/java/org/codelibs/fess/exec/SuggestCreator.java

@@ -29,9 +29,9 @@ import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.client.FesenClient;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
 import org.codelibs.fess.helper.SuggestHelper;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.SystemUtil;

src/main/java/org/codelibs/fess/exec/ThumbnailGenerator.java

@@ -29,8 +29,8 @@ import org.codelibs.core.timer.TimeoutManager;
 import org.codelibs.core.timer.TimeoutTask;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.crawler.client.FesenClient;
-import org.codelibs.fess.es.client.SearchEngineClient;
 import org.codelibs.fess.exception.ContainerNotAvailableException;
+import org.codelibs.fess.opensearch.client.SearchEngineClient;
 import org.codelibs.fess.timer.SystemMonitorTarget;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.SystemUtil;