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

Absorb ImmutableSettings into Settings

This commit is contained in:
Michael McCandless 2015-05-26 08:08:58 -04:00 committed by mikemccand
parent 1c15268657
commit f54dbc3060
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@ import org.elasticsearch.test.ElasticsearchTestCase;
import org.hamcrest.MatcherAssert; import org.hamcrest.MatcherAssert;
import org.junit.Test; import org.junit.Test;
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder; import static org.elasticsearch.common.settings.Settings.settingsBuilder;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
/** /**

5
src/test/java/org/elasticsearch/index/analysis/SimplePhoneticIntegrationTests.java
View File

@ -21,7 +21,6 @@ package org.elasticsearch.index.analysis;
import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
@ -41,7 +40,7 @@ public class SimplePhoneticIntegrationTests extends ElasticsearchIntegrationTest
@Override @Override
protected Settings nodeSettings(int nodeOrdinal) { protected Settings nodeSettings(int nodeOrdinal) {
return ImmutableSettings.builder() return Settings.builder()
.put(super.nodeSettings(nodeOrdinal)) .put(super.nodeSettings(nodeOrdinal))
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true) .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
.build(); .build();
@ -49,7 +48,7 @@ public class SimplePhoneticIntegrationTests extends ElasticsearchIntegrationTest
@Override @Override
public Settings indexSettings() { public Settings indexSettings() {
Settings settings = ImmutableSettings.builder() Settings settings = Settings.builder()
.put(super.indexSettings()) .put(super.indexSettings())
.put("index.analysis.analyzer.my_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.my_analyzer.tokenizer", "standard")
.putArray("index.analysis.analyzer.my_analyzer.filter", "standard", "lowercase", "my_metaphone") .putArray("index.analysis.analyzer.my_analyzer.filter", "standard", "lowercase", "my_metaphone")