From b7d492af4b3166fc1cf324a28534c2d9fcd75a12 Mon Sep 17 00:00:00 2001 From: kimchy Date: Wed, 15 Jun 2011 15:13:09 +0300 Subject: [PATCH] fix synonym filter problem due to refactoring done in analysis components regestrations --- .../index/analysis/SynonymTokenFilterFactory.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java index c3c42451dd3..96b5e8a95b6 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/SynonymTokenFilterFactory.java @@ -32,6 +32,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.Index; import org.elasticsearch.index.settings.IndexSettings; +import org.elasticsearch.indices.analysis.IndicesAnalysisService; import java.io.IOException; import java.util.ArrayList; @@ -43,7 +44,7 @@ public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory { private final SynonymMap synonymMap; - @Inject public SynonymTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, Environment env, Map tokenizerFactories, + @Inject public SynonymTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, Environment env, IndicesAnalysisService indicesAnalysisService, Map tokenizerFactories, @Assisted String name, @Assisted Settings settings) { super(index, indexSettings, name, settings); @@ -54,8 +55,16 @@ public class SynonymTokenFilterFactory extends AbstractTokenFilterFactory { boolean ignoreCase = settings.getAsBoolean("ignore_case", false); boolean expand = settings.getAsBoolean("expand", true); - TokenizerFactoryFactory tokenizerFactoryFactory = tokenizerFactories.get(settings.get("tokenizer", "whitespace")); - TokenizerFactory tokenizerFactory = tokenizerFactoryFactory.create(settings.get("tokenizer", "whitespace"), settings); + String tokenizerName = settings.get("tokenizer", "whitespace"); + + TokenizerFactoryFactory tokenizerFactoryFactory = tokenizerFactories.get(tokenizerName); + if (tokenizerFactoryFactory == null) { + tokenizerFactoryFactory = indicesAnalysisService.tokenizerFactoryFactory(tokenizerName); + } + if (tokenizerFactoryFactory == null) { + throw new ElasticSearchIllegalArgumentException("failed to fine tokenizer [" + tokenizerName + "] for synonym token filter"); + } + TokenizerFactory tokenizerFactory = tokenizerFactoryFactory.create(tokenizerName, settings); synonymMap = new SynonymMap(ignoreCase); parseRules(rules, synonymMap, "=>", ",", expand, tokenizerFactory); }