#1317 elasticsearch 6 support

pom.xml

@@ -68,7 +68,7 @@
 		<!-- Elasticsearch -->
 		<elasticsearch.version>6.0.0-rc1</elasticsearch.version>
 		<elasticsearch.min.version>6.0.0</elasticsearch.min.version>
-		<cluster.runner.version>6.0.0.0-rc1</cluster.runner.version>
+		<cluster.runner.version>6.0.0.0-SNAPSHOT</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.version>8.5.21</tomcat.version>
@@ -1160,6 +1160,10 @@
 					<groupId>org.elasticsearch.plugin</groupId>
 					<artifactId>transport-netty4-client</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>parent-join-client</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

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;

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

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

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

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

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

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

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

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

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