Dry up more of index setting creation in tests (#95602)

Quick follow-up to #95569 of spots that I could automatically identify and refactor, saving another 1.5k LoC in tests.

Author: original-brownbear

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java

@@ -369,13 +369,7 @@ static ClusterState createClusterState(PersistentTasksCustomMetadata tasksCustom
  : GeoIpDownloader.DATABASES_INDEX;
  Index index = new Index(indexName, UUID.randomUUID().toString());
  IndexMetadata.Builder idxMeta = IndexMetadata.builder(index.getName())
- .settings(
- Settings.builder()
- .put("index.version.created", Version.CURRENT)
- .put("index.uuid", index.getUUID())
- .put("index.number_of_shards", 1)
- .put("index.number_of_replicas", 0)
- );
+ .settings(indexSettings(Version.CURRENT, 1, 0).put("index.uuid", index.getUUID()));
  if (aliasGeoipDatabase) {
  idxMeta.putAlias(AliasMetadata.builder(GeoIpDownloader.DATABASES_INDEX));
  }

modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java

@@ -195,12 +195,7 @@ public void createSystemIndexForDescriptor(SystemIndexDescriptor descriptor) thr
  }
 
  static Settings createSettings(Version creationVersion, int flagSettingValue) {
- return Settings.builder()
- .put(IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 1)
- .put(IndexMetadata.INDEX_NUMBER_OF_REPLICAS_SETTING.getKey(), 0)
- .put(FlAG_SETTING_KEY, flagSettingValue)
- .put("index.version.created", creationVersion)
- .build();
+ return indexSettings(creationVersion, 1, 0).put(FlAG_SETTING_KEY, flagSettingValue).build();
  }
 
  static String createMapping(boolean descriptorManaged, boolean descriptorInternal) {

modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSourceTargetValidationTests.java

@@ -179,13 +179,7 @@ private static IndexMetadata index(String name, String... aliases) {
  }
 
  private static IndexMetadata index(String name, @Nullable Boolean writeIndex, String... aliases) {
- IndexMetadata.Builder builder = IndexMetadata.builder(name)
- .settings(
- Settings.builder()
- .put("index.version.created", Version.CURRENT.id)
- .put("index.number_of_shards", 1)
- .put("index.number_of_replicas", 1)
- );
+ IndexMetadata.Builder builder = IndexMetadata.builder(name).settings(indexSettings(Version.CURRENT, 1, 1));
  for (String alias : aliases) {
  builder.putAlias(AliasMetadata.builder(alias).writeIndex(writeIndex).build());
  }

modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java

@@ -171,11 +171,7 @@ private void testCase(
  .put("node.attr.color", "blue")
  .build();
  final String node = internalCluster().startDataOnlyNode(nodeSettings);
- final Settings indexSettings = Settings.builder()
- .put("index.number_of_shards", 1)
- .put("index.number_of_replicas", 0)
- .put("index.routing.allocation.include.color", "blue")
- .build();
+ final Settings indexSettings = indexSettings(1, 0).put("index.routing.allocation.include.color", "blue").build();
 
  // Create the source index on the node with small thread pools so we can block them.
  client().admin().indices().prepareCreate("source").setSettings(indexSettings).execute().actionGet();

qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java

@@ -174,7 +174,7 @@ private static void indexDocuments(String idPrefix) throws IOException, Interrup
  assertTrue(response.isAcknowledged());
 
  int numShards = randomIntBetween(1, 5);
- Settings settings = Settings.builder().put("index.number_of_shards", numShards).put("index.number_of_replicas", 0).build();
+ Settings settings = indexSettings(numShards, 0).build();
  String mapping = """
  {
  "properties": {

server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java

@@ -1213,12 +1213,7 @@ private void prepareIndex(
  client().admin()
  .indices()
  .prepareCreate("idx")
- .setSettings(
- Settings.builder()
- .put("index.number_of_shards", numPrimaries)
- .put("index.number_of_replicas", numReplicas)
- .put(settings)
- )
+ .setSettings(indexSettings(numPrimaries, numReplicas).put(settings))
  .setWaitForActiveShards(activeShardCount)
  .get()
  );

server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java

@@ -105,13 +105,7 @@ public void testCreateShrinkIndexToN() {
  client().admin()
  .indices()
  .prepareResizeIndex("source", "first_shrink")
- .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", shardSplits[1])
- .putNull("index.blocks.write")
- .build()
- )
+ .setSettings(indexSettings(shardSplits[1], 0).putNull("index.blocks.write").build())
  .get()
  );
  ensureGreen();
@@ -139,12 +133,7 @@ public void testCreateShrinkIndexToN() {
  .indices()
  .prepareResizeIndex("first_shrink", "second_shrink")
  .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", shardSplits[2])
- .putNull("index.blocks.write")
- .putNull("index.routing.allocation.require._name")
- .build()
+ indexSettings(shardSplits[2], 0).putNull("index.blocks.write").putNull("index.routing.allocation.require._name").build()
  )
  .get()
  );
@@ -230,10 +219,7 @@ public void testShrinkIndexPrimaryTerm() throws Exception {
  final long beforeShrinkPrimaryTerm = IntStream.range(0, numberOfShards).mapToLong(indexMetadata::primaryTerm).max().getAsLong();
 
  // now merge source into target
- final Settings shrinkSettings = Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", numberOfTargetShards)
- .build();
+ final Settings shrinkSettings = indexSettings(numberOfTargetShards, 0).build();
  assertAcked(client().admin().indices().prepareResizeIndex("source", "target").setSettings(shrinkSettings).get());
 
  ensureGreen(TimeValue.timeValueSeconds(120));
@@ -476,13 +462,7 @@ public void testCreateShrinkWithIndexSort() throws Exception {
  () -> client().admin()
  .indices()
  .prepareResizeIndex("source", "target")
- .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", "2")
- .put("index.sort.field", "foo")
- .build()
- )
+ .setSettings(indexSettings(2, 0).put("index.sort.field", "foo").build())
  .get()
  );
  assertThat(exc.getMessage(), containsString("can't override index sort when resizing an index"));
@@ -492,13 +472,7 @@ public void testCreateShrinkWithIndexSort() throws Exception {
  client().admin()
  .indices()
  .prepareResizeIndex("source", "target")
- .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", "2")
- .putNull("index.blocks.write")
- .build()
- )
+ .setSettings(indexSettings(2, 0).putNull("index.blocks.write").build())
  .get()
  );
  ensureGreen();
@@ -620,11 +594,9 @@ public void testShrinkThenSplitWithFailedNode() throws Exception {
  .indices()
  .prepareResizeIndex("original", "shrunk")
  .setSettings(
- Settings.builder()
- .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1)
- .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
- .putNull(IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey())
- .build()
+ indexSettings(1, 1).putNull(
+ IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey()
+ ).build()
  )
  .setResizeType(ResizeType.SHRINK)
  .get()
@@ -644,11 +616,9 @@ public void testShrinkThenSplitWithFailedNode() throws Exception {
  .indices()
  .prepareResizeIndex("shrunk", "splitagain")
  .setSettings(
- Settings.builder()
- .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
- .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, shardCount)
- .putNull(IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey())
- .build()
+ indexSettings(shardCount, 0).putNull(
+ IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey()
+ ).build()
  )
  .setResizeType(ResizeType.SPLIT)
  );

server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java

@@ -178,10 +178,7 @@ private void splitToN(int sourceShards, int firstSplitShards, int secondSplitSha
  ensureYellow();
  updateIndexSettings(Settings.builder().put("index.blocks.write", true), "source");
  ensureGreen();
- Settings.Builder firstSplitSettingsBuilder = Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", firstSplitShards)
- .putNull("index.blocks.write");
+ Settings.Builder firstSplitSettingsBuilder = indexSettings(firstSplitShards, 0).putNull("index.blocks.write");
  if (sourceShards == 1 && useRoutingPartition == false && randomBoolean()) { // try to set it if we have a source index with 1 shard
  firstSplitSettingsBuilder.put("index.number_of_routing_shards", secondSplitShards);
  }
@@ -220,13 +217,7 @@ private void splitToN(int sourceShards, int firstSplitShards, int secondSplitSha
  .indices()
  .prepareResizeIndex("first_split", "second_split")
  .setResizeType(ResizeType.SPLIT)
- .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", secondSplitShards)
- .putNull("index.blocks.write")
- .build()
- )
+ .setSettings(indexSettings(secondSplitShards, 0).putNull("index.blocks.write").build())
  .get()
  );
  ensureGreen();
@@ -339,11 +330,7 @@ public void testSplitIndexPrimaryTerm() throws Exception {
  final long beforeSplitPrimaryTerm = IntStream.range(0, numberOfShards).mapToLong(indexMetadata::primaryTerm).max().getAsLong();
 
  // now split source into target
- final Settings splitSettings = Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", numberOfTargetShards)
- .putNull("index.blocks.write")
- .build();
+ final Settings splitSettings = indexSettings(numberOfTargetShards, 0).putNull("index.blocks.write").build();
  assertAcked(
  client().admin()
  .indices()
@@ -398,13 +385,7 @@ public void testCreateSplitIndex() throws Exception {
  .indices()
  .prepareResizeIndex("source", "target")
  .setResizeType(ResizeType.SPLIT)
- .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", createWithReplicas ? 1 : 0)
- .put("index.number_of_shards", 2)
- .putNull("index.blocks.write")
- .build()
- )
+ .setSettings(indexSettings(2, createWithReplicas ? 1 : 0).putNull("index.blocks.write").build())
  .get()
  );
  ensureGreen();
@@ -508,13 +489,7 @@ public void testCreateSplitWithIndexSort() throws Exception {
  .indices()
  .prepareResizeIndex("source", "target")
  .setResizeType(ResizeType.SPLIT)
- .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", 4)
- .put("index.sort.field", "foo")
- .build()
- )
+ .setSettings(indexSettings(4, 0).put("index.sort.field", "foo").build())
  .get()
  );
  assertThat(exc.getMessage(), containsString("can't override index sort when resizing an index"));
@@ -525,13 +500,7 @@ public void testCreateSplitWithIndexSort() throws Exception {
  .indices()
  .prepareResizeIndex("source", "target")
  .setResizeType(ResizeType.SPLIT)
- .setSettings(
- Settings.builder()
- .put("index.number_of_replicas", 0)
- .put("index.number_of_shards", 4)
- .putNull("index.blocks.write")
- .build()
- )
+ .setSettings(indexSettings(4, 0).putNull("index.blocks.write").build())
  .get()
  );
  ensureGreen();

server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java

@@ -13,7 +13,6 @@
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.common.Priority;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.Strings;
 import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.test.ESIntegTestCase;
@@ -30,11 +29,7 @@
  */
 public class WaitActiveShardCountIT extends ESIntegTestCase {
  public void testReplicationWaitsForActiveShardCount() throws Exception {
- CreateIndexResponse createIndexResponse = prepareCreate(
- "test",
- 1,
- Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 2)
- ).get();
+ CreateIndexResponse createIndexResponse = prepareCreate("test", 1, indexSettings(1, 2)).get();
 
  assertAcked(createIndexResponse);
 

server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java

@@ -27,7 +27,6 @@
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.common.StopWatch;
-import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -704,15 +703,7 @@ public void testWaitForAliasCreationMultipleShards() throws Exception {
 
  public void testWaitForAliasCreationSingleShard() throws Exception {
  logger.info("--> creating index [test]");
- assertAcked(
- admin().indices()
- .create(
- new CreateIndexRequest("test").settings(
- Settings.builder().put("index.number_of_replicas", 0).put("index.number_of_shards", 1)
- )
- )
- .get()
- );
+ assertAcked(admin().indices().create(new CreateIndexRequest("test").settings(indexSettings(1, 0))).get());
 
  ensureGreen();