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:12 -04:00 committed by mikemccand
parent 3620ab6698
commit c1ad335d15
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/java/org/elasticsearch/index/analysis/PolishAnalysisTests.java
View File

@ -40,8 +40,8 @@ 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.Builder.EMPTY_SETTINGS; import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
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;
/** /**

3
src/test/java/org/elasticsearch/index/analysis/SimplePolishIntegrationTests.java
View File

@ -20,7 +20,6 @@
package org.elasticsearch.index.analysis; package org.elasticsearch.index.analysis;
import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
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.plugins.PluginsService; import org.elasticsearch.plugins.PluginsService;
@ -39,7 +38,7 @@ public class SimplePolishIntegrationTests 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();

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

@ -28,7 +28,6 @@ import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.Injector;
import org.elasticsearch.common.inject.ModulesBuilder; import org.elasticsearch.common.inject.ModulesBuilder;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsModule; import org.elasticsearch.common.settings.SettingsModule;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
@ -61,7 +60,7 @@ public class SimplePolishTokenFilterTests extends ElasticsearchTestCase {
private void testToken(String source, String expected) throws IOException { private void testToken(String source, String expected) throws IOException {
Index index = new Index("test"); Index index = new Index("test");
Settings settings = ImmutableSettings.settingsBuilder() Settings settings = Settings.settingsBuilder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir()) .put("path.home", createTempDir())
.put("index.analysis.filter.myStemmer.type", "polish_stem") .put("index.analysis.filter.myStemmer.type", "polish_stem")
@ -83,7 +82,7 @@ public class SimplePolishTokenFilterTests extends ElasticsearchTestCase {
private void testAnalyzer(String source, String... expected_terms) throws IOException { private void testAnalyzer(String source, String... expected_terms) throws IOException {
Index index = new Index("test"); Index index = new Index("test");
Settings settings = ImmutableSettings.settingsBuilder() Settings settings = Settings.settingsBuilder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir()) .put("path.home", createTempDir())
.build(); .build();