From f54dbc3060286328f0763f9a21e7e9aa21f6ac05 Mon Sep 17 00:00:00 2001 From: Michael McCandless Date: Tue, 26 May 2015 08:08:58 -0400 Subject: [PATCH] Absorb ImmutableSettings into Settings --- .../index/analysis/SimplePhoneticAnalysisTests.java | 2 +- .../index/analysis/SimplePhoneticIntegrationTests.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java b/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java index 0e041b71c6c..45c3d7cf0ec 100644 --- a/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java @@ -36,7 +36,7 @@ import org.elasticsearch.test.ElasticsearchTestCase; import org.hamcrest.MatcherAssert; 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; /** diff --git a/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticIntegrationTests.java b/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticIntegrationTests.java index 41af6558ddc..7f74879e3ce 100644 --- a/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticIntegrationTests.java @@ -21,7 +21,6 @@ package org.elasticsearch.index.analysis; import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryBuilders; @@ -41,7 +40,7 @@ public class SimplePhoneticIntegrationTests extends ElasticsearchIntegrationTest @Override protected Settings nodeSettings(int nodeOrdinal) { - return ImmutableSettings.builder() + return Settings.builder() .put(super.nodeSettings(nodeOrdinal)) .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true) .build(); @@ -49,7 +48,7 @@ public class SimplePhoneticIntegrationTests extends ElasticsearchIntegrationTest @Override public Settings indexSettings() { - Settings settings = ImmutableSettings.builder() + Settings settings = Settings.builder() .put(super.indexSettings()) .put("index.analysis.analyzer.my_analyzer.tokenizer", "standard") .putArray("index.analysis.analyzer.my_analyzer.filter", "standard", "lowercase", "my_metaphone")