diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java index af7b9ff2c..604c8b448 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/AccessTokenBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsAccessTokenBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class AccessTokenBhv extends BsAccessTokenBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java index 3333a1db6..0610ea363 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/BadWordBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsBadWordBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class BadWordBhv extends BsBadWordBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java index dc5c7c517..b3bf0de72 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/BoostDocumentRuleBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsBoostDocumentRuleBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class BoostDocumentRuleBhv extends BsBoostDocumentRuleBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java index 4e77f4709..88bf01e2c 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class CrawlingInfoBhv extends BsCrawlingInfoBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java index d6ea6dbde..68420924a 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/CrawlingInfoParamBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoParamBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class CrawlingInfoParamBhv extends BsCrawlingInfoParamBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java index 2292351e9..7ac60271b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsDataConfigBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class DataConfigBhv extends BsDataConfigBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToLabelBhv.java index ade393704..df62c2450 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToLabelBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToLabelBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsDataConfigToLabelBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class DataConfigToLabelBhv extends BsDataConfigToLabelBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToRoleBhv.java index 427016427..9e4b80c0a 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToRoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/DataConfigToRoleBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsDataConfigToRoleBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class DataConfigToRoleBhv extends BsDataConfigToRoleBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java index 97dec26ed..8b59c360f 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/DuplicateHostBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsDuplicateHostBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class DuplicateHostBhv extends BsDuplicateHostBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java index f96ce91c0..91c0be516 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsElevateWordBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class ElevateWordBhv extends BsElevateWordBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java index 84fa05141..ca7a935a3 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ElevateWordToLabelBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsElevateWordToLabelBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class ElevateWordToLabelBhv extends BsElevateWordToLabelBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java index 1a5663f70..e8ef947b1 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FailureUrlBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsFailureUrlBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class FailureUrlBhv extends BsFailureUrlBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java index a1fee2858..8709e0560 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FileAuthenticationBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsFileAuthenticationBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class FileAuthenticationBhv extends BsFileAuthenticationBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java index 40fa799c5..d56a34d11 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsFileConfigBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class FileConfigBhv extends BsFileConfigBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToLabelBhv.java index 38620e416..373cba13d 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToLabelBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToLabelBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsFileConfigToLabelBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class FileConfigToLabelBhv extends BsFileConfigToLabelBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToRoleBhv.java index b6db46923..7ef57adb0 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToRoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/FileConfigToRoleBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsFileConfigToRoleBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class FileConfigToRoleBhv extends BsFileConfigToRoleBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java index 97a106ed9..61c5880b3 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/JobLogBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsJobLogBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class JobLogBhv extends BsJobLogBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java index df78b9b9f..4eb5443aa 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/KeyMatchBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsKeyMatchBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class KeyMatchBhv extends BsKeyMatchBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/LabelToRoleBhv.java index dc33a5370..dfc02acff 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelToRoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/LabelToRoleBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsLabelToRoleBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class LabelToRoleBhv extends BsLabelToRoleBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java index 1dff34117..354454b5b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/LabelTypeBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsLabelTypeBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class LabelTypeBhv extends BsLabelTypeBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java index 5f9adb917..71141baeb 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/PathMappingBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsPathMappingBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class PathMappingBhv extends BsPathMappingBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java index be9693900..cdc2a7e3c 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RequestHeaderBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsRequestHeaderBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class RequestHeaderBhv extends BsRequestHeaderBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java index d803e566a..3e68a0d9b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RoleTypeBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsRoleTypeBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class RoleTypeBhv extends BsRoleTypeBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java index ebfbf0816..f87c14b0b 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ScheduledJobBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsScheduledJobBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class ScheduledJobBhv extends BsScheduledJobBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java index 35331a62b..0fa603d9f 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/ThumbnailQueueBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsThumbnailQueueBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class ThumbnailQueueBhv extends BsThumbnailQueueBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java index efb573a91..affb19ebf 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/WebAuthenticationBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsWebAuthenticationBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class WebAuthenticationBhv extends BsWebAuthenticationBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java index fd74c77d0..d6f2de7de 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsWebConfigBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class WebConfigBhv extends BsWebConfigBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToLabelBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToLabelBhv.java index 26f95da9c..0317ee4df 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToLabelBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToLabelBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsWebConfigToLabelBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class WebConfigToLabelBhv extends BsWebConfigToLabelBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToRoleBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToRoleBhv.java index ca9f7329a..177a67ce5 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToRoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/WebConfigToRoleBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.config.exbhv; import org.codelibs.fess.es.config.bsbhv.BsWebConfigToRoleBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class WebConfigToRoleBhv extends BsWebConfigToRoleBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexConfigIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java index 3e0028203..b9197d9bd 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/ClickLogBhv.java @@ -22,6 +22,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import org.codelibs.fess.es.log.bsbhv.BsClickLogBhv; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.util.DfTypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +33,11 @@ import org.slf4j.LoggerFactory; public class ClickLogBhv extends BsClickLogBhv { private static final Logger logger = LoggerFactory.getLogger(ClickLogBhv.class); + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexLogIndex(); + } + @Override protected LocalDateTime toLocalDateTime(final Object value) { if (value != null) { diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java index 870760419..d3763c0f4 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/FavoriteLogBhv.java @@ -22,6 +22,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import org.codelibs.fess.es.log.bsbhv.BsFavoriteLogBhv; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.util.DfTypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +33,11 @@ import org.slf4j.LoggerFactory; public class FavoriteLogBhv extends BsFavoriteLogBhv { private static final Logger logger = LoggerFactory.getLogger(FavoriteLogBhv.class); + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexLogIndex(); + } + @Override protected LocalDateTime toLocalDateTime(final Object value) { if (value != null) { diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchFieldLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchFieldLogBhv.java index 93694de38..a3e50757d 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchFieldLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchFieldLogBhv.java @@ -16,10 +16,14 @@ package org.codelibs.fess.es.log.exbhv; import org.codelibs.fess.es.log.bsbhv.BsSearchFieldLogBhv; +import org.codelibs.fess.util.ComponentUtil; /** * @author FreeGen */ public class SearchFieldLogBhv extends BsSearchFieldLogBhv { - + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexLogIndex(); + } } diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java index 81e4fc3a0..c4b73f128 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java @@ -22,6 +22,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import org.codelibs.fess.es.log.bsbhv.BsSearchLogBhv; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.util.DfTypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,6 +33,11 @@ import org.slf4j.LoggerFactory; public class SearchLogBhv extends BsSearchLogBhv { private static final Logger logger = LoggerFactory.getLogger(SearchLogBhv.class); + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexLogIndex(); + } + @Override protected LocalDateTime toLocalDateTime(final Object value) { if (value != null) { diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java index bc89d88cd..b6b51f260 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/UserInfoBhv.java @@ -22,6 +22,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import org.codelibs.fess.es.log.bsbhv.BsUserInfoBhv; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.util.DfTypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +34,11 @@ public class UserInfoBhv extends BsUserInfoBhv { private static final Logger logger = LoggerFactory.getLogger(UserInfoBhv.class); + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexLogIndex(); + } + @Override protected LocalDateTime toLocalDateTime(final Object value) { if (value != null) { diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java b/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java index a386f59ce..bae46f223 100644 --- a/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/exbhv/GroupBhv.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import org.codelibs.core.misc.Pair; import org.codelibs.fess.es.user.bsbhv.BsGroupBhv; import org.codelibs.fess.es.user.exentity.Group; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.exception.IllegalBehaviorStateException; import org.dbflute.util.DfTypeUtil; @@ -29,6 +30,11 @@ import org.dbflute.util.DfTypeUtil; */ public class GroupBhv extends BsGroupBhv { + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexUserIndex(); + } + @Override protected RESULT createEntity(final Map source, final Class entityType) { try { diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java b/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java index 7be28e235..3a10ac182 100644 --- a/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/exbhv/RoleBhv.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import org.codelibs.core.misc.Pair; import org.codelibs.fess.es.user.bsbhv.BsRoleBhv; import org.codelibs.fess.es.user.exentity.Role; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.exception.IllegalBehaviorStateException; import org.dbflute.util.DfTypeUtil; @@ -28,6 +29,11 @@ import org.dbflute.util.DfTypeUtil; * @author FreeGen */ public class RoleBhv extends BsRoleBhv { + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexUserIndex(); + } + @Override protected RESULT createEntity(final Map source, final Class entityType) { try { diff --git a/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java b/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java index 72921f51b..74d9e240c 100644 --- a/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java +++ b/src/main/java/org/codelibs/fess/es/user/exbhv/UserBhv.java @@ -21,6 +21,7 @@ import java.util.stream.Collectors; import org.codelibs.core.misc.Pair; import org.codelibs.fess.es.user.bsbhv.BsUserBhv; import org.codelibs.fess.es.user.exentity.User; +import org.codelibs.fess.util.ComponentUtil; import org.dbflute.exception.IllegalBehaviorStateException; import org.dbflute.util.DfTypeUtil; @@ -34,6 +35,11 @@ public class UserBhv extends BsUserBhv { private static final String PASSWORD = "password"; private static final String NAME = "name"; + @Override + protected String asEsIndex() { + return ComponentUtil.getFessConfig().getIndexUserIndex(); + } + @Override protected RESULT createEntity(final Map source, final Class entityType) { try { diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java index 224727e3f..5ee2067bf 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -420,6 +420,15 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. .crawler */ String INDEX_DOCUMENT_CRAWLER_INDEX = "index.document.crawler.index"; + /** The key of the configuration. e.g. .fess_config */ + String INDEX_CONFIG_INDEX = "index.config.index"; + + /** The key of the configuration. e.g. .fess_user */ + String INDEX_USER_INDEX = "index.user.index"; + + /** The key of the configuration. e.g. fess_log */ + String INDEX_LOG_INDEX = "index.log.index"; + /** The key of the configuration. e.g. lang,role,label,anchor */ String INDEX_ADMIN_ARRAY_FIELDS = "index.admin.array.fields"; @@ -2448,6 +2457,27 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ String getIndexDocumentCrawlerIndex(); + /** + * Get the value for the key 'index.config.index'.
+ * The value is, e.g. .fess_config
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getIndexConfigIndex(); + + /** + * Get the value for the key 'index.user.index'.
+ * The value is, e.g. .fess_user
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getIndexUserIndex(); + + /** + * Get the value for the key 'index.log.index'.
+ * The value is, e.g. fess_log
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getIndexLogIndex(); + /** * Get the value for the key 'index.admin.array.fields'.
* The value is, e.g. lang,role,label,anchor
@@ -5775,6 +5805,18 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction return get(FessConfig.INDEX_DOCUMENT_CRAWLER_INDEX); } + public String getIndexConfigIndex() { + return get(FessConfig.INDEX_CONFIG_INDEX); + } + + public String getIndexUserIndex() { + return get(FessConfig.INDEX_USER_INDEX); + } + + public String getIndexLogIndex() { + return get(FessConfig.INDEX_LOG_INDEX); + } + public String getIndexAdminArrayFields() { return get(FessConfig.INDEX_ADMIN_ARRAY_FIELDS); } @@ -7329,6 +7371,9 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction defaultMap.put(FessConfig.INDEX_DOCUMENT_TYPE, "doc"); defaultMap.put(FessConfig.INDEX_DOCUMENT_SUGGEST_INDEX, "fess"); defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_INDEX, ".crawler"); + defaultMap.put(FessConfig.INDEX_CONFIG_INDEX, ".fess_config"); + defaultMap.put(FessConfig.INDEX_USER_INDEX, ".fess_user"); + defaultMap.put(FessConfig.INDEX_LOG_INDEX, "fess_log"); defaultMap.put(FessConfig.INDEX_ADMIN_ARRAY_FIELDS, "lang,role,label,anchor"); defaultMap.put(FessConfig.INDEX_ADMIN_DATE_FIELDS, "expires,created,timestamp,last_modified"); defaultMap.put(FessConfig.INDEX_ADMIN_INTEGER_FIELDS, ""); diff --git a/src/main/resources/fess_config.properties b/src/main/resources/fess_config.properties index eea36c424..fee20a88a 100644 --- a/src/main/resources/fess_config.properties +++ b/src/main/resources/fess_config.properties @@ -197,6 +197,9 @@ index.document.update.index=fess.update index.document.type=doc index.document.suggest.index=fess index.document.crawler.index=.crawler +index.config.index=.fess_config +index.user.index=.fess_user +index.log.index=fess_log # doc management index.admin.array.fields=lang,role,label,anchor