use index prefix in tests to prevent misconfiguration

src/test/java/org/elasticsearch/benchmark/search/geo/GeoDistanceSearchBenchmark.java

@@ -61,7 +61,7 @@ public class GeoDistanceSearchBenchmark {
                     .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
                     .endObject().endObject().string();
             client.admin().indices().prepareCreate("test")
-                    .setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1).put("number_of_replicas", 0))
+                    .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0))
                     .addMapping("type1", mapping)
                     .execute().actionGet();
 

src/test/java/org/elasticsearch/test/integration/codecs/CodecTests.java

@@ -69,8 +69,8 @@ public class CodecTests extends AbstractNodesTests {
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("field1")
                         .field("postings_format", "test1").field("index_options", "docs").field("type", "string").endObject().endObject().endObject().endObject())
                 .setSettings(ImmutableSettings.settingsBuilder()
-                        .put("number_of_shards", 1)
+                        .put("index.number_of_shards", 1)
-                        .put("number_of_replicas", 0)
+                        .put("index.number_of_replicas", 0)
                         .put("codec.postings_format.test1.type", "pulsing")
                 ).execute().actionGet();
 
@@ -96,8 +96,8 @@ public class CodecTests extends AbstractNodesTests {
 
         client.admin().indices().prepareCreate("test")
                 .setSettings(ImmutableSettings.settingsBuilder()
-                        .put("number_of_shards", 1)
+                        .put("index.number_of_shards", 1)
-                        .put("number_of_replicas", 0)
+                        .put("index.number_of_replicas", 0)
                         .put("index.codec", "SimpleText")
                 ).execute().actionGet();
 

src/test/java/org/elasticsearch/test/integration/consistencylevel/WriteConsistencyLevelTests.java

@@ -46,7 +46,7 @@ public class WriteConsistencyLevelTests extends AbstractNodesTests {
     @Test
     public void testWriteConsistencyLevelReplication2() throws Exception {
         startNode("node1");
-        client("node1").admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1).put("number_of_replicas", 2)).execute().actionGet();
+        client("node1").admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1).put("index.number_of_replicas", 2)).execute().actionGet();
 
         ClusterHealthResponse clusterHealth = client("node1").admin().cluster().prepareHealth().setWaitForActiveShards(1).setWaitForYellowStatus().execute().actionGet();
         logger.info("Done Cluster Health, status " + clusterHealth.status());

src/test/java/org/elasticsearch/test/integration/indices/settings/UpdateNumberOfReplicasTests.java

@@ -148,7 +148,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests {
     @Test
     public void testAutoExpandNumberOfReplicas0ToData() {
         logger.info("--> creating index test with auto expand replicas");
-        client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("number_of_shards", 2).put("auto_expand_replicas", "0-all")).execute().actionGet();
+        client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 2).put("auto_expand_replicas", "0-all")).execute().actionGet();
 
         logger.info("--> running cluster health");
         ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet();
@@ -199,7 +199,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests {
     @Test
     public void testAutoExpandNumberReplicas1ToData() {
         logger.info("--> creating index test with auto expand replicas");
-        client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("number_of_shards", 2).put("auto_expand_replicas", "1-all")).execute().actionGet();
+        client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 2).put("auto_expand_replicas", "1-all")).execute().actionGet();
 
         logger.info("--> running cluster health");
         ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(4).execute().actionGet();
@@ -252,7 +252,7 @@ public class UpdateNumberOfReplicasTests extends AbstractNodesTests {
         logger.info("--> add another node");
         startNode("node3");
         logger.info("--> creating index test with auto expand replicas set to 0-2");
-        client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("number_of_shards", 2).put("auto_expand_replicas", "0-2")).execute().actionGet();
+        client1.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 2).put("auto_expand_replicas", "0-2")).execute().actionGet();
 
         logger.info("--> running cluster health");
         ClusterHealthResponse clusterHealth = client1.admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForActiveShards(6).execute().actionGet();

src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java

@@ -384,7 +384,7 @@ public class SimpleNestedTests extends AbstractNodesTests {
         client.admin().indices().prepareDelete().execute().actionGet();
 
         client.admin().indices().prepareCreate("test")
-                .setSettings(settingsBuilder().put("number_of_shards", numberOfShards))
+                .setSettings(settingsBuilder().put("index.number_of_shards", numberOfShards))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("nested1")
                         .field("type", "nested").startObject("properties")

src/test/java/org/elasticsearch/test/integration/search/basic/SearchWhileCreatingIndexTests.java

@@ -52,7 +52,7 @@ public class SearchWhileCreatingIndexTests extends AbstractNodesTests {
         }
 
         for (int i = 0; i < 20; i++) {
-            node.client().admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("number_of_shards", 10)).execute().actionGet();
+            node.client().admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 10)).execute().actionGet();
 
             node.client().prepareIndex("test", "type1").setSource("field", "test").execute().actionGet();
             node.client().admin().indices().prepareRefresh().execute().actionGet();

src/test/java/org/elasticsearch/test/integration/search/basic/TransportSearchFailuresTests.java

@@ -58,7 +58,7 @@ public class TransportSearchFailuresTests extends AbstractNodesTests {
         logger.info("Start Testing failed search with wrong query");
         startNode("server1");
         client("server1").admin().indices().create(createIndexRequest("test")
-                .settings(settingsBuilder().put("number_of_shards", 3).put("number_of_replicas", 2).put("routing.hash.type", "simple")))
+                .settings(settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 2).put("routing.hash.type", "simple")))
                 .actionGet();
 
         client("server1").admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet();

src/test/java/org/elasticsearch/test/integration/search/basic/TransportTwoNodesSearchTests.java

@@ -71,7 +71,7 @@ public class TransportTwoNodesSearchTests extends AbstractNodesTests {
         client = getClient();
 
         client.admin().indices().create(createIndexRequest("test")
-                .settings(settingsBuilder().put("number_of_shards", 3).put("number_of_replicas", 0).put("routing.hash.type", "simple")))
+                .settings(settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 0).put("routing.hash.type", "simple")))
                 .actionGet();
 
         client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();

src/test/java/org/elasticsearch/test/integration/search/geo/GeoBoundingBoxTests.java

@@ -145,7 +145,7 @@ public class GeoBoundingBoxTests extends AbstractNodesTests {
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1")
                 .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
                 .endObject().endObject().string();
-        client.admin().indices().prepareCreate("test").addMapping("type1", mapping).setSettings(settingsBuilder().put("number_of_shards", "1")).execute().actionGet();
+        client.admin().indices().prepareCreate("test").addMapping("type1", mapping).setSettings(settingsBuilder().put("index.number_of_shards", "1")).execute().actionGet();
         client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject()
@@ -253,7 +253,7 @@ public class GeoBoundingBoxTests extends AbstractNodesTests {
         String mapping = XContentFactory.jsonBuilder().startObject().startObject("type1")
                 .startObject("properties").startObject("location").field("type", "geo_point").field("lat_lon", true).endObject().endObject()
                 .endObject().endObject().string();
-        client.admin().indices().prepareCreate("test").addMapping("type1", mapping).setSettings(settingsBuilder().put("number_of_shards", "1")).execute().actionGet();
+        client.admin().indices().prepareCreate("test").addMapping("type1", mapping).setSettings(settingsBuilder().put("index.number_of_shards", "1")).execute().actionGet();
         client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource(jsonBuilder().startObject()

src/test/java/org/elasticsearch/test/integration/search/highlight/HighlighterSearchTests.java

@@ -86,7 +86,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         // we don't store title and don't use term vector, now lets see if it works...
                         .startObject("title").field("type", "string").field("store", "no").field("term_vector", "no").endObject()
@@ -141,7 +141,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         // we don't store title, now lets see if it works...
                         .startObject("title").field("type", "string").field("store", "no").field("term_vector", "with_positions_offsets").endObject()
@@ -196,7 +196,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         // we don't store title, now lets see if it works...
                         .startObject("title").field("type", "string").field("store", "no").endObject()
@@ -512,7 +512,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "string").field("store", "yes").field("term_vector", "with_positions_offsets").endObject()
                         .endObject().endObject().endObject())
@@ -546,7 +546,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "string").field("store", "yes").field("term_vector", "with_positions_offsets").endObject()
                         .endObject().endObject().endObject())
@@ -582,7 +582,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "string").field("store", "yes")
                         .endObject().endObject().endObject())
@@ -620,7 +620,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "string").field("store", "yes").field("term_vector", "with_positions_offsets").endObject()
                         .endObject().endObject().endObject())
@@ -652,7 +652,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
     public void testMultiMapperVectorWithStore() throws Exception {
         client.admin().indices().prepareDelete().execute().actionGet();
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "multi_field").startObject("fields")
                         .startObject("title").field("type", "string").field("store", "yes").field("term_vector", "with_positions_offsets").endObject()
@@ -693,7 +693,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
     public void testMultiMapperVectorFromSource() throws Exception {
         client.admin().indices().prepareDelete().execute().actionGet();
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "multi_field").startObject("fields")
                         .startObject("title").field("type", "string").field("store", "no").field("term_vector", "with_positions_offsets").endObject()
@@ -734,7 +734,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
     public void testMultiMapperNoVectorWithStore() throws Exception {
         client.admin().indices().prepareDelete().execute().actionGet();
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "multi_field").startObject("fields")
                         .startObject("title").field("type", "string").field("store", "yes").field("term_vector", "no").endObject()
@@ -775,7 +775,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
     public void testMultiMapperNoVectorFromSource() throws Exception {
         client.admin().indices().prepareDelete().execute().actionGet();
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "multi_field").startObject("fields")
                         .startObject("title").field("type", "string").field("store", "no").field("term_vector", "no").endObject()
@@ -820,7 +820,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "string").field("store", "yes").field("term_vector", "no").endObject()
                         .endObject().endObject().endObject())
@@ -856,7 +856,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 2))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("title").field("type", "string").field("store", "yes").field("term_vector", "with_positions_offsets").endObject()
                         .endObject().endObject().endObject())
@@ -926,7 +926,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
         }
 
         client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder()
-                .put("number_of_shards", 1).put("number_of_replicas", 0))
+                .put("index.number_of_shards", 1).put("index.number_of_replicas", 0))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("tags").field("type", "string").field("term_vector", "with_positions_offsets").endObject()
                         .endObject().endObject().endObject())
@@ -1053,7 +1053,7 @@ public class HighlighterSearchTests extends AbstractNodesTests {
         }
 
         client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder()
-                .put("number_of_shards", 1).put("number_of_replicas", 0))
+                .put("index.number_of_shards", 1).put("index.number_of_replicas", 0))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("tags").field("type", "string").endObject()
                         .endObject().endObject().endObject())

src/test/java/org/elasticsearch/test/integration/search/msearch/SimpleMultiSearchTests.java

@@ -22,7 +22,7 @@ public class SimpleMultiSearchTests extends AbstractNodesTests {
 
     @BeforeClass
     public void createNodes() throws Exception {
-        Settings settings = settingsBuilder().put("number_of_shards", 3).put("number_of_replicas", 0).build();
+        Settings settings = settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 0).build();
         startNode("node1", settings);
         startNode("node2", settings);
         client = getClient();

src/test/java/org/elasticsearch/test/integration/search/preference/SearchPreferenceTests.java

@@ -40,7 +40,7 @@ public class SearchPreferenceTests extends AbstractNodesTests {
 
     @BeforeClass
     public void createNodes() throws Exception {
-        Settings settings = settingsBuilder().put("number_of_shards", 3).put("number_of_replicas", 1).build();
+        Settings settings = settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 1).build();
         startNode("server1", settings);
         startNode("server2", settings);
         client = getClient();
@@ -60,7 +60,7 @@ public class SearchPreferenceTests extends AbstractNodesTests {
     public void noPreferenceRandom() throws Exception {
         client.admin().indices().prepareDelete().execute().actionGet();
 
-        client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("number_of_shards", 1).put("number_of_replicas", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(settingsBuilder().put("index.number_of_shards", 1).put("index.number_of_replicas", 1)).execute().actionGet();
         client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
 
         client.prepareIndex("test", "type1").setSource("field1", "value1").execute().actionGet();

src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java

@@ -74,7 +74,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "value1_1", "field2", "value2_1").setRefresh(true).execute().actionGet();
 
@@ -92,7 +92,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
 
         client.admin().indices().prepareCreate("test")
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("field1").field("index_options", "docs").field("type", "string").endObject().endObject().endObject().endObject())
-                .setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+                .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "quick brown fox", "field2", "quick brown fox").execute().actionGet();
         client.prepareIndex("test", "type1", "2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox").setRefresh(true).execute().actionGet();
@@ -116,7 +116,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
 
         client.admin().indices().prepareCreate("test")
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("field1").field("analyzer", "whitespace").field("type", "string").endObject().endObject().endObject().endObject())
-                .setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+                .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "the quick brown fox").execute().actionGet();
         client.prepareIndex("test", "type1", "2").setSource("field1", "the quick lazy huge brown fox jumps over the tree").execute().actionGet();
@@ -179,7 +179,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
 
         client.admin().indices().prepareCreate("test")
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1").startObject("properties").startObject("field1").field("omit_term_freq_and_positions", true).field("type", "string").endObject().endObject().endObject().endObject())
-                .setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+                .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "quick brown fox", "field2", "quick brown fox").execute().actionGet();
         client.prepareIndex("test", "type1", "2").setSource("field1", "quick lazy huge brown fox", "field2", "quick lazy huge brown fox").setRefresh(true).execute().actionGet();
@@ -202,7 +202,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "value_1", "field2", "value_2").execute().actionGet();
 
@@ -232,7 +232,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "value_1", "field2", "value_2").execute().actionGet();
 
@@ -269,7 +269,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1")
                         .startObject("_type").field("index", index).endObject()
                         .endObject().endObject())
@@ -314,7 +314,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1))
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1))
                 .addMapping("type1", jsonBuilder().startObject().startObject("type1")
                         .startObject("_id").field("index", index).endObject()
                         .endObject().endObject())
@@ -367,7 +367,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "value1_1").execute().actionGet();
         client.prepareIndex("test", "type1", "2").setSource("field1", "value1_2").execute().actionGet();
@@ -388,7 +388,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "value1_1", "field2", "value2_1").execute().actionGet();
         client.prepareIndex("test", "type1", "2").setSource("field1", "value1_2").execute().actionGet();
@@ -451,7 +451,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "value1_1", "field2", "value2_1").setRefresh(true).execute().actionGet();
 
@@ -507,7 +507,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type1", "1").setSource("field1", "value1", "field2", "value4", "field3", "value3").execute().actionGet();
         client.prepareIndex("test", "type1", "2").setSource("field1", "value2", "field2", "value5", "field3", "value2").execute().actionGet();
@@ -590,7 +590,7 @@ public class SimpleQueryTests extends AbstractNodesTests {
             // ignore
         }
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
         client.prepareIndex("test", "type1", "1").setSource("field1", "value1").execute().actionGet();
         client.prepareIndex("test", "type1", "2").setSource("field1", "value2").execute().actionGet();
         client.admin().indices().prepareRefresh("test").execute().actionGet();

src/test/java/org/elasticsearch/test/integration/search/simple/SimpleSearchTests.java

@@ -58,7 +58,7 @@ public class SimpleSearchTests extends AbstractNodesTests {
     public void simpleIpTests() throws Exception {
         client.admin().indices().prepareDelete().execute().actionGet();
 
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.admin().indices().preparePutMapping("test").setType("type1")
                 .setSource(XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties")
@@ -79,7 +79,7 @@ public class SimpleSearchTests extends AbstractNodesTests {
     @Test
     public void simpleIdTests() {
         client.admin().indices().prepareDelete().execute().actionGet();
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
 
         client.prepareIndex("test", "type", "XXX1").setSource("field", "value").setRefresh(true).execute().actionGet();
         // id is not indexed, but lets see that we automatically convert to

src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java

@@ -52,7 +52,7 @@ public class SimpleSortTests extends AbstractNodesTests {
 
     @BeforeClass
     public void createNodes() throws Exception {
-        Settings settings = settingsBuilder().put("number_of_shards", 3).put("number_of_replicas", 0).build();
+        Settings settings = settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 0).build();
         startNode("server1", settings);
         startNode("server2", settings);
         client = getClient();
@@ -124,7 +124,7 @@ public class SimpleSortTests extends AbstractNodesTests {
         } catch (Exception e) {
             // ignore
         }
-        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", 1)).execute().actionGet();
+        client.admin().indices().prepareCreate("test").setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 1)).execute().actionGet();
         client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
 
         client.prepareIndex("test", "type", "1").setSource("field", 2).execute().actionGet();
@@ -175,7 +175,7 @@ public class SimpleSortTests extends AbstractNodesTests {
             // ignore
         }
         client.admin().indices().prepareCreate("test")
-                .setSettings(ImmutableSettings.settingsBuilder().put("number_of_shards", numberOfShards).put("number_of_replicas", 0))
+                .setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", numberOfShards).put("index.number_of_replicas", 0))
                 .addMapping("type1", XContentFactory.jsonBuilder().startObject().startObject("type1").startObject("properties")
                         .startObject("str_value").field("type", "string").endObject()
                         .startObject("boolean_value").field("type", "boolean").endObject()

src/test/java/org/elasticsearch/test/integration/search/stats/SearchStatsTests.java

@@ -41,7 +41,7 @@ public class SearchStatsTests extends AbstractNodesTests {
 
     @BeforeClass
     public void createNodes() throws Exception {
-        Settings settings = settingsBuilder().put("number_of_shards", 3).put("number_of_replicas", 0).build();
+        Settings settings = settingsBuilder().put("index.number_of_shards", 3).put("index.number_of_replicas", 0).build();
         startNode("server1", settings);
         startNode("server2", settings);
         client = getClient();

src/test/java/org/elasticsearch/test/integration/similarity/SimilarityTests.java

@@ -79,8 +79,8 @@ public class SimilarityTests extends AbstractNodesTests {
                         .endObject()
                     .endObject())
                 .setSettings(ImmutableSettings.settingsBuilder()
-                        .put("number_of_shards", 1)
+                        .put("index.number_of_shards", 1)
-                        .put("number_of_replicas", 0)
+                        .put("index.number_of_replicas", 0)
                         .put("similarity.custom.type", "BM25")
                         .put("similarity.custom.k1", 2.0f)
                         .put("similarity.custom.b", 1.5f)

src/test/java/org/elasticsearch/test/integration/versioning/ConcurrentDocumentOperationTests.java

@@ -37,7 +37,7 @@ public class ConcurrentDocumentOperationTests extends AbstractNodesTests {
 
         logger.info("--> create an index with 1 shard and max replicas based on nodes");
         nodes[0].client().admin().indices().prepareCreate("test")
-                .setSettings(settingsBuilder().put("number_of_shards", 1).put("number_of_replicas", nodes.length - 1))
+                .setSettings(settingsBuilder().put("index.number_of_shards", 1).put("index.number_of_replicas", nodes.length - 1))
                 .execute().actionGet();
 
         logger.info("execute concurrent updates on the same doc");