diff options
author | Adrien Grand <jpountz@gmail.com> | 2016-04-08 14:59:56 +0200 |
---|---|---|
committer | Adrien Grand <jpountz@gmail.com> | 2016-04-08 18:10:02 +0200 |
commit | 42526ac28e07da0055faafca1de6f8c5ec96cd85 (patch) | |
tree | 8a32c2e09e5a209d817a37d7a1d002cb3af947d4 /core/src/test/java/org/elasticsearch/versioning | |
parent | df8a971966b25d9b7025a6421e92f1b42685992c (diff) |
Remove Settings.settingsBuilder.
We have both `Settings.settingsBuilder` and `Settings.builder` that do exactly
the same thing, so we should keep only one. I kept `Settings.builder` since it
has my preference but also it is the one that we use in examples of the Java API.
Diffstat (limited to 'core/src/test/java/org/elasticsearch/versioning')
-rw-r--r-- | core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java | 4 | ||||
-rw-r--r-- | core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java index 6b69a038a0..b2cc794ac6 100644 --- a/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/ConcurrentDocumentOperationIT.java @@ -21,13 +21,13 @@ package org.elasticsearch.versioning; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.index.IndexResponse; +import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESIntegTestCase; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.common.settings.Settings.settingsBuilder; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @@ -39,7 +39,7 @@ public class ConcurrentDocumentOperationIT extends ESIntegTestCase { public void testConcurrentOperationOnSameDoc() throws Exception { logger.info("--> create an index with 1 shard and max replicas based on nodes"); assertAcked(prepareCreate("test") - .setSettings(settingsBuilder().put(indexSettings()).put("index.number_of_shards", 1))); + .setSettings(Settings.builder().put(indexSettings()).put("index.number_of_shards", 1))); logger.info("execute concurrent updates on the same doc"); int numberOfUpdates = 100; diff --git a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java index 5787df3cd7..2356395219 100644 --- a/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java +++ b/core/src/test/java/org/elasticsearch/versioning/SimpleVersioningIT.java @@ -701,7 +701,7 @@ public class SimpleVersioningIT extends ESIntegTestCase { .admin() .indices() .prepareCreate("test") - .setSettings(Settings.settingsBuilder() + .setSettings(Settings.builder() .put("index.number_of_shards", 1)) .execute(). actionGet(); |