github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use assertAcked more (#101201)

Browse source 
Just found that we have a lot of inconsistency and needless verbosity
here in tests. We can just use `assertAcked` in a couple spots
to save `.get`, `.actionGet` etc., especially with the signature
change I added here.
This commit is contained in:
Armin Braun 2023-10-23 19:48:10 +02:00 • committed by GitHub
parent 84afa5cee3
commit 3945ee75d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
100 changed files with 130 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesAggregationsIT.java
View file

@ -126,7 +126,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase {
.put("time_series.start_time", boundaries[i])
.put("time_series.end_time", boundaries[i + 1])
.build()
).setMapping(builder).addAlias(new Alias("index")).get()
).setMapping(builder).addAlias(new Alias("index"))
);
}
@ -478,7 +478,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase {
.put("time_series.end_time", "2022-01-01T00:00:00Z")
.put("number_of_shards", 1)
.build()
).setMapping("key", "type=keyword,time_series_dimension=true", "val", "type=double").get()
).setMapping("key", "type=keyword,time_series_dimension=true", "val", "type=double")
);
client().prepareBulk()

2
modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java
View file

@ -1846,7 +1846,7 @@ public class DataStreamIT extends ESIntegTestCase {
client().execute(
ModifyDataStreamsAction.INSTANCE,
new ModifyDataStreamsAction.Request(List.of(DataStreamAction.removeBackingIndex(dataStreamName, ghostReference.getName())))
).actionGet()
)
);
ClusterState after = internalCluster().getCurrentMasterNodeInstance(ClusterService.class).state();
assertThat(after.getMetadata().dataStreams().get(dataStreamName).getIndices(), hasSize(1));

27
modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamsSnapshotsIT.java
View file

@ -149,11 +149,7 @@ public class DataStreamsSnapshotsIT extends AbstractSnapshotIntegTestCase {
assertEquals(Collections.singletonList(dsBackingIndexName), getSnapshot(REPO, SNAPSHOT).indices());
assertTrue(
client.execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "ds" }))
.get()
.isAcknowledged()
);
assertAcked(client.execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "ds" })));
RestoreSnapshotResponse restoreSnapshotResponse = client.admin()
.cluster()
@ -788,11 +784,7 @@ public class DataStreamsSnapshotsIT extends AbstractSnapshotIntegTestCase {
RestStatus status = createSnapshotResponse.getSnapshotInfo().status();
assertEquals(RestStatus.OK, status);
assertTrue(
client.execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "ds" }))
.get()
.isAcknowledged()
);
assertAcked(client.execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "ds" })));
RestoreSnapshotResponse restoreSnapshotResponse = client.admin()
.cluster()
@ -818,12 +810,7 @@ public class DataStreamsSnapshotsIT extends AbstractSnapshotIntegTestCase {
.get();
assertThat(createSnapshotResponse.getSnapshotInfo().state(), Matchers.is(SnapshotState.SUCCESS));
assertThat(
client().execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "*" }))
.get()
.isAcknowledged(),
is(true)
);
assertAcked(client().execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "*" })));
final RestoreSnapshotResponse restoreSnapshotResponse = clusterAdmin().prepareRestoreSnapshot(REPO, snapshotName).get();
assertThat(restoreSnapshotResponse.getRestoreInfo().indices(), empty());
@ -911,9 +898,7 @@ public class DataStreamsSnapshotsIT extends AbstractSnapshotIntegTestCase {
.setIncludeGlobalState(false)
.execute()
);
assertAcked(
clusterAdmin().prepareCloneSnapshot(REPO, sourceSnapshotName, "target-snapshot-1").setIndices(indexWithoutDataStream).get()
);
assertAcked(clusterAdmin().prepareCloneSnapshot(REPO, sourceSnapshotName, "target-snapshot-1").setIndices(indexWithoutDataStream));
}
public void testPartialRestoreSnapshotThatIncludesDataStream() {
@ -1001,9 +986,7 @@ public class DataStreamsSnapshotsIT extends AbstractSnapshotIntegTestCase {
snapshotInfo.dataStreams(),
not(hasItems("ds"))
);
assertAcked(
client().execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "other-ds" })).get()
);
assertAcked(client().execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { "other-ds" })));
RestoreInfo restoreSnapshotResponse = clusterAdmin().prepareRestoreSnapshot(repoName, snapshotName)
.setWaitForCompletion(true)

6
modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/lifecycle/DataStreamLifecycleServiceIT.java
View file

@ -29,7 +29,6 @@ import org.elasticsearch.action.datastreams.GetDataStreamAction;
import org.elasticsearch.action.datastreams.ModifyDataStreamsAction;
import org.elasticsearch.action.datastreams.lifecycle.ExplainIndexDataStreamLifecycle;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
import org.elasticsearch.cluster.metadata.DataStream;
import org.elasticsearch.cluster.metadata.DataStreamAction;
@ -75,6 +74,7 @@ import static org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleService
import static org.elasticsearch.datastreams.lifecycle.DataStreamLifecycleService.TARGET_MERGE_FACTOR_VALUE;
import static org.elasticsearch.index.IndexSettings.LIFECYCLE_ORIGINATION_DATE;
import static org.elasticsearch.indices.ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
@ -742,8 +742,6 @@ public class DataStreamLifecycleServiceIT extends ESIntegTestCase {
new String[] { dataStreamName },
dataRetention
);
AcknowledgedResponse putDataLifecycleResponse = client().execute(PutDataStreamLifecycleAction.INSTANCE, putDataLifecycleRequest)
.actionGet();
assertThat(putDataLifecycleResponse.isAcknowledged(), equalTo(true));
assertAcked(client().execute(PutDataStreamLifecycleAction.INSTANCE, putDataLifecycleRequest));
}
}

21
modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamsStatsTests.java
View file

@ -39,6 +39,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import static java.lang.Math.max;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
public class DataStreamsStatsTests extends ESSingleNodeTestCase {
@ -235,15 +236,13 @@ public class DataStreamsStatsTests extends ESSingleNodeTestCase {
new ComposableIndexTemplate.DataStreamTemplate(hidden, false),
null
);
assertTrue(
assertAcked(
client().execute(
PutComposableIndexTemplateAction.INSTANCE,
new PutComposableIndexTemplateAction.Request(dataStreamName + "_template").indexTemplate(template)
).actionGet().isAcknowledged()
);
assertTrue(
client().execute(CreateDataStreamAction.INSTANCE, new CreateDataStreamAction.Request(dataStreamName)).get().isAcknowledged()
)
);
assertAcked(client().execute(CreateDataStreamAction.INSTANCE, new CreateDataStreamAction.Request(dataStreamName)));
createdDataStreams.add(dataStreamName);
return dataStreamName;
}
@ -281,17 +280,13 @@ public class DataStreamsStatsTests extends ESSingleNodeTestCase {
return client().execute(DataStreamsStatsAction.INSTANCE, request).get();
}
private void deleteDataStream(String dataStreamName) throws InterruptedException, java.util.concurrent.ExecutionException {
assertTrue(
client().execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { dataStreamName }))
.get()
.isAcknowledged()
);
assertTrue(
private void deleteDataStream(String dataStreamName) {
assertAcked(client().execute(DeleteDataStreamAction.INSTANCE, new DeleteDataStreamAction.Request(new String[] { dataStreamName })));
assertAcked(
client().execute(
DeleteComposableIndexTemplateAction.INSTANCE,
new DeleteComposableIndexTemplateAction.Request(dataStreamName + "_template")
).actionGet().isAcknowledged()
)
);
}
}

1
modules/legacy-geo/src/internalClusterTest/java/org/elasticsearch/legacygeo/search/LegacyGeoShapeIT.java
View file

@ -57,7 +57,6 @@ public class LegacyGeoShapeIT extends GeoShapeIntegTestCase {
assertAcked(
prepareCreate("test").setSettings(settings(randomSupportedVersion()).build())
.setMapping("shape", "type=geo_shape,strategy=recursive,tree=geohash")
.get()
);
ensureGreen();

8
plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsRepositoryTests.java
View file

@ -10,7 +10,6 @@ package org.elasticsearch.repositories.hdfs;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import org.elasticsearch.action.admin.cluster.repositories.cleanup.CleanupRepositoryResponse;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.settings.MockSecureSettings;
import org.elasticsearch.common.settings.SecureSettings;
import org.elasticsearch.common.settings.Settings;
@ -19,6 +18,7 @@ import org.elasticsearch.repositories.AbstractThirdPartyRepositoryTestCase;
import java.util.Collection;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
@ -37,7 +37,8 @@ public class HdfsRepositoryTests extends AbstractThirdPartyRepositoryTestCase {
@Override
protected void createRepository(String repoName) {
AcknowledgedResponse putRepositoryResponse = clusterAdmin().preparePutRepository(repoName)
assertAcked(
clusterAdmin().preparePutRepository(repoName)
.setType("hdfs")
.setSettings(
Settings.builder()
@ -47,8 +48,7 @@ public class HdfsRepositoryTests extends AbstractThirdPartyRepositoryTestCase {
.put("chunk_size", randomIntBetween(100, 1000) + "k")
.put("compress", randomBoolean())
)
.get();
assertThat(putRepositoryResponse.isAcknowledged(), equalTo(true));
);
}
// HDFS repository doesn't have precise cleanup stats so we only check whether or not any blobs were removed

8
plugins/repository-hdfs/src/test/java/org/elasticsearch/repositories/hdfs/HdfsTests.java
View file

@ -11,7 +11,6 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.common.settings.Settings;
@ -25,6 +24,7 @@ import org.elasticsearch.test.ESSingleNodeTestCase;
import java.util.Collection;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
@ -39,7 +39,8 @@ public class HdfsTests extends ESSingleNodeTestCase {
public void testSimpleWorkflow() {
Client client = client();
AcknowledgedResponse putRepositoryResponse = client.admin()
assertAcked(
client.admin()
.cluster()
.preparePutRepository("test-repo")
.setType("hdfs")
@ -51,8 +52,7 @@ public class HdfsTests extends ESSingleNodeTestCase {
.put("chunk_size", randomIntBetween(100, 1000) + "k")
.put("compress", randomBoolean())
)
.get();
assertThat(putRepositoryResponse.isAcknowledged(), equalTo(true));
);
createIndex("test-idx-1");
createIndex("test-idx-2");

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

@ -19,7 +19,6 @@ import org.apache.lucene.tests.util.TimeUnits;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.LatchedActionListener;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
import org.elasticsearch.action.bulk.BulkProcessor2;
import org.elasticsearch.action.bulk.BulkRequest;
@ -187,8 +186,7 @@ public class CCSDuelIT extends ESRestTestCase {
IndexResponse indexResponse = restHighLevelClient.index(indexRequest, RequestOptions.DEFAULT);
assertEquals(201, indexResponse.status().getStatus());
CreateIndexResponse response = createIndex(INDEX_NAME + "_empty");
assertTrue(response.isAcknowledged());
ElasticsearchAssertions.assertAcked(createIndex(INDEX_NAME + "_empty"));
int numShards = randomIntBetween(1, 5);
Settings settings = indexSettings(numShards, 0).build();
@ -209,8 +207,7 @@ public class CCSDuelIT extends ESRestTestCase {
}
}
}""";
response = createIndex(INDEX_NAME, settings, mapping);
assertTrue(response.isAcknowledged());
ElasticsearchAssertions.assertAcked(createIndex(INDEX_NAME, settings, mapping));
BulkProcessor2 bulkProcessor = BulkProcessor2.builder(
(r, l) -> restHighLevelClient.bulkAsync(r, RequestOptions.DEFAULT, l),

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

@ -1259,7 +1259,6 @@ public final class ClusterAllocationExplainIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("idx")
.setSettings(indexSettings(numPrimaries, numReplicas).put(settings))
.setWaitForActiveShards(activeShardCount)
.get()
);
if (activeShardCount != ActiveShardCount.NONE) {

7
server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/AutoCreateSystemIndexIT.java
View file

@ -169,7 +169,6 @@ public class AutoCreateSystemIndexIT extends ESIntegTestCase {
indicesAdmin().preparePutTemplate("test-template")
.setPatterns(List.of(indexName + "*"))
.addAlias(new Alias(indexName + "-legacy-alias"))
.get()
);
String nonPrimaryIndex = indexName + "-2";
@ -222,7 +221,7 @@ public class AutoCreateSystemIndexIT extends ESIntegTestCase {
client().execute(
PutComposableIndexTemplateAction.INSTANCE,
new PutComposableIndexTemplateAction.Request("test-composable-template").indexTemplate(cit)
).get()
)
);
String nonPrimaryIndex = indexName + "-2";
@ -246,7 +245,7 @@ public class AutoCreateSystemIndexIT extends ESIntegTestCase {
client().execute(
DeleteComposableIndexTemplateAction.INSTANCE,
new DeleteComposableIndexTemplateAction.Request("test-composable-template")
).get()
)
);
}
@ -269,7 +268,7 @@ public class AutoCreateSystemIndexIT extends ESIntegTestCase {
client().execute(
DeleteComposableIndexTemplateAction.INSTANCE,
new DeleteComposableIndexTemplateAction.Request("test-composable-template")
).get()
)
);
}

1
server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CloneIndexIT.java
View file

@ -64,7 +64,6 @@ public class CloneIndexIT extends ESIntegTestCase {
.setSettings(
Settings.builder().put("index.number_of_replicas", createWithReplicas ? 1 : 0).putNull("index.blocks.write").build()
)
.get()
);
ensureGreen();
assertNoResizeSourceIndexSettings("target");

11
server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/CreateSystemIndicesIT.java
View file

@ -66,9 +66,7 @@ public class CreateSystemIndicesIT extends ESIntegTestCase {
@After
public void afterEach() throws Exception {
assertAcked(indicesAdmin().prepareDeleteTemplate("*").get());
assertAcked(
client().execute(DeleteComposableIndexTemplateAction.INSTANCE, new DeleteComposableIndexTemplateAction.Request("*")).get()
);
assertAcked(client().execute(DeleteComposableIndexTemplateAction.INSTANCE, new DeleteComposableIndexTemplateAction.Request("*")));
}
@Override
@ -160,7 +158,6 @@ public class CreateSystemIndicesIT extends ESIntegTestCase {
indicesAdmin().preparePutTemplate("test-template")
.setPatterns(List.of(indexName + "*"))
.addAlias(new Alias(indexName + "-legacy-alias"))
.get()
);
assertAcked(prepareCreate(primaryIndexName));
@ -213,7 +210,7 @@ public class CreateSystemIndicesIT extends ESIntegTestCase {
client().execute(
PutComposableIndexTemplateAction.INSTANCE,
new PutComposableIndexTemplateAction.Request("test-composable-template").indexTemplate(cit)
).get()
)
);
assertAcked(prepareCreate(primaryIndexName));
@ -232,7 +229,7 @@ public class CreateSystemIndicesIT extends ESIntegTestCase {
client().execute(
DeleteComposableIndexTemplateAction.INSTANCE,
new DeleteComposableIndexTemplateAction.Request("test-composable-template")
).get()
)
);
}
@ -259,7 +256,7 @@ public class CreateSystemIndicesIT extends ESIntegTestCase {
client().execute(
DeleteComposableIndexTemplateAction.INSTANCE,
new DeleteComposableIndexTemplateAction.Request("test-composable-template")
).get()
)
);
}

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

@ -104,7 +104,6 @@ public class ShrinkIndexIT extends ESIntegTestCase {
assertAcked(
indicesAdmin().prepareResizeIndex("source", "first_shrink")
.setSettings(indexSettings(shardSplits[1], 0).putNull("index.blocks.write").build())
.get()
);
ensureGreen();
assertHitCount(prepareSearch("first_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20);
@ -131,7 +130,6 @@ public class ShrinkIndexIT extends ESIntegTestCase {
.setSettings(
indexSettings(shardSplits[2], 0).putNull("index.blocks.write").putNull("index.routing.allocation.require._name").build()
)
.get()
);
ensureGreen();
assertHitCount(prepareSearch("second_shrink").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), 20);
@ -272,7 +270,6 @@ public class ShrinkIndexIT extends ESIntegTestCase {
.putNull("index.routing.allocation.require._name")
.build()
)
.get()
);
ensureGreen();
@ -462,9 +459,7 @@ public class ShrinkIndexIT extends ESIntegTestCase {
// check that the index sort order of `source` is correctly applied to the `target`
assertAcked(
indicesAdmin().prepareResizeIndex("source", "target")
.setSettings(indexSettings(2, 0).putNull("index.blocks.write").build())
.get()
indicesAdmin().prepareResizeIndex("source", "target").setSettings(indexSettings(2, 0).putNull("index.blocks.write").build())
);
ensureGreen();
assertNoResizeSourceIndexSettings("target");
@ -513,7 +508,6 @@ public class ShrinkIndexIT extends ESIntegTestCase {
assertAcked(
indicesAdmin().prepareResizeIndex("source", "target")
.setSettings(Settings.builder().put("index.number_of_replicas", 0).build())
.get()
);
ensureGreen();
assertNoResizeSourceIndexSettings("target");
@ -586,7 +580,6 @@ public class ShrinkIndexIT extends ESIntegTestCase {
).build()
)
.setResizeType(ResizeType.SHRINK)
.get()
);
ensureGreen();

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

@ -186,7 +186,6 @@ public class SplitIndexIT extends ESIntegTestCase {
indicesAdmin().prepareResizeIndex("source", "first_split")
.setResizeType(ResizeType.SPLIT)
.setSettings(firstSplitSettingsBuilder.build())
.get()
);
ensureGreen();
assertHitCount(prepareSearch("first_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs);
@ -214,7 +213,6 @@ public class SplitIndexIT extends ESIntegTestCase {
indicesAdmin().prepareResizeIndex("first_split", "second_split")
.setResizeType(ResizeType.SPLIT)
.setSettings(indexSettings(secondSplitShards, 0).putNull("index.blocks.write").build())
.get()
);
ensureGreen();
assertHitCount(prepareSearch("second_split").setSize(100).setQuery(new TermsQueryBuilder("foo", "bar")), numDocs);
@ -367,7 +365,6 @@ public class SplitIndexIT extends ESIntegTestCase {
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.SPLIT)
.setSettings(indexSettings(2, createWithReplicas ? 1 : 0).putNull("index.blocks.write").build())
.get()
);
ensureGreen();
assertNoResizeSourceIndexSettings("target");
@ -478,7 +475,6 @@ public class SplitIndexIT extends ESIntegTestCase {
indicesAdmin().prepareResizeIndex("source", "target")
.setResizeType(ResizeType.SPLIT)
.setSettings(indexSettings(4, 0).putNull("index.blocks.write").build())
.get()
);
ensureGreen();
flushAndRefresh();

5
server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexBlocksIT.java
View file

@ -58,10 +58,7 @@ public class DeleteIndexBlocksIT extends ESIntegTestCase {
} finally {
Settings settings = Settings.builder().putNull(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE).build();
assertAcked(
indicesAdmin().prepareUpdateSettings("test")
.setIndicesOptions(IndicesOptions.lenientExpandOpen())
.setSettings(settings)
.get()
indicesAdmin().prepareUpdateSettings("test").setIndicesOptions(IndicesOptions.lenientExpandOpen()).setSettings(settings)
);
}
}

2
server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/rollover/RolloverIT.java
View file

@ -525,7 +525,7 @@ public class RolloverIT extends ESIntegTestCase {
public void testRolloverMaxPrimaryShardDocs() throws Exception {
assertAcked(
prepareCreate("test-1").setSettings(Settings.builder().put("index.number_of_shards", 1)).addAlias(new Alias("test_alias")).get()
prepareCreate("test-1").setSettings(Settings.builder().put("index.number_of_shards", 1)).addAlias(new Alias("test_alias"))
);
int numDocs = randomIntBetween(10, 20);
for (int i = 0; i < numDocs; i++) {

7
server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkIntegrationIT.java
View file

@ -15,7 +15,6 @@ import org.elasticsearch.action.admin.indices.alias.Alias;
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.ingest.PutPipelineRequest;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.action.support.replication.ReplicationRequest;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.bytes.BytesReference;
@ -145,11 +144,7 @@ public class BulkIntegrationIT extends ESIntegTestCase {
.endArray()
.endObject();
AcknowledgedResponse acknowledgedResponse = clusterAdmin().putPipeline(
new PutPipelineRequest(pipelineId, BytesReference.bytes(pipeline), XContentType.JSON)
).get();
assertTrue(acknowledgedResponse.isAcknowledged());
assertAcked(clusterAdmin().putPipeline(new PutPipelineRequest(pipelineId, BytesReference.bytes(pipeline), XContentType.JSON)));
}
/** This test ensures that index deletion makes indexing fail quickly, not wait on the index that has disappeared */

7
server/src/internalClusterTest/java/org/elasticsearch/action/support/ActiveShardsObserverIT.java
View file

@ -55,8 +55,7 @@ public class ActiveShardsObserverIT extends ESIntegTestCase {
settingsBuilder.put("index.routing.allocation.exclude._name", exclude);
}
Settings settings = settingsBuilder.build();
CreateIndexResponse response = prepareCreate("test-idx").setSettings(settings).setWaitForActiveShards(ActiveShardCount.NONE).get();
assertTrue(response.isAcknowledged());
assertAcked(prepareCreate("test-idx").setSettings(settings).setWaitForActiveShards(ActiveShardCount.NONE));
}
public void testCreateIndexNotEnoughActiveShardsTimesOut() throws Exception {
@ -86,9 +85,7 @@ public class ActiveShardsObserverIT extends ESIntegTestCase {
.put(INDEX_NUMBER_OF_REPLICAS_SETTING.getKey(), internalCluster().numDataNodes() + randomIntBetween(0, 3))
.build();
assertAcked(
prepareCreate(indexName).setSettings(settings)
.setWaitForActiveShards(randomIntBetween(0, internalCluster().numDataNodes()))
.get()
prepareCreate(indexName).setSettings(settings).setWaitForActiveShards(randomIntBetween(0, internalCluster().numDataNodes()))
);
}

1
server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleClusterStateIT.java
View file

@ -256,7 +256,6 @@ public class SimpleClusterStateIT extends ESIntegTestCase {
)
.setMapping(mapping)
.setTimeout("60s")
.get()
);
ensureGreen(); // wait for green state, so its both green, and there are no more pending events
MappingMetadata masterMappingMetadata = indicesAdmin().prepareGetMappings("test").get().getMappings().get("test");

10
server/src/internalClusterTest/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceIT.java
View file

@ -128,13 +128,9 @@ public class TemplateUpgradeServiceIT extends ESIntegTestCase {
assertTemplates();
// Change some templates
assertAcked(indicesAdmin().preparePutTemplate("test_dummy_template").setOrder(0).setPatterns(Collections.singletonList("*")).get());
assertAcked(
indicesAdmin().preparePutTemplate("test_changed_template").setOrder(0).setPatterns(Collections.singletonList("*")).get()
);
assertAcked(
indicesAdmin().preparePutTemplate("test_removed_template").setOrder(1).setPatterns(Collections.singletonList("*")).get()
);
assertAcked(indicesAdmin().preparePutTemplate("test_dummy_template").setOrder(0).setPatterns(Collections.singletonList("*")));
assertAcked(indicesAdmin().preparePutTemplate("test_changed_template").setOrder(0).setPatterns(Collections.singletonList("*")));
assertAcked(indicesAdmin().preparePutTemplate("test_removed_template").setOrder(1).setPatterns(Collections.singletonList("*")));
AtomicInteger updateCount = new AtomicInteger();
// Wait for the templates to be updated back to normal

10
server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java
View file

@ -86,7 +86,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase {
internalCluster().startDataOnlyNodes(2);
assertAcked(
indicesAdmin().prepareCreate("test").setSettings(indexSettings(1, 1).put("index.global_checkpoint_sync.interval", "1s")).get()
indicesAdmin().prepareCreate("test").setSettings(indexSettings(1, 1).put("index.global_checkpoint_sync.interval", "1s"))
);
ensureGreen();
@ -399,9 +399,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase {
internalCluster().startMasterOnlyNode(Settings.EMPTY);
internalCluster().startDataOnlyNode(Settings.EMPTY);
assertAcked(
indicesAdmin().prepareCreate("test")
.setSettings(indexSettings(1, 1).put("index.unassigned.node_left.delayed_timeout", "0ms"))
.get()
indicesAdmin().prepareCreate("test").setSettings(indexSettings(1, 1).put("index.unassigned.node_left.delayed_timeout", "0ms"))
);
String replicaNode = internalCluster().startDataOnlyNode(Settings.EMPTY);
ensureGreen("test");
@ -430,9 +428,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase {
internalCluster().startMasterOnlyNode(Settings.EMPTY);
internalCluster().startDataOnlyNode(Settings.EMPTY);
assertAcked(
indicesAdmin().prepareCreate("test")
.setSettings(indexSettings(1, 1).put("index.unassigned.node_left.delayed_timeout", "0ms"))
.get()
indicesAdmin().prepareCreate("test").setSettings(indexSettings(1, 1).put("index.unassigned.node_left.delayed_timeout", "0ms"))
);
String replicaNode = internalCluster().startDataOnlyNode(Settings.EMPTY);
ensureGreen("test");

4
server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java
View file

@ -349,9 +349,7 @@ public class ClusterSettingsIT extends ESIntegTestCase {
if (readOnlyAllowDelete) {
settingsBuilder.put(Metadata.SETTING_READ_ONLY_ALLOW_DELETE_SETTING.getKey(), "true");
}
assertAcked(
clusterAdmin().prepareUpdateSettings().setPersistentSettings(settingsBuilder).setTransientSettings(settingsBuilder).get()
);
assertAcked(clusterAdmin().prepareUpdateSettings().setPersistentSettings(settingsBuilder).setTransientSettings(settingsBuilder));
ClusterState state = clusterAdmin().prepareState().get().getState();
if (readOnly) {

1
server/src/internalClusterTest/java/org/elasticsearch/cluster/settings/SettingsFilteringIT.java
View file

@ -80,7 +80,6 @@ public class SettingsFilteringIT extends ESIntegTestCase {
.put("filter_test.notfoo", "test")
.build()
)
.get()
);
GetSettingsResponse response = indicesAdmin().prepareGetSettings("test-idx").get();
Settings settings = response.getIndexToSettings().get("test-idx");

2
server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java
View file

@ -121,7 +121,6 @@ public class ClusterShardLimitIT extends ESIntegTestCase {
.setPatterns(Collections.singletonList("should-fail"))
.setOrder(1)
.setSettings(indexSettings(counts.getFailingIndexShards(), counts.getFailingIndexReplicas()))
.get()
);
final IllegalArgumentException e = expectThrows(
@ -243,7 +242,6 @@ public class ClusterShardLimitIT extends ESIntegTestCase {
indicesAdmin().prepareUpdateSettings("test-index")
.setPreserveExisting(true)
.setSettings(Settings.builder().put("number_of_replicas", dataNodes))
.get()
);
ClusterState clusterState = clusterAdmin().prepareState().get().getState();
assertEquals(0, clusterState.getMetadata().index("test-index").getNumberOfReplicas());

1
server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java
View file

@ -96,7 +96,6 @@ public class ShardInfoIT extends ESIntegTestCase {
assertAcked(
prepareCreate("idx").setSettings(indexSettings(numberOfPrimaryShards, numCopies - 1))
.setMapping("_routing", "required=" + routingRequired)
.get()
);
for (int i = 0; i < numberOfPrimaryShards; i++) {
ensureActiveShardCopies(i, numNodes);

16
server/src/internalClusterTest/java/org/elasticsearch/index/HiddenIndexIT.java
View file

@ -74,21 +74,16 @@ public class HiddenIndexIT extends ESIntegTestCase {
}
public void testGlobalTemplatesDoNotApply() {
assertAcked(indicesAdmin().preparePutTemplate("a_global_template").setPatterns(List.of("*")).setMapping("foo", "type=text").get());
assertAcked(indicesAdmin().preparePutTemplate("a_global_template").setPatterns(List.of("*")).setMapping("foo", "type=text"));
assertAcked(indicesAdmin().preparePutTemplate("not_global_template").setPatterns(List.of("a*")).setMapping("bar", "type=text"));
assertAcked(
indicesAdmin().preparePutTemplate("not_global_template").setPatterns(List.of("a*")).setMapping("bar", "type=text").get()
indicesAdmin().preparePutTemplate("specific_template").setPatterns(List.of("a_hidden_index")).setMapping("baz", "type=text")
);
assertAcked(
indicesAdmin().preparePutTemplate("specific_template")
.setPatterns(List.of("a_hidden_index"))
.setMapping("baz", "type=text")
.get()
);
assertAcked(
indicesAdmin().preparePutTemplate("unused_template").setPatterns(List.of("not_used")).setMapping("foobar", "type=text").get()
indicesAdmin().preparePutTemplate("unused_template").setPatterns(List.of("not_used")).setMapping("foobar", "type=text")
);
assertAcked(indicesAdmin().prepareCreate("a_hidden_index").setSettings(Settings.builder().put("index.hidden", true).build()).get());
assertAcked(indicesAdmin().prepareCreate("a_hidden_index").setSettings(Settings.builder().put("index.hidden", true).build()));
GetMappingsResponse mappingsResponse = indicesAdmin().prepareGetMappings("a_hidden_index").get();
assertThat(mappingsResponse.mappings().size(), is(1));
@ -125,7 +120,6 @@ public class HiddenIndexIT extends ESIntegTestCase {
.setPatterns(List.of("my_hidden_pattern*"))
.setMapping("foo", "type=text")
.setSettings(Settings.builder().put("index.hidden", true).build())
.get()
);
assertAcked(indicesAdmin().prepareCreate("my_hidden_pattern1").get());
GetSettingsResponse getSettingsResponse = indicesAdmin().prepareGetSettings("my_hidden_pattern1").get();

6
server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesRequestCacheIT.java
View file

@ -48,7 +48,6 @@ public class IndicesRequestCacheIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("index")
.setMapping("f", "type=date")
.setSettings(Settings.builder().put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true))
.get()
);
indexRandom(
true,
@ -110,7 +109,6 @@ public class IndicesRequestCacheIT extends ESIntegTestCase {
indexSettings(5, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)
.put("index.number_of_routing_shards", 5)
)
.get()
);
indexRandom(
true,
@ -173,7 +171,6 @@ public class IndicesRequestCacheIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("index")
.setMapping("s", "type=date")
.setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true))
.get()
);
indexRandom(
true,
@ -232,7 +229,6 @@ public class IndicesRequestCacheIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("index")
.setMapping("d", "type=date")
.setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true))
.get()
);
indexRandom(
true,
@ -470,7 +466,6 @@ public class IndicesRequestCacheIT extends ESIntegTestCase {
.setMapping("created_at", "type=date")
.setSettings(settings)
.addAlias(new Alias("last_week").filter(QueryBuilders.rangeQuery("created_at").gte("now-7d/d")))
.get()
);
ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
client.prepareIndex("index").setId("1").setRouting("1").setSource("created_at", DateTimeFormatter.ISO_LOCAL_DATE.format(now)).get();
@ -516,7 +511,6 @@ public class IndicesRequestCacheIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("index")
.setMapping("k", "type=keyword")
.setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true))
.get()
);
indexRandom(true, client.prepareIndex("index").setSource("k", "hello"));
ensureSearchable("index");

2
server/src/internalClusterTest/java/org/elasticsearch/indices/mapping/MalformedDynamicTemplateIT.java
View file

@ -56,7 +56,7 @@ public class MalformedDynamicTemplateIT extends ESIntegTestCase {
.put(indexSettings())
.put("number_of_shards", 1)
.put("index.version.created", IndexVersionUtils.randomPreviousCompatibleVersion(random(), IndexVersions.V_8_0_0))
).setMapping(mapping).get()
).setMapping(mapping)
);
client().prepareIndex(indexName).setSource("{\"foo\" : \"bar\"}", XContentType.JSON).get();
assertNoFailures((indicesAdmin().prepareRefresh(indexName)).get());

6
server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java
View file

@ -1641,7 +1641,6 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase {
assertAcked(
indicesAdmin().prepareCreate(indexName)
.setSettings(indexSettings(1, 1).put(MockEngineSupport.DISABLE_FLUSH_ON_CLOSE.getKey(), randomBoolean()))
.get()
);
final List<IndexRequestBuilder> indexRequests = IntStream.range(0, between(10, 500))
.mapToObj(n -> client().prepareIndex(indexName).setSource("foo", "bar"))
@ -1651,9 +1650,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase {
internalCluster().stopRandomDataNode();
internalCluster().stopRandomDataNode();
final String nodeWithoutData = internalCluster().startDataOnlyNode();
assertAcked(
clusterAdmin().prepareReroute().add(new AllocateEmptyPrimaryAllocationCommand(indexName, 0, nodeWithoutData, true)).get()
);
assertAcked(clusterAdmin().prepareReroute().add(new AllocateEmptyPrimaryAllocationCommand(indexName, 0, nodeWithoutData, true)));
internalCluster().startDataOnlyNode(randomNodeDataPathSettings);
ensureGreen();
for (ShardStats shardStats : indicesAdmin().prepareStats(indexName).get().getIndex(indexName).getShards()) {
@ -2009,7 +2006,6 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase {
.put(BlobStoreRepository.USE_FOR_PEER_RECOVERY_SETTING.getKey(), enableSnapshotPeerRecoveries)
.put("compress", false)
)
.get()
);
}

1
server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateNumberOfReplicasIT.java
View file

@ -466,7 +466,6 @@ public class UpdateNumberOfReplicasIT extends ESIntegTestCase {
indicesAdmin().prepareUpdateSettings("non-existent-*")
.setSettings(Settings.builder().put("index.number_of_replicas", 1))
.setIndicesOptions(options)
.get()
);
final int numberOfReplicas = Integer.parseInt(
indicesAdmin().prepareGetSettings("test-index").get().getSetting("test-index", "index.number_of_replicas")

31
server/src/internalClusterTest/java/org/elasticsearch/indices/settings/UpdateSettingsIT.java
View file

@ -468,7 +468,7 @@ public class UpdateSettingsIT extends ESIntegTestCase {
{
final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertAcked(
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.refresh_interval", "500ms")).get()
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.refresh_interval", "500ms"))
);
final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertThat(newSettingsVersion, equalTo(1 + settingsVersion));
@ -476,14 +476,10 @@ public class UpdateSettingsIT extends ESIntegTestCase {
{
final boolean block = randomBoolean();
assertAcked(
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)).get()
);
assertAcked(indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)));
final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertAcked(
indicesAdmin().prepareUpdateSettings("test")
.setSettings(Settings.builder().put("index.blocks.read_only", block == false))
.get()
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block == false))
);
final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertThat(newSettingsVersion, equalTo(1 + settingsVersion));
@ -491,7 +487,7 @@ public class UpdateSettingsIT extends ESIntegTestCase {
// if the read-only block is present, remove it
if (block == false) {
assertAcked(
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", false)).get()
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", false))
);
}
}
@ -505,9 +501,7 @@ public class UpdateSettingsIT extends ESIntegTestCase {
final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
final String refreshInterval = indicesAdmin().prepareGetSettings("test").get().getSetting("test", "index.refresh_interval");
assertAcked(
indicesAdmin().prepareUpdateSettings("test")
.setSettings(Settings.builder().put("index.refresh_interval", refreshInterval))
.get()
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.refresh_interval", refreshInterval))
);
final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertThat(newSettingsVersion, equalTo(settingsVersion));
@ -515,21 +509,17 @@ public class UpdateSettingsIT extends ESIntegTestCase {
{
final boolean block = randomBoolean();
assertAcked(
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)).get()
);
assertAcked(indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)));
// now put the same block again
final long settingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertAcked(
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)).get()
);
assertAcked(indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", block)));
final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertThat(newSettingsVersion, equalTo(settingsVersion));
// if the read-only block is present, remove it
if (block) {
assertAcked(
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", false)).get()
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.blocks.read_only", false))
);
}
}
@ -548,9 +538,7 @@ public class UpdateSettingsIT extends ESIntegTestCase {
indicesAdmin().prepareGetSettings("test").get().getSetting("test", "index.number_of_replicas")
);
assertAcked(
indicesAdmin().prepareUpdateSettings("test")
.setSettings(Settings.builder().put("index.number_of_replicas", numberOfReplicas))
.get()
indicesAdmin().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", numberOfReplicas))
);
final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertThat(newSettingsVersion, equalTo(settingsVersion));
@ -571,7 +559,6 @@ public class UpdateSettingsIT extends ESIntegTestCase {
assertAcked(
indicesAdmin().prepareUpdateSettings("test")
.setSettings(Settings.builder().put("index.number_of_replicas", 1 + numberOfReplicas))
.get()
);
final long newSettingsVersion = clusterAdmin().prepareState().get().getState().metadata().index("test").getSettingsVersion();
assertThat(newSettingsVersion, equalTo(1 + settingsVersion));

10
server/src/internalClusterTest/java/org/elasticsearch/indices/state/SimpleIndexStateIT.java
View file

@ -12,8 +12,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.open.OpenIndexResponse;
import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.cluster.metadata.IndexMetadata;
@ -67,8 +65,7 @@ public class SimpleIndexStateIT extends ESIntegTestCase {
}
logger.info("--> opening index...");
OpenIndexResponse openIndexResponse = indicesAdmin().prepareOpen("test").get();
assertThat(openIndexResponse.isAcknowledged(), equalTo(true));
assertAcked(indicesAdmin().prepareOpen("test"));
logger.info("--> waiting for green status");
ensureGreen();
@ -139,9 +136,6 @@ public class SimpleIndexStateIT extends ESIntegTestCase {
}
logger.info("--> creating test index with valid settings ");
CreateIndexResponse response = indicesAdmin().prepareCreate("test")
.setSettings(Settings.builder().put("number_of_shards", 1))
.get();
assertThat(response.isAcknowledged(), equalTo(true));
assertAcked(indicesAdmin().prepareCreate("test").setSettings(Settings.builder().put("number_of_shards", 1)));
}
}

3
server/src/internalClusterTest/java/org/elasticsearch/indices/stats/IndexStatsIT.java
View file

@ -131,7 +131,6 @@ public class IndexStatsIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("test")
.setSettings(settingsBuilder().put("index.number_of_shards", 2))
.setMapping("field", "type=text,fielddata=true", "field2", "type=text,fielddata=true")
.get()
);
ensureGreen();
client().prepareIndex("test").setId("1").setSource("field", "value1", "field2", "value1").execute().actionGet();
@ -236,7 +235,6 @@ public class IndexStatsIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("test")
.setSettings(settingsBuilder().put("index.number_of_replicas", 0).put("index.number_of_shards", 2))
.setMapping("field", "type=text,fielddata=true")
.get()
);
ensureGreen();
clusterAdmin().prepareHealth().setWaitForGreenStatus().execute().actionGet();
@ -326,7 +324,6 @@ public class IndexStatsIT extends ESIntegTestCase {
assertAcked(
indicesAdmin().prepareCreate("idx")
.setSettings(Settings.builder().put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true))
.get()
);
ensureGreen();

2
server/src/internalClusterTest/java/org/elasticsearch/indices/template/SimpleIndexTemplateIT.java
View file

@ -811,7 +811,6 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase {
.setVersion(version)
.setOrder(order)
.setMapping("field", "type=text")
.get()
);
GetIndexTemplatesResponse response = indicesAdmin().prepareGetTemplates("versioned_template").get();
@ -913,7 +912,6 @@ public class SimpleIndexTemplateIT extends ESIntegTestCase {
indicesAdmin().preparePutTemplate("just_partitions")
.setPatterns(Collections.singletonList("te*"))
.setSettings(Settings.builder().put("index.routing_partition_size", "6"))
.get()
);
// create an index with too few shards

12
server/src/internalClusterTest/java/org/elasticsearch/repositories/RepositoriesServiceIT.java
View file

@ -46,9 +46,7 @@ public class RepositoriesServiceIT extends ESIntegTestCase {
final Settings.Builder repoSettings = Settings.builder().put("location", randomRepoPath());
assertAcked(
client.admin().cluster().preparePutRepository(repositoryName).setType(FsRepository.TYPE).setSettings(repoSettings).get()
);
assertAcked(client.admin().cluster().preparePutRepository(repositoryName).setType(FsRepository.TYPE).setSettings(repoSettings));
final GetRepositoriesResponse originalGetRepositoriesResponse = client.admin()
.cluster()
@ -66,9 +64,7 @@ public class RepositoriesServiceIT extends ESIntegTestCase {
final boolean updated = randomBoolean();
final String updatedRepositoryType = updated ? "mock" : FsRepository.TYPE;
assertAcked(
client.admin().cluster().preparePutRepository(repositoryName).setType(updatedRepositoryType).setSettings(repoSettings).get()
);
assertAcked(client.admin().cluster().preparePutRepository(repositoryName).setType(updatedRepositoryType).setSettings(repoSettings));
final GetRepositoriesResponse updatedGetRepositoriesResponse = client.admin()
.cluster()
@ -86,8 +82,6 @@ public class RepositoriesServiceIT extends ESIntegTestCase {
// check that a noop update does not verify. Since the new data node does not share the same `path.repo`, verification will fail if
// it runs.
internalCluster().startDataOnlyNode(Settings.builder().put(Environment.PATH_REPO_SETTING.getKey(), createTempDir()).build());
assertAcked(
client.admin().cluster().preparePutRepository(repositoryName).setType(updatedRepositoryType).setSettings(repoSettings).get()
);
assertAcked(client.admin().cluster().preparePutRepository(repositoryName).setType(updatedRepositoryType).setSettings(repoSettings));
}
}

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java
View file

@ -1494,7 +1494,6 @@ public class DateHistogramIT extends ESIntegTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=date")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
String date = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.format(date(1, 1));
String date2 = DateFieldMapper.DEFAULT_DATE_TIME_FORMATTER.format(date(2, 1));

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java
View file

@ -597,7 +597,6 @@ public class DateRangeIT extends ESIntegTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("date", "type=date")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java
View file

@ -915,7 +915,6 @@ public class DoubleTermsIT extends AbstractTermsTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=float")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/HistogramIT.java
View file

@ -1089,7 +1089,6 @@ public class HistogramIT extends ESIntegTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=float")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/LongTermsIT.java
View file

@ -875,7 +875,6 @@ public class LongTermsIT extends AbstractTermsTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/RangeIT.java
View file

@ -888,7 +888,6 @@ public class RangeIT extends ESIntegTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("i", "type=integer")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java
View file

@ -557,7 +557,6 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("s", "type=long", "t", "type=text")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

4
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/terms/StringTermsIT.java
View file

@ -122,7 +122,6 @@ public class StringTermsIT extends AbstractTermsTestCase {
assertAcked(
indicesAdmin().prepareCreate("idx")
.setMapping(SINGLE_VALUED_FIELD_NAME, "type=keyword", MULTI_VALUED_FIELD_NAME, "type=keyword", "tag", "type=keyword")
.get()
);
List<IndexRequestBuilder> builders = new ArrayList<>();
for (int i = 0; i < 5; i++) {
@ -148,7 +147,6 @@ public class StringTermsIT extends AbstractTermsTestCase {
assertAcked(
indicesAdmin().prepareCreate("high_card_idx")
.setMapping(SINGLE_VALUED_FIELD_NAME, "type=keyword", MULTI_VALUED_FIELD_NAME, "type=keyword", "tag", "type=keyword")
.get()
);
for (int i = 0; i < 100; i++) {
builders.add(
@ -226,7 +224,6 @@ public class StringTermsIT extends AbstractTermsTestCase {
assertAcked(
indicesAdmin().prepareCreate("sort_idx")
.setMapping(SINGLE_VALUED_FIELD_NAME, "type=keyword", MULTI_VALUED_FIELD_NAME, "type=keyword", "tag", "type=keyword")
.get()
);
for (int i = 1; i <= 3; i++) {
builders.add(
@ -1156,7 +1153,6 @@ public class StringTermsIT extends AbstractTermsTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=keyword")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsIT.java
View file

@ -827,7 +827,6 @@ public class ExtendedStatsIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentileRanksIT.java
View file

@ -537,7 +537,6 @@ public class HDRPercentileRanksIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/HDRPercentilesIT.java
View file

@ -509,7 +509,6 @@ public class HDRPercentilesIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationIT.java
View file

@ -474,7 +474,6 @@ public class MedianAbsoluteDeviationIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricIT.java
View file

@ -1111,7 +1111,6 @@ public class ScriptedMetricIT extends ESIntegTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/StatsIT.java
View file

@ -225,7 +225,6 @@ public class StatsIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/SumIT.java
View file

@ -203,7 +203,6 @@ public class SumIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentileRanksIT.java
View file

@ -449,7 +449,6 @@ public class TDigestPercentileRanksIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TDigestPercentilesIT.java
View file

@ -424,7 +424,6 @@ public class TDigestPercentilesIT extends AbstractNumericTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/TopHitsIT.java
View file

@ -1077,7 +1077,6 @@ public class TopHitsIT extends ESIntegTestCase {
.setSettings(
Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1)
)
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/metrics/ValueCountIT.java
View file

@ -203,7 +203,6 @@ public class ValueCountIT extends ESIntegTestCase {
assertAcked(
prepareCreate("cache_test_idx").setMapping("d", "type=long")
.setSettings(Settings.builder().put("requests.cache.enable", true).put("number_of_shards", 1).put("number_of_replicas", 1))
.get()
);
indexRandom(
true,

1
server/src/internalClusterTest/java/org/elasticsearch/search/fetch/subphase/highlight/HighlighterSearchIT.java
View file

@ -3392,7 +3392,6 @@ public class HighlighterSearchIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("index-1")
.setMapping("d", "type=date", "field", "type=text,store=true,term_vector=with_positions_offsets")
.setSettings(indexSettings(2, 0))
.get()
);
ZonedDateTime now = ZonedDateTime.now(ZoneOffset.UTC);
DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time");

2
server/src/internalClusterTest/java/org/elasticsearch/search/fields/SearchFieldsIT.java
View file

@ -988,7 +988,7 @@ public class SearchFieldsIT extends ESIntegTestCase {
"type=long",
"md",
"type=double"
).get()
)
);
final int numDocs = randomIntBetween(3, 8);
List<IndexRequestBuilder> reqs = new ArrayList<>();

2
server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/FunctionScoreFieldValueIT.java
View file

@ -43,7 +43,7 @@ public class FunctionScoreFieldValueIT extends ESIntegTestCase {
.endObject()
.endObject()
.endObject()
).get()
)
);
client().prepareIndex("test").setId("1").setSource("test", 5, "body", "foo").get();

3
server/src/internalClusterTest/java/org/elasticsearch/search/profile/aggregation/AggregationProfilerIT.java
View file

@ -96,7 +96,6 @@ public class AggregationProfilerIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("idx")
.setSettings(Map.of("number_of_shards", 1, "number_of_replicas", 0))
.setMapping(STRING_FIELD, "type=keyword", NUMBER_FIELD, "type=integer", TAG_FIELD, "type=keyword")
.get()
);
List<IndexRequestBuilder> builders = new ArrayList<>();
@ -627,7 +626,6 @@ public class AggregationProfilerIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("dateidx")
.setSettings(Map.of("number_of_shards", 1, "number_of_replicas", 0))
.setMapping("date", "type=date")
.get()
);
List<IndexRequestBuilder> builders = new ArrayList<>();
for (int i = 0; i < RangeAggregator.DOCS_PER_RANGE_TO_USE_FILTERS * 2; i++) {
@ -701,7 +699,6 @@ public class AggregationProfilerIT extends ESIntegTestCase {
indicesAdmin().prepareCreate("date_filter_by_filter_disabled")
.setSettings(Map.of("number_of_shards", 1, "number_of_replicas", 0))
.setMapping("date", "type=date", "keyword", "type=keyword")
.get()
);
List<IndexRequestBuilder> builders = new ArrayList<>();
for (int i = 0; i < RangeAggregator.DOCS_PER_RANGE_TO_USE_FILTERS * 2; i++) {

1
server/src/internalClusterTest/java/org/elasticsearch/search/slice/SearchSliceIT.java
View file

@ -141,7 +141,6 @@ public class SearchSliceIT extends ESIntegTestCase {
.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("test").alias("alias1").routing("foo"))
.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("test").alias("alias2").routing("bar"))
.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("test").alias("alias3").routing("baz"))
.get()
);
SearchResponse sr = prepareSearch("alias1", "alias3").setQuery(matchAllQuery()).setSize(0).get();
int numDocs = (int) sr.getHits().getTotalHits().value;

4
server/src/internalClusterTest/java/org/elasticsearch/search/sort/FieldSortIT.java
View file

@ -1654,12 +1654,11 @@ public class FieldSortIT extends ESIntegTestCase {
assertAcked(
prepareCreate("test1").setSettings(
Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(2, maximumNumberOfShards()))
).setMapping(sortField, "type=long").get()
).setMapping(sortField, "type=long")
);
assertAcked(
prepareCreate("test2").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1))
.setMapping(sortField, "type=long")
.get()
);
for (String index : new String[] { "test1", "test2" }) {
@ -1983,7 +1982,6 @@ public class FieldSortIT extends ESIntegTestCase {
assertAcked(
prepareCreate("test1").setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2))
.setMapping("long_field", "type=long")
.get()
);
BulkRequestBuilder bulkBuilder = client().prepareBulk();

4
server/src/internalClusterTest/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderIT.java
View file

@ -341,9 +341,9 @@ public class GeoDistanceSortBuilderIT extends ESIntegTestCase {
public void testCrossIndexIgnoreUnmapped() throws Exception {
assertAcked(
prepareCreate("test1").setMapping("str_field", "type=keyword", "long_field", "type=long", "double_field", "type=double").get()
prepareCreate("test1").setMapping("str_field", "type=keyword", "long_field", "type=long", "double_field", "type=double")
);
assertAcked(prepareCreate("test2").get());
assertAcked(prepareCreate("test2"));
indexRandom(
true,

7
server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java
View file

@ -1221,7 +1221,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase {
mapping = mapping.endObject().endObject().endObject().endObject();
assertAcked(
indicesAdmin().prepareCreate(INDEX).setSettings(Settings.builder().put(indexSettings()).put(settings)).setMapping(mapping).get()
indicesAdmin().prepareCreate(INDEX).setSettings(Settings.builder().put(indexSettings()).put(settings)).setMapping(mapping)
);
}
@ -1275,7 +1275,6 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase {
.endObject()
.endObject()
)
.get()
);
// can cause stack overflow without the default max_input_length
String longString = replaceReservedChars(randomRealisticUnicodeOfLength(randomIntBetween(5000, 10000)), (char) 0x01);
@ -1304,7 +1303,6 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase {
.endObject()
.endObject()
)
.get()
);
// can cause stack overflow without the default max_input_length
String string = "foo" + (char) 0x00 + "bar";
@ -1342,7 +1340,6 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase {
.endObject()
.endObject()
)
.get()
);
String string = "foo bar";
client().prepareIndex(INDEX)
@ -1454,7 +1451,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase {
String index = "test";
assertAcked(
indicesAdmin().prepareCreate(index).setSettings(Settings.builder().put("index.number_of_shards", 2)).setMapping(mapping).get()
indicesAdmin().prepareCreate(index).setSettings(Settings.builder().put("index.number_of_shards", 2)).setMapping(mapping)
);
int numDocs = 2;

2
server/src/internalClusterTest/java/org/elasticsearch/search/suggest/ContextCompletionSuggestSearchIT.java
View file

@ -725,7 +725,7 @@ public class ContextCompletionSuggestSearchIT extends ESIntegTestCase {
mapping.endObject().endObject().endObject();
assertAcked(
indicesAdmin().prepareCreate(INDEX).setSettings(Settings.builder().put(indexSettings()).put(settings)).setMapping(mapping).get()
indicesAdmin().prepareCreate(INDEX).setSettings(Settings.builder().put(indexSettings()).put(settings)).setMapping(mapping)
);
}
}

1
server/src/internalClusterTest/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
View file

@ -247,7 +247,6 @@ public class DedicatedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTest
assertAcked(
prepareCreate("test-idx-none", 1, indexSettingsNoReplicas(6).put("index.routing.allocation.include.tag", "nowhere"))
.setWaitForActiveShards(ActiveShardCount.NONE)
.get()
);
assertTrue(indexExists("test-idx-none"));

1
server/src/internalClusterTest/java/org/elasticsearch/snapshots/RepositoriesIT.java
View file

@ -257,7 +257,6 @@ public class RepositoriesIT extends AbstractSnapshotIntegTestCase {
.put("random", randomAlphaOfLength(10))
.put("wait_after_unblock", 200)
)
.get()
);
logger.info("--> snapshot");

6
server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java
View file

@ -337,7 +337,6 @@ public class RestoreSnapshotIT extends AbstractSnapshotIntegTestCase {
.addAlias("test-idx-2", "alias-123")
.addAlias("test-idx-3", "alias-123")
.addAlias("test-idx-1", "alias-1")
.get()
);
assertFalse(indicesAdmin().prepareGetAliases("alias-123").get().getAliases().isEmpty());
@ -398,7 +397,7 @@ public class RestoreSnapshotIT extends AbstractSnapshotIntegTestCase {
createRepository("test-repo", "fs");
logger.info("--> creating test template");
assertThat(
assertAcked(
indicesAdmin().preparePutTemplate("test-template")
.setPatterns(Collections.singletonList("te*"))
.setMapping(
@ -418,9 +417,6 @@ public class RestoreSnapshotIT extends AbstractSnapshotIntegTestCase {
.endObject()
.endObject()
)
.get()
.isAcknowledged(),
equalTo(true)
);
createSnapshot("test-repo", "test-snap", Collections.emptyList());

1
server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java
View file

@ -29,7 +29,6 @@ public class FieldStatsProviderRefreshTests extends ESSingleNodeTestCase {
indicesAdmin().prepareCreate("index")
.setMapping("s", "type=text")
.setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true))
.get()
);
// Index some documents

1
test/framework/src/main/java/org/elasticsearch/indices/recovery/AbstractIndexRecoveryIntegTestCase.java
View file

@ -500,7 +500,6 @@ public abstract class AbstractIndexRecoveryIntegTestCase extends ESIntegTestCase
.put(BlobStoreRepository.USE_FOR_PEER_RECOVERY_SETTING.getKey(), true)
.put("compress", false)
)
.get()
);
// create snapshot

2
test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java
View file

@ -133,7 +133,7 @@ public abstract class ESSingleNodeTestCase extends ESTestCase {
var deleteDataStreamsRequest = new DeleteDataStreamAction.Request("*");
deleteDataStreamsRequest.indicesOptions(IndicesOptions.LENIENT_EXPAND_OPEN_CLOSED_HIDDEN);
try {
assertAcked(client().execute(DeleteDataStreamAction.INSTANCE, deleteDataStreamsRequest).actionGet());
assertAcked(client().execute(DeleteDataStreamAction.INSTANCE, deleteDataStreamsRequest));
} catch (IllegalStateException e) {
// Ignore if action isn't registered, because data streams is a module and
// if the delete action isn't registered then there no data streams to delete.

9
test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
View file

@ -26,7 +26,6 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.search.ShardSearchFailure;
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
import org.elasticsearch.action.support.broadcast.BaseBroadcastResponse;
import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
import org.elasticsearch.action.support.master.IsAcknowledgedSupplier;
import org.elasticsearch.cluster.block.ClusterBlock;
import org.elasticsearch.cluster.block.ClusterBlockException;
@ -90,11 +89,15 @@ import static org.junit.Assert.fail;
public class ElasticsearchAssertions {
public static void assertAcked(AcknowledgedRequestBuilder<?, ?, ?> builder) {
public static void assertAcked(ActionRequestBuilder<?, ? extends IsAcknowledgedSupplier> builder) {
assertAcked(builder, TimeValue.timeValueSeconds(30));
}
public static void assertAcked(AcknowledgedRequestBuilder<?, ?, ?> builder, TimeValue timeValue) {
public static void assertAcked(ActionFuture<? extends IsAcknowledgedSupplier> future) {
assertAcked(future.actionGet());
}
public static void assertAcked(ActionRequestBuilder<?, ? extends IsAcknowledgedSupplier> builder, TimeValue timeValue) {
assertAcked(builder.get(timeValue));
}

2
x-pack/plugin/autoscaling/src/internalClusterTest/java/org/elasticsearch/xpack/autoscaling/storage/ReactiveStorageIT.java
View file

@ -351,7 +351,6 @@ public class ReactiveStorageIT extends AutoscalingStorageIntegTestCase {
.build()
)
.setWaitForActiveShards(ActiveShardCount.NONE)
.get()
);
// * 2 since worst case is no hard links, see DiskThresholdDecider.getExpectedShardSize.
@ -468,7 +467,6 @@ public class ReactiveStorageIT extends AutoscalingStorageIntegTestCase {
)
.setWaitForActiveShards(ActiveShardCount.NONE)
.setResizeType(resizeType)
.get()
);
// * 2 since worst case is no hard links, see DiskThresholdDecider.getExpectedShardSize.

1
x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/AutoFollowIT.java
View file

@ -694,7 +694,6 @@ public class AutoFollowIT extends CcrIntegTestCase {
.indices()
.prepareCreate(indexInDatastream)
.setMapping(MetadataIndexTemplateService.DEFAULT_TIMESTAMP_MAPPING_WITHOUT_ROUTING.toString())
.get()
);
leaderClient().prepareIndex(indexInDatastream)
.setCreate(true)

1
x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/FollowerFailOverIT.java
View file

@ -254,7 +254,6 @@ public class FollowerFailOverIT extends CcrIntegTestCase {
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
.put("index.routing.allocation.require.box", "large")
)
.get()
);
getFollowerCluster().startNode(
onlyRoles(nodeAttributes, Set.of(DiscoveryNodeRole.DATA_ROLE, DiscoveryNodeRole.REMOTE_CLUSTER_CLIENT_ROLE))

6
x-pack/plugin/ccr/src/internalClusterTest/java/org/elasticsearch/xpack/ccr/IndexFollowingIT.java
View file

@ -109,7 +109,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@ -609,7 +608,6 @@ public class IndexFollowingIT extends CcrIntegTestCase {
.prepareCreate("test-follower")
.setSource(indexSettings, XContentType.JSON)
.setMasterNodeTimeout(TimeValue.MAX_VALUE)
.get()
);
ensureLeaderGreen("test-leader");
ensureFollowerGreen("test-follower");
@ -1754,14 +1752,14 @@ public class IndexFollowingIT extends CcrIntegTestCase {
return settings;
}
private void putFollowerTemplate(String setting, String settingValue) throws InterruptedException, ExecutionException {
private void putFollowerTemplate(String setting, String settingValue) {
Template template = new Template(Settings.builder().put(setting, settingValue).build(), null, null);
ComposableIndexTemplate cit = new ComposableIndexTemplate(List.of("follower"), template, null, null, null, null);
assertAcked(
followerClient().execute(
PutComposableIndexTemplateAction.INSTANCE,
new PutComposableIndexTemplateAction.Request("my-it").indexTemplate(cit)
).get()
)
);
}

5
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/async/AsyncTaskServiceTests.java
View file

@ -11,7 +11,6 @@ import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
import org.elasticsearch.action.admin.indices.get.GetIndexResponse;
import org.elasticsearch.action.delete.DeleteResponse;
import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
@ -36,6 +35,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.is;
// TODO: test CRUD operations
@ -224,8 +224,7 @@ public class AsyncTaskServiceTests extends ESSingleNodeTestCase {
}
// Delete the index, so we can test subsequent auto-create behaviour
AcknowledgedResponse ack = client().admin().indices().prepareDelete(index).get();
assertTrue(ack.isAcknowledged());
assertAcked(client().admin().indices().prepareDelete(index));
// Subsequent response deletes throw a (wrapped) index not found exception
{

1
x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleClusterDisruptionIT.java
View file

@ -419,7 +419,6 @@ public class DownsampleClusterDisruptionIT extends ESIntegTestCase {
assertAcked(
indicesAdmin().prepareUpdateSettings(sourceIndex)
.setSettings(Settings.builder().put(IndexMetadata.INDEX_BLOCKS_WRITE_SETTING.getKey(), true).build())
.get()
);
}

8
x-pack/plugin/downsample/src/internalClusterTest/java/org/elasticsearch/xpack/downsample/DownsampleTransportFailureIT.java
View file

@ -52,6 +52,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 2, numClientNodes = 1, supportsDedicatedMasters = false)
public class DownsampleTransportFailureIT extends ESIntegTestCase {
@ -222,11 +224,9 @@ public class DownsampleTransportFailureIT extends ESIntegTestCase {
assertFalse(bulkRequestBuilder.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get().hasFailures());
}
public void blockIndexWrites(final String indexName) throws ExecutionException, InterruptedException {
public void blockIndexWrites(final String indexName) {
final Settings blockWritesSetting = Settings.builder().put(IndexMetadata.SETTING_BLOCKS_WRITE, true).build();
assertTrue(
client().admin().indices().updateSettings(new UpdateSettingsRequest(blockWritesSetting, indexName)).get().isAcknowledged()
);
assertAcked(client().admin().indices().updateSettings(new UpdateSettingsRequest(blockWritesSetting, indexName)));
}
private void createTimeSeriesIndex(final String indexName) throws IOException {

3
x-pack/plugin/downsample/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java
View file

@ -683,7 +683,6 @@ public class DownsampleActionSingleNodeTests extends ESSingleNodeTestCase {
indicesAdmin().preparePutTemplate(downsampleIndex)
.setPatterns(List.of(downsampleIndex))
.setSettings(Settings.builder().put("index.blocks.write", "true").build())
.get()
);
ElasticsearchException exception = expectThrows(ElasticsearchException.class, indexer::execute);
@ -1047,14 +1046,12 @@ public class DownsampleActionSingleNodeTests extends ESSingleNodeTestCase {
assertAcked(
indicesAdmin().prepareUpdateSettings(sourceIndex)
.setSettings(Settings.builder().put(IndexMetadata.INDEX_BLOCKS_WRITE_SETTING.getKey(), blockWrite).build())
.get()
);
}
private void downsample(String sourceIndex, String downsampleIndex, DownsampleConfig config) {
assertAcked(
client().execute(DownsampleAction.INSTANCE, new DownsampleAction.Request(sourceIndex, downsampleIndex, TIMEOUT, config))
.actionGet()
);
}

1
x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/AsyncEqlSearchActionIT.java
View file

@ -85,7 +85,6 @@ public class AsyncEqlSearchActionIT extends AbstractEqlBlockingIntegTestCase {
assertAcked(
indicesAdmin().prepareCreate("test")
.setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date", "i", "type=integer")
.get()
);
createIndex("idx_unmapped");

4
x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/EqlCancellationIT.java
View file

@ -40,9 +40,7 @@ public class EqlCancellationIT extends AbstractEqlBlockingIntegTestCase {
public void testCancellation() throws Exception {
assertAcked(
indicesAdmin().prepareCreate("test")
.setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
.get()
indicesAdmin().prepareCreate("test").setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
);
createIndex("idx_unmapped");

4
x-pack/plugin/eql/src/internalClusterTest/java/org/elasticsearch/xpack/eql/action/RestEqlCancellationIT.java
View file

@ -60,9 +60,7 @@ public class RestEqlCancellationIT extends AbstractEqlBlockingIntegTestCase {
public void testRestCancellation() throws Exception {
assertAcked(
indicesAdmin().prepareCreate("test")
.setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
.get()
indicesAdmin().prepareCreate("test").setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
);
createIndex("idx_unmapped");

8
x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlActionIT.java
View file

@ -703,7 +703,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
.put("index.routing.rebalance.enable", "none")
)
.get()
);
ensureYellow(indexName);
AtomicLong totalValues = new AtomicLong();
@ -766,7 +765,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
.indices()
.prepareCreate(indexName)
.setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)))
.get()
);
ensureYellow(indexName);
int numDocs = randomIntBetween(1, 5000);
@ -807,7 +805,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
.prepareCreate(indexName)
.setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)))
.setMapping("val", "type=long", "tag", "type=keyword")
.get()
);
int numDocs = randomIntBetween(1, 100);
List<IndexRequestBuilder> indexRequests = new ArrayList<>();
@ -896,7 +893,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
.prepareCreate(indexName)
.setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)))
.setMapping("data", "type=long", "count", "type=long")
.get()
);
ensureYellow(indexName);
client().prepareBulk()
@ -957,7 +953,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
.prepareCreate("test_overlapping_index_patterns_1")
.setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)))
.setMapping("field", "type=long")
.get()
);
ensureYellow("test_overlapping_index_patterns_1");
client().prepareBulk()
@ -971,7 +966,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
.prepareCreate("test_overlapping_index_patterns_2")
.setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)))
.setMapping("field", "type=keyword")
.get()
);
ensureYellow("test_overlapping_index_patterns_2");
client().prepareBulk()
@ -1295,7 +1289,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
.prepareCreate(indexName)
.setSettings(Settings.builder().put("index.number_of_shards", ESTestCase.randomIntBetween(1, 3)))
.setMapping(builder)
.get()
);
}
@ -1372,7 +1365,6 @@ public class EsqlActionIT extends AbstractEsqlIntegTestCase {
"color",
"type=keyword"
)
.get()
);
long timestamp = epoch;
for (int i = 0; i < 10; i++) {

4
x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexIT.java
View file

@ -89,9 +89,7 @@ public class FrozenIndexIT extends ESIntegTestCase {
assertThat(client().prepareDelete("index", indexResponse.getId()).get().status(), equalTo(RestStatus.OK));
assertAcked(
client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("index").waitForActiveShards(ActiveShardCount.ONE)).actionGet()
);
assertAcked(client().execute(FreezeIndexAction.INSTANCE, new FreezeRequest("index").waitForActiveShards(ActiveShardCount.ONE)));
assertThat(
clusterAdmin().prepareState().get().getState().metadata().index("index").getTimestampRange(),

4
x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java
View file

@ -287,7 +287,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase {
client().execute(
FreezeIndexAction.INSTANCE,
new FreezeRequest("idx*").setFreeze(false).indicesOptions(IndicesOptions.strictExpand())
).actionGet()
)
);
ClusterStateResponse stateResponse = clusterAdmin().prepareState().get();
assertEquals(IndexMetadata.State.CLOSE, stateResponse.getState().getMetadata().index("idx-closed").getState());
@ -479,7 +479,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase {
new FreezeRequest("idx*", "not_available").indicesOptions(
IndicesOptions.fromParameters(null, "true", null, null, IndicesOptions.strictExpandOpen())
)
).actionGet()
)
);
assertIndexFrozen("idx");
assertEquals(IndexMetadata.State.CLOSE, clusterAdmin().prepareState().get().getState().metadata().index("idx-close").getState());

1
x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/FrozenSearchableSnapshotsIntegTests.java
View file

@ -427,7 +427,6 @@ public class FrozenSearchableSnapshotsIntegTests extends BaseFrozenSearchableSna
indicesAdmin().prepareCreate("test-index")
.setMapping("f", "type=date")
.setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true))
.get()
);
indexRandom(
true,

2
x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DataStreamSecurityIT.java
View file

@ -135,7 +135,7 @@ public class DataStreamSecurityIT extends SecurityIntegTestCase {
client.execute(
ModifyDataStreamsAction.INSTANCE,
new ModifyDataStreamsAction.Request(List.of(DataStreamAction.removeBackingIndex(dataStreamName, ghostReference.getName())))
).actionGet()
)
);
ClusterState after = internalCluster().getCurrentMasterNodeInstance(ClusterService.class).state();
assertThat(after.getMetadata().dataStreams().get(dataStreamName).getIndices(), hasSize(1));

16
x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/DlsFlsRequestCacheTests.java
View file

@ -386,18 +386,8 @@ public class DlsFlsRequestCacheTests extends SecuritySingleNodeTestCase {
private void prepareIndices() {
final Client client = client();
assertAcked(
client.admin()
.cluster()
.preparePutStoredScript()
.setId("my-script")
.setContent(
new BytesArray("""
{"script":{"source":"{\\"match\\":{\\"username\\":\\"{{_user.username}}\\"}}","lang":"mustache"}}"""),
XContentType.JSON
)
.get()
);
assertAcked(client.admin().cluster().preparePutStoredScript().setId("my-script").setContent(new BytesArray("""
{"script":{"source":"{\\"match\\":{\\"username\\":\\"{{_user.username}}\\"}}","lang":"mustache"}}"""), XContentType.JSON));
assertAcked(indicesAdmin().prepareCreate(DLS_INDEX).addAlias(new Alias("dls-alias")).get());
client.prepareIndex(DLS_INDEX).setId("101").setSource("number", 101, "letter", "A").get();
@ -408,7 +398,7 @@ public class DlsFlsRequestCacheTests extends SecuritySingleNodeTestCase {
client.prepareIndex(FLS_INDEX).setId("202").setSource("public", "Y", "private", "y").get();
assertAcked(
indicesAdmin().prepareCreate(INDEX).addAlias(new Alias(ALIAS1)).addAlias(new Alias(ALIAS2)).addAlias(new Alias(ALL_ALIAS)).get()
indicesAdmin().prepareCreate(INDEX).addAlias(new Alias(ALIAS1)).addAlias(new Alias(ALIAS2)).addAlias(new Alias(ALL_ALIAS))
);
client.prepareIndex(INDEX).setId("1").setSource("number", 1, "letter", "a", "private", "sesame_1", "public", "door_1").get();
client.prepareIndex(INDEX).setId("2").setSource("number", 2, "letter", "b", "private", "sesame_2", "public", "door_2").get();

7
x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/authz/IndexAliasesTests.java
View file

@ -351,7 +351,6 @@ public class IndexAliasesTests extends SecurityIntegTestCase {
.addAlias(new Alias("test_alias_2"))
.addAlias(new Alias("test_alias_3"))
.addAlias(new Alias("test_alias_4"))
.get()
);
// ok: user has manage_aliases on test_*
assertAcked(client.admin().indices().prepareAliases().removeAlias("test_1", "test_alias_1").get());
@ -824,11 +823,7 @@ public class IndexAliasesTests extends SecurityIntegTestCase {
final Client aliasesClient = client(aliasHeaders);
assertAcked(
createClient.admin()
.indices()
.prepareCreate(hiddenIndex)
.setSettings(Settings.builder().put("index.hidden", true).build())
.get()
createClient.admin().indices().prepareCreate(hiddenIndex).setSettings(Settings.builder().put("index.hidden", true).build())
);
assertAcked(

3
x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/xpack/security/support/SecurityIndexManagerIntegTests.java
View file

@ -123,7 +123,6 @@ public class SecurityIndexManagerIntegTests extends SecurityIntegTestCase {
.put("index.number_of_replicas", "8")
.build()
)
.get()
);
// create an new-style template
ComposableIndexTemplate cit = new ComposableIndexTemplate(
@ -146,7 +145,7 @@ public class SecurityIndexManagerIntegTests extends SecurityIntegTestCase {
client().execute(
PutComposableIndexTemplateAction.INSTANCE,
new PutComposableIndexTemplateAction.Request("composable-template-covering-the-main-security-index").indexTemplate(cit)
).get()
)
);
// trigger index auto-creation
final PutUserResponse putUserResponse = new PutUserRequestBuilder(client()).username("user")

2
x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java
View file

@ -461,7 +461,7 @@ public class NodeShutdownShardsIT extends ESIntegTestCase {
client().execute(
PutShutdownNodeAction.INSTANCE,
new PutShutdownNodeAction.Request(nodeId, type, this.getTestName(), null, nodeReplacementName, null)
).get()
)
);
}

4
x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java
View file

@ -71,9 +71,7 @@ public class GeoShapeWithDocValuesIT extends GeoShapeIntegTestCase {
public void testMappingUpdate() {
// create index
IndexVersion version = randomSupportedVersion();
assertAcked(
indicesAdmin().prepareCreate("test").setSettings(settings(version).build()).setMapping("shape", "type=geo_shape").get()
);
assertAcked(indicesAdmin().prepareCreate("test").setSettings(settings(version).build()).setMapping("shape", "type=geo_shape"));
ensureGreen();
String update = """

2
x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java
View file

@ -57,7 +57,6 @@ public class LegacyGeoShapeWithDocValuesIT extends GeoShapeIntegTestCase {
indicesAdmin().prepareCreate("test")
.setSettings(settings(randomSupportedVersion()).build())
.setMapping("shape", "type=geo_shape,strategy=recursive")
.get()
);
ensureGreen();
@ -85,7 +84,6 @@ public class LegacyGeoShapeWithDocValuesIT extends GeoShapeIntegTestCase {
assertAcked(
prepareCreate("test").setSettings(settings(randomSupportedVersion()).build())
.setMapping("shape", "type=geo_shape,strategy=recursive,tree=geohash")
.get()
);
ensureGreen();

1
x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/ShapeQueryOverShapeTests.java
View file

@ -73,7 +73,6 @@ public class ShapeQueryOverShapeTests extends ShapeQueryTestCase {
assertAcked(
indicesAdmin().prepareCreate(IGNORE_MALFORMED_INDEX)
.setMapping(FIELD, "type=shape,ignore_malformed=true", "_source", "enabled=false")
.get()
);
ensureGreen();

1
x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/AsyncSqlSearchActionIT.java
View file

@ -81,7 +81,6 @@ public class AsyncSqlSearchActionIT extends AbstractSqlBlockingIntegTestCase {
assertAcked(
indicesAdmin().prepareCreate("test")
.setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date", "i", "type=integer")
.get()
);
createIndex("idx_unmapped");

4
x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/RestSqlCancellationIT.java
View file

@ -73,9 +73,7 @@ public class RestSqlCancellationIT extends AbstractSqlBlockingIntegTestCase {
@TestLogging(value = "org.elasticsearch.xpack.sql:TRACE", reason = "debug")
public void testRestCancellation() throws Exception {
assertAcked(
indicesAdmin().prepareCreate("test")
.setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
.get()
indicesAdmin().prepareCreate("test").setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
);
createIndex("idx_unmapped");

4
x-pack/plugin/sql/src/internalClusterTest/java/org/elasticsearch/xpack/sql/action/SqlCancellationIT.java
View file

@ -39,9 +39,7 @@ public class SqlCancellationIT extends AbstractSqlBlockingIntegTestCase {
public void testCancellation() throws Exception {
assertAcked(
indicesAdmin().prepareCreate("test")
.setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
.get()
indicesAdmin().prepareCreate("test").setMapping("val", "type=integer", "event_type", "type=keyword", "@timestamp", "type=date")
);
createIndex("idx_unmapped");

6
x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java
View file

@ -274,11 +274,7 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase
newSettings.remove("index.creation_date");
newSettings.remove("index.version.created");
CreateIndexResponse createIndexResponse = indicesAdmin().prepareCreate(to)
.setMapping(mapping.sourceAsMap())
.setSettings(newSettings)
.get();
assertTrue(createIndexResponse.isAcknowledged());
assertAcked(indicesAdmin().prepareCreate(to).setMapping(mapping.sourceAsMap()).setSettings(newSettings));
ensureGreen(to);
AtomicReference<String> originalIndex = new AtomicReference<>(originalIndexOrAlias);

1
x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/BasicWatcherTests.java
View file

@ -236,7 +236,6 @@ public class BasicWatcherTests extends AbstractWatcherIntegrationTestCase {
),
XContentType.JSON
)
.get()
);
Script template = new Script(ScriptType.STORED, null, "my-template", Collections.emptyMap());

2
x-pack/plugin/write-load-forecaster/src/internalClusterTest/java/org/elasticsearch/xpack/writeloadforecaster/WriteLoadForecasterIT.java
View file

@ -164,7 +164,7 @@ public class WriteLoadForecasterIT extends ESIntegTestCase {
null
)
)
).actionGet()
)
);
assertAcked(client().execute(CreateDataStreamAction.INSTANCE, new CreateDataStreamAction.Request(dataStreamName)).actionGet());