fix #1120 add index name settings

This commit is contained in:
Shinsuke Sugaya 2017-06-22 11:02:27 +09:00
parent 0c5206ec4b
commit 50b5295d6d
39 changed files with 240 additions and 30 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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) {

View file

@ -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) {

View file

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

View file

@ -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) {

View file

@ -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) {

View file

@ -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 extends Group> RESULT createEntity(final Map<String, Object> source, final Class<? extends RESULT> entityType) {
try {

View file

@ -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 extends Role> RESULT createEntity(final Map<String, Object> source, final Class<? extends RESULT> entityType) {
try {

View file

@ -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 extends User> RESULT createEntity(final Map<String, Object> source, final Class<? extends RESULT> entityType) {
try {

View file

@ -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'. <br>
* The value is, e.g. .fess_config <br>
* @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'. <br>
* The value is, e.g. .fess_user <br>
* @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'. <br>
* The value is, e.g. fess_log <br>
* @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'. <br>
* The value is, e.g. lang,role,label,anchor <br>
@ -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, "");

View file

@ -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