honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix new analysis components test, and make pattern require parameters

This commit is contained in:
kimchy 2011-07-08 22:28:26 +03:00
parent 7e20a9f80a
commit 66d5eb94fb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/elasticsearch/src/main/java/org/elasticsearch/index/analysis/PatternReplaceTokenFilterFactory.java
View File

@ -29,10 +29,9 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.settings.IndexSettings;
import java.io.IOException;
import java.io.Reader;
import java.util.regex.Pattern;
@AnalysisSettingsRequired
public class PatternReplaceTokenFilterFactory extends AbstractTokenFilterFactory {
private final Pattern pattern;
@ -42,14 +41,14 @@ public class PatternReplaceTokenFilterFactory extends AbstractTokenFilterFactory
@Inject public PatternReplaceTokenFilterFactory(Index index, @IndexSettings Settings indexSettings, @Assisted String name, @Assisted Settings settings) {
super(index, indexSettings, name, settings);
String sPattern = settings.get("pattern", "");
String sPattern = settings.get("pattern", null);
if (sPattern == null) {
throw new ElasticSearchIllegalArgumentException("pattern is missing for [" + name + "] token filter of type 'pattern_replace'");
}
this.pattern = Regex.compile(sPattern, settings.get("flags"));
String sReplacement = settings.get("replacement", "");
String sReplacement = settings.get("replacement", null);
if (sReplacement == null) {
throw new ElasticSearchIllegalArgumentException("replacement is missing for [" + name + "] token filter of type 'pattern_replace'");
}

2
modules/elasticsearch/src/test/java/org/elasticsearch/index/analysis/AnalysisModuleTests.java
View File

@ -98,7 +98,7 @@ public class AnalysisModuleTests {
analyzer = analysisService.analyzer("custom5").analyzer();
assertThat(analyzer, instanceOf(CustomAnalyzer.class));
CustomAnalyzer custom5 = (CustomAnalyzer) analyzer;
assertThat(custom5.tokenFilters()[0], instanceOf(MappingCharFilterFactory.class));
assertThat(custom5.charFilters()[0], instanceOf(MappingCharFilterFactory.class));
// verify aliases
analyzer = analysisService.analyzer("alias1").analyzer();