diff --git a/pom.xml b/pom.xml index 29f1a6106..0a7bbf581 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 6.0.0-rc1 6.0.0 - 6.0.0.0-rc1 + 6.0.0.0-SNAPSHOT 8.5.21 @@ -1160,6 +1160,10 @@ org.elasticsearch.plugin transport-netty4-client + + org.elasticsearch.plugin + parent-join-client + diff --git a/src/main/java/org/codelibs/fess/ds/impl/JsonDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/JsonDataStoreImpl.java index 792dd515a..ae3d767d7 100644 --- a/src/main/java/org/codelibs/fess/ds/impl/JsonDataStoreImpl.java +++ b/src/main/java/org/codelibs/fess/ds/impl/JsonDataStoreImpl.java @@ -17,8 +17,18 @@ package org.codelibs.fess.ds.impl; import static org.codelibs.core.stream.StreamUtil.stream; -import java.io.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java index 53a40f00c..61b6a5ed1 100644 --- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java +++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java @@ -326,17 +326,16 @@ public class FessEsClient implements Client { } } } else { - switch (configIndex) { - case ".fess_config": - indexName = fessConfig.getIndexConfigIndex(); - break; - case ".fess_user": - indexName = fessConfig.getIndexUserIndex(); - break; - case "fess_log": - indexName = fessConfig.getIndexLogIndex(); - break; - default: + if (configIndex.startsWith(".fess_config")) { + final String name = fessConfig.getIndexConfigIndex(); + indexName = configIndex.replaceFirst(Pattern.quote(".fess_config"), name); + } else if (configIndex.startsWith(".fess_user")) { + final String name = fessConfig.getIndexUserIndex(); + indexName = configIndex.replaceFirst(Pattern.quote(".fess_config"), name); + } else if (configIndex.startsWith("fess_log")) { + final String name = fessConfig.getIndexLogIndex(); + indexName = configIndex.replaceFirst(Pattern.quote(".fess_config"), name); + } else { throw new FessSystemException("Unknown config index: " + configIndex); } final boolean exists = existsIndex(indexName); 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 604c8b448..723e0103a 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsAccessTokenBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class AccessTokenBhv extends BsAccessTokenBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 0610ea363..3a2e49ccf 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsBadWordBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class BadWordBhv extends BsBadWordBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 b3bf0de72..6af89ae08 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsBoostDocumentRuleBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class BoostDocumentRuleBhv extends BsBoostDocumentRuleBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 88bf01e2c..3170e5ad5 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class CrawlingInfoBhv extends BsCrawlingInfoBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 68420924a..ffa26ee52 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsCrawlingInfoParamBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class CrawlingInfoParamBhv extends BsCrawlingInfoParamBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 7ac60271b..05eac8eb3 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsDataConfigBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class DataConfigBhv extends BsDataConfigBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 df62c2450..7f70a6fec 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsDataConfigToLabelBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class DataConfigToLabelBhv extends BsDataConfigToLabelBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 9e4b80c0a..d6acb9ea8 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsDataConfigToRoleBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class DataConfigToRoleBhv extends BsDataConfigToRoleBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 8b59c360f..3a1a09d6e 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsDuplicateHostBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class DuplicateHostBhv extends BsDuplicateHostBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 91c0be516..0897ec378 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsElevateWordBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class ElevateWordBhv extends BsElevateWordBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 ca7a935a3..3c4cc8e31 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsElevateWordToLabelBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class ElevateWordToLabelBhv extends BsElevateWordToLabelBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 e8ef947b1..56c7e136f 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsFailureUrlBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class FailureUrlBhv extends BsFailureUrlBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 8709e0560..8fa85cde1 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsFileAuthenticationBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class FileAuthenticationBhv extends BsFileAuthenticationBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 d56a34d11..2688fb911 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsFileConfigBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class FileConfigBhv extends BsFileConfigBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 373cba13d..bee8405ee 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsFileConfigToLabelBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class FileConfigToLabelBhv extends BsFileConfigToLabelBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 7ef57adb0..5a9297219 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsFileConfigToRoleBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class FileConfigToRoleBhv extends BsFileConfigToRoleBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 61c5880b3..be1b0fb5e 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsJobLogBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class JobLogBhv extends BsJobLogBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 4eb5443aa..40e6cc101 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsKeyMatchBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class KeyMatchBhv extends BsKeyMatchBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 dfc02acff..f9e62c194 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsLabelToRoleBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class LabelToRoleBhv extends BsLabelToRoleBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 354454b5b..5a3d2134f 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsLabelTypeBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class LabelTypeBhv extends BsLabelTypeBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 71141baeb..a05d77fc7 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsPathMappingBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class PathMappingBhv extends BsPathMappingBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java index 25bd0e19c..c57c188c3 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedContentBhv.java @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsRelatedContentBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class RelatedContentBhv extends BsRelatedContentBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } diff --git a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java index 7d0de6c29..14612704f 100644 --- a/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java +++ b/src/main/java/org/codelibs/fess/es/config/exbhv/RelatedQueryBhv.java @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsRelatedQueryBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class RelatedQueryBhv extends BsRelatedQueryBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 cdc2a7e3c..904b307e6 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsRequestHeaderBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class RequestHeaderBhv extends BsRequestHeaderBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 3e68a0d9b..4959ac0ee 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsRoleTypeBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class RoleTypeBhv extends BsRoleTypeBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 f87c14b0b..5e4f41562 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsScheduledJobBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class ScheduledJobBhv extends BsScheduledJobBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 0fa603d9f..e59aeaee9 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsThumbnailQueueBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class ThumbnailQueueBhv extends BsThumbnailQueueBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 affb19ebf..6a4832e3e 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsWebAuthenticationBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class WebAuthenticationBhv extends BsWebAuthenticationBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 d6f2de7de..a989f0f43 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsWebConfigBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class WebConfigBhv extends BsWebConfigBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 0317ee4df..e052045ee 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsWebConfigToLabelBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class WebConfigToLabelBhv extends BsWebConfigToLabelBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 177a67ce5..f49d86f1c 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 @@ -15,6 +15,8 @@ */ package org.codelibs.fess.es.config.exbhv; +import java.util.regex.Pattern; + import org.codelibs.fess.es.config.bsbhv.BsWebConfigToRoleBhv; import org.codelibs.fess.util.ComponentUtil; @@ -22,8 +24,14 @@ import org.codelibs.fess.util.ComponentUtil; * @author FreeGen */ public class WebConfigToRoleBhv extends BsWebConfigToRoleBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexConfigIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexConfigIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name); + } + return indexName; } } 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 b9197d9bd..84ac1ee0f 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 @@ -20,6 +20,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; +import java.util.regex.Pattern; import org.codelibs.fess.es.log.bsbhv.BsClickLogBhv; import org.codelibs.fess.util.ComponentUtil; @@ -33,9 +34,15 @@ import org.slf4j.LoggerFactory; public class ClickLogBhv extends BsClickLogBhv { private static final Logger logger = LoggerFactory.getLogger(ClickLogBhv.class); + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexLogIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexLogIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_log"), name); + } + return indexName; } @Override 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 d3763c0f4..89ff3c315 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 @@ -20,6 +20,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; +import java.util.regex.Pattern; import org.codelibs.fess.es.log.bsbhv.BsFavoriteLogBhv; import org.codelibs.fess.util.ComponentUtil; @@ -33,9 +34,15 @@ import org.slf4j.LoggerFactory; public class FavoriteLogBhv extends BsFavoriteLogBhv { private static final Logger logger = LoggerFactory.getLogger(FavoriteLogBhv.class); + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexLogIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexLogIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_log"), name); + } + return indexName; } @Override 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 0d3f7f4f7..11b720694 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 java.util.List; import java.util.Map; +import java.util.regex.Pattern; import org.codelibs.core.misc.Pair; import org.codelibs.fess.es.log.bsbhv.BsSearchLogBhv; @@ -38,9 +39,15 @@ import org.slf4j.LoggerFactory; public class SearchLogBhv extends BsSearchLogBhv { private static final Logger logger = LoggerFactory.getLogger(SearchLogBhv.class); + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexLogIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexLogIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_log"), name); + } + return indexName; } @Override 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 b6b51f260..b3655a943 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 @@ -20,6 +20,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; +import java.util.regex.Pattern; import org.codelibs.fess.es.log.bsbhv.BsUserInfoBhv; import org.codelibs.fess.util.ComponentUtil; @@ -31,12 +32,17 @@ import org.slf4j.LoggerFactory; * @author FreeGen */ public class UserInfoBhv extends BsUserInfoBhv { - private static final Logger logger = LoggerFactory.getLogger(UserInfoBhv.class); + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexLogIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexLogIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_log"), name); + } + return indexName; } @Override 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 bae46f223..cb41fe8a7 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 @@ -16,6 +16,7 @@ package org.codelibs.fess.es.user.exbhv; import java.util.Map; +import java.util.regex.Pattern; import java.util.stream.Collectors; import org.codelibs.core.misc.Pair; @@ -29,10 +30,15 @@ import org.dbflute.util.DfTypeUtil; * @author FreeGen */ public class GroupBhv extends BsGroupBhv { + private String indexName = null; @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexUserIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexUserIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_user"), name); + } + return indexName; } @Override 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 3a10ac182..cd22a99c4 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 @@ -16,6 +16,7 @@ package org.codelibs.fess.es.user.exbhv; import java.util.Map; +import java.util.regex.Pattern; import java.util.stream.Collectors; import org.codelibs.core.misc.Pair; @@ -29,9 +30,15 @@ import org.dbflute.util.DfTypeUtil; * @author FreeGen */ public class RoleBhv extends BsRoleBhv { + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexUserIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexUserIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_user"), name); + } + return indexName; } @Override 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 74d9e240c..0a4abd1f3 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 @@ -16,6 +16,7 @@ package org.codelibs.fess.es.user.exbhv; import java.util.Map; +import java.util.regex.Pattern; import java.util.stream.Collectors; import org.codelibs.core.misc.Pair; @@ -35,9 +36,15 @@ public class UserBhv extends BsUserBhv { private static final String PASSWORD = "password"; private static final String NAME = "name"; + private String indexName = null; + @Override protected String asEsIndex() { - return ComponentUtil.getFessConfig().getIndexUserIndex(); + if (indexName == null) { + final String name = ComponentUtil.getFessConfig().getIndexUserIndex(); + indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_user"), name); + } + return indexName; } @Override