Skip to content

Commit 97e6016

Browse files
mikemccandmikemccand
committed
Absorb ImmutableSettings into Settings
1 parent 3f539dc commit 97e6016

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

‎src/test/java/org/elasticsearch/index/analysis/AnalysisTestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.elasticsearch.indices.analysis.IndicesAnalysisModule;
3434
import org.elasticsearch.indices.analysis.IndicesAnalysisService;
3535

36-
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
36+
import static org.elasticsearch.common.settings.Settings.settingsBuilder;
3737

3838
public class AnalysisTestUtils {
3939

‎src/test/java/org/elasticsearch/index/analysis/ICUIntegrationTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
2222
import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
2323
import org.elasticsearch.action.search.SearchResponse;
24-
import org.elasticsearch.common.settings.ImmutableSettings;
2524
import org.elasticsearch.common.settings.Settings;
2625
import org.elasticsearch.common.xcontent.XContentBuilder;
2726
import org.elasticsearch.index.query.QueryBuilders;
@@ -41,15 +40,15 @@ public class ICUIntegrationTests extends ElasticsearchIntegrationTest {
4140

4241
@Override
4342
protected Settings nodeSettings(int nodeOrdinal) {
44-
return ImmutableSettings.builder()
43+
return Settings.builder()
4544
.put(super.nodeSettings(nodeOrdinal))
4645
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
4746
.build();
4847
}
4948

5049
@Override
5150
public Settings indexSettings() {
52-
Settings settings = ImmutableSettings.builder()
51+
Settings settings = Settings.builder()
5352
.put(super.indexSettings())
5453
.put("index.analysis.analyzer.my_analyzer.tokenizer", "standard")
5554
.putArray("index.analysis.analyzer.my_analyzer.filter", "standard", "lowercase", "my_collator")

‎src/test/java/org/elasticsearch/index/analysis/SimpleIcuAnalysisTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.elasticsearch.test.ElasticsearchTestCase;
2424
import org.junit.Test;
2525

26-
import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
26+
import static org.elasticsearch.common.settings.Settings.settingsBuilder;
2727
import static org.elasticsearch.index.analysis.AnalysisTestUtils.createAnalysisService;
2828
import static org.hamcrest.Matchers.instanceOf;
2929
/**

‎src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.lucene.analysis.Tokenizer;
2727
import org.apache.lucene.analysis.core.KeywordTokenizer;
2828
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
29-
import org.elasticsearch.common.settings.ImmutableSettings;
3029
import org.elasticsearch.common.settings.Settings;
3130
import org.elasticsearch.test.ElasticsearchTestCase;
3231
import org.junit.Test;
@@ -48,7 +47,7 @@ public class SimpleIcuCollationTokenFilterTests extends ElasticsearchTestCase {
4847
*/
4948
@Test
5049
public void testBasicUsage() throws Exception {
51-
Settings settings = ImmutableSettings.settingsBuilder()
50+
Settings settings = Settings.settingsBuilder()
5251
.put("path.home", createTempDir())
5352
.put("index.analysis.filter.myCollator.type", "icu_collation")
5453
.put("index.analysis.filter.myCollator.language", "tr")
@@ -65,7 +64,7 @@ public void testBasicUsage() throws Exception {
6564
*/
6665
@Test
6766
public void testNormalization() throws IOException {
68-
Settings settings = ImmutableSettings.settingsBuilder()
67+
Settings settings = Settings.settingsBuilder()
6968
.put("path.home", createTempDir())
7069
.put("index.analysis.filter.myCollator.type", "icu_collation")
7170
.put("index.analysis.filter.myCollator.language", "tr")
@@ -83,7 +82,7 @@ public void testNormalization() throws IOException {
8382
*/
8483
@Test
8584
public void testSecondaryStrength() throws IOException {
86-
Settings settings = ImmutableSettings.settingsBuilder()
85+
Settings settings = Settings.settingsBuilder()
8786
.put("path.home", createTempDir())
8887
.put("index.analysis.filter.myCollator.type", "icu_collation")
8988
.put("index.analysis.filter.myCollator.language", "en")
@@ -102,7 +101,7 @@ public void testSecondaryStrength() throws IOException {
102101
*/
103102
@Test
104103
public void testIgnorePunctuation() throws IOException {
105-
Settings settings = ImmutableSettings.settingsBuilder()
104+
Settings settings = Settings.settingsBuilder()
106105
.put("path.home", createTempDir())
107106
.put("index.analysis.filter.myCollator.type", "icu_collation")
108107
.put("index.analysis.filter.myCollator.language", "en")
@@ -121,7 +120,7 @@ public void testIgnorePunctuation() throws IOException {
121120
*/
122121
@Test
123122
public void testIgnoreWhitespace() throws IOException {
124-
Settings settings = ImmutableSettings.settingsBuilder()
123+
Settings settings = Settings.settingsBuilder()
125124
.put("path.home", createTempDir())
126125
.put("index.analysis.filter.myCollator.type", "icu_collation")
127126
.put("index.analysis.filter.myCollator.language", "en")
@@ -143,7 +142,7 @@ public void testIgnoreWhitespace() throws IOException {
143142
*/
144143
@Test
145144
public void testNumerics() throws IOException {
146-
Settings settings = ImmutableSettings.settingsBuilder()
145+
Settings settings = Settings.settingsBuilder()
147146
.put("path.home", createTempDir())
148147
.put("index.analysis.filter.myCollator.type", "icu_collation")
149148
.put("index.analysis.filter.myCollator.language", "en")
@@ -161,7 +160,7 @@ public void testNumerics() throws IOException {
161160
*/
162161
@Test
163162
public void testIgnoreAccentsButNotCase() throws IOException {
164-
Settings settings = ImmutableSettings.settingsBuilder()
163+
Settings settings = Settings.settingsBuilder()
165164
.put("path.home", createTempDir())
166165
.put("index.analysis.filter.myCollator.type", "icu_collation")
167166
.put("index.analysis.filter.myCollator.language", "en")
@@ -183,7 +182,7 @@ public void testIgnoreAccentsButNotCase() throws IOException {
183182
*/
184183
@Test
185184
public void testUpperCaseFirst() throws IOException {
186-
Settings settings = ImmutableSettings.settingsBuilder()
185+
Settings settings = Settings.settingsBuilder()
187186
.put("path.home", createTempDir())
188187
.put("index.analysis.filter.myCollator.type", "icu_collation")
189188
.put("index.analysis.filter.myCollator.language", "en")
@@ -214,7 +213,7 @@ public void testCustomRules() throws Exception {
214213
RuleBasedCollator tailoredCollator = new RuleBasedCollator(baseCollator.getRules() + DIN5007_2_tailorings);
215214
String tailoredRules = tailoredCollator.getRules();
216215

217-
Settings settings = ImmutableSettings.settingsBuilder()
216+
Settings settings = Settings.settingsBuilder()
218217
.put("path.home", createTempDir())
219218
.put("index.analysis.filter.myCollator.type", "icu_collation")
220219
.put("index.analysis.filter.myCollator.rules", tailoredRules)

‎src/test/java/org/elasticsearch/index/analysis/SimpleIcuNormalizerCharFilterTests.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import com.ibm.icu.text.Normalizer2;
2323
import org.apache.lucene.analysis.CharFilter;
24-
import org.elasticsearch.common.settings.ImmutableSettings;
2524
import org.elasticsearch.common.settings.Settings;
2625
import org.elasticsearch.test.ElasticsearchTestCase;
2726
import org.junit.Test;
@@ -38,7 +37,7 @@ public class SimpleIcuNormalizerCharFilterTests extends ElasticsearchTestCase {
3837
@Test
3938
public void testDefaultSetting() throws Exception {
4039

41-
Settings settings = ImmutableSettings.settingsBuilder()
40+
Settings settings = Settings.settingsBuilder()
4241
.put("path.home", createTempDir())
4342
.put("index.analysis.char_filter.myNormalizerChar.type", "icu_normalizer")
4443
.build();
@@ -64,7 +63,7 @@ public void testDefaultSetting() throws Exception {
6463
@Test
6564
public void testNameAndModeSetting() throws Exception {
6665

67-
Settings settings = ImmutableSettings.settingsBuilder()
66+
Settings settings = Settings.settingsBuilder()
6867
.put("path.home", createTempDir())
6968
.put("index.analysis.char_filter.myNormalizerChar.type", "icu_normalizer")
7069
.put("index.analysis.char_filter.myNormalizerChar.name", "nfkc")

0 commit comments

Comments
 (0)