diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java index 84ca8dcc66782..26403b3b45d06 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/DeleteRepositoryRequest.java @@ -81,13 +81,11 @@ public String name() { public void readFrom(StreamInput in) throws IOException { super.readFrom(in); name = in.readString(); - readTimeout(in); } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(name); - writeTimeout(out); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java index e60de1e292916..9db3fac299edf 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java @@ -220,7 +220,6 @@ public void readFrom(StreamInput in) throws IOException { name = in.readString(); type = in.readString(); settings = readSettingsFromStream(in); - readTimeout(in); verify = in.readBoolean(); } @@ -230,7 +229,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(name); out.writeString(type); writeSettingsToStream(settings, out); - writeTimeout(out); out.writeBoolean(verify); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java index 7166eedb72c50..0d0384591938e 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/VerifyRepositoryRequest.java @@ -81,13 +81,11 @@ public String name() { public void readFrom(StreamInput in) throws IOException { super.readFrom(in); name = in.readString(); - readTimeout(in); } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeString(name); - writeTimeout(out); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java index 4ec729bbc532d..bd13c0000193d 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteRequest.java @@ -128,7 +128,6 @@ public void readFrom(StreamInput in) throws IOException { dryRun = in.readBoolean(); explain = in.readBoolean(); retryFailed = in.readBoolean(); - readTimeout(in); } @Override @@ -138,7 +137,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(dryRun); out.writeBoolean(explain); out.writeBoolean(retryFailed); - writeTimeout(out); } @Override diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java index efd27d1a38f37..2a8ed8bf11f43 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java @@ -148,7 +148,6 @@ public void readFrom(StreamInput in) throws IOException { super.readFrom(in); transientSettings = readSettingsFromStream(in); persistentSettings = readSettingsFromStream(in); - readTimeout(in); } @Override @@ -156,6 +155,5 @@ public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); writeSettingsToStream(transientSettings, out); writeSettingsToStream(persistentSettings, out); - writeTimeout(out); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java index 07665e9ccf176..45fc63de89254 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java @@ -467,14 +467,12 @@ public ActionRequestValidationException validate() { public void readFrom(StreamInput in) throws IOException { super.readFrom(in); allAliasActions = in.readList(AliasActions::new); - readTimeout(in); } @Override public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeList(allAliasActions); - writeTimeout(out); } public IndicesOptions indicesOptions() { diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java index df0dcd9ff54a5..272bae9425712 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/close/CloseIndexRequest.java @@ -105,7 +105,6 @@ public CloseIndexRequest indicesOptions(IndicesOptions indicesOptions) { public void readFrom(StreamInput in) throws IOException { super.readFrom(in); indices = in.readStringArray(); - readTimeout(in); indicesOptions = IndicesOptions.readIndicesOptions(in); } @@ -113,7 +112,6 @@ public void readFrom(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArray(indices); - writeTimeout(out); indicesOptions.writeIndicesOptions(out); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java index 0139726903b7c..68274a8c40804 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java @@ -487,7 +487,6 @@ public void readFrom(StreamInput in) throws IOException { cause = in.readString(); index = in.readString(); settings = readSettingsFromStream(in); - readTimeout(in); int size = in.readVInt(); for (int i = 0; i < size; i++) { final String type = in.readString(); @@ -518,7 +517,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeString(cause); out.writeString(index); writeSettingsToStream(settings, out); - writeTimeout(out); out.writeVInt(mappings.size()); for (Map.Entry entry : mappings.entrySet()) { out.writeString(entry.getKey()); diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java index a75bcd77748fa..2fd31d9a3ab7d 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/delete/DeleteIndexRequestBuilder.java @@ -20,34 +20,15 @@ package org.elasticsearch.action.admin.indices.delete; import org.elasticsearch.action.support.IndicesOptions; -import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder; +import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder; import org.elasticsearch.client.ElasticsearchClient; -import org.elasticsearch.common.unit.TimeValue; -public class DeleteIndexRequestBuilder extends MasterNodeOperationRequestBuilder { +public class DeleteIndexRequestBuilder extends AcknowledgedRequestBuilder { public DeleteIndexRequestBuilder(ElasticsearchClient client, DeleteIndexAction action, String... indices) { super(client, action, new DeleteIndexRequest(indices)); } - /** - * Timeout to wait for the index deletion to be acknowledged by current cluster nodes. Defaults - * to 60s. - */ - public DeleteIndexRequestBuilder setTimeout(TimeValue timeout) { - request.timeout(timeout); - return this; - } - - /** - * Timeout to wait for the index deletion to be acknowledged by current cluster nodes. Defaults - * to 10s. - */ - public DeleteIndexRequestBuilder setTimeout(String timeout) { - request.timeout(timeout); - return this; - } - /** * Specifies what type of requested indices to ignore and wildcard indices expressions. *

diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java index d15e390532e78..eecbbc453ee4d 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java @@ -313,7 +313,6 @@ public void readFrom(StreamInput in) throws IOException { source = XContentHelper.convertToJson(new BytesArray(source), false, false, XContentFactory.xContentType(source)); } updateAllTypes = in.readBoolean(); - readTimeout(in); concreteIndex = in.readOptionalWriteable(Index::new); } @@ -325,7 +324,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeOptionalString(type); out.writeString(source); out.writeBoolean(updateAllTypes); - writeTimeout(out); out.writeOptionalWriteable(concreteIndex); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java index 06affe8ee69a3..0b16da44cf690 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/open/OpenIndexRequest.java @@ -105,7 +105,6 @@ public OpenIndexRequest indicesOptions(IndicesOptions indicesOptions) { public void readFrom(StreamInput in) throws IOException { super.readFrom(in); indices = in.readStringArray(); - readTimeout(in); indicesOptions = IndicesOptions.readIndicesOptions(in); } @@ -113,7 +112,6 @@ public void readFrom(StreamInput in) throws IOException { public void writeTo(StreamOutput out) throws IOException { super.writeTo(out); out.writeStringArray(indices); - writeTimeout(out); indicesOptions.writeIndicesOptions(out); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java index f07e913e9c82e..dcea5673cb51d 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java @@ -166,7 +166,6 @@ public void readFrom(StreamInput in) throws IOException { indices = in.readStringArray(); indicesOptions = IndicesOptions.readIndicesOptions(in); settings = readSettingsFromStream(in); - readTimeout(in); preserveExisting = in.readBoolean(); } @@ -176,7 +175,6 @@ public void writeTo(StreamOutput out) throws IOException { out.writeStringArrayNullable(indices); indicesOptions.writeIndicesOptions(out); writeSettingsToStream(settings, out); - writeTimeout(out); out.writeBoolean(preserveExisting); } } diff --git a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java index 278367cc3b2ff..e1e4a5fde8dd0 100644 --- a/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java +++ b/core/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java @@ -86,7 +86,6 @@ public void readFrom(StreamInput in) throws IOException { String oldestLuceneSegment = in.readString(); versions.put(index, new Tuple<>(upgradeVersion, oldestLuceneSegment)); } - readTimeout(in); } @Override @@ -98,6 +97,5 @@ public void writeTo(StreamOutput out) throws IOException { Version.writeVersion(entry.getValue().v1(), out); out.writeString(entry.getValue().v2()); } - writeTimeout(out); } } diff --git a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java b/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java index e3f32543bf2c3..1180d3b121016 100644 --- a/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java +++ b/core/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java @@ -18,6 +18,7 @@ */ package org.elasticsearch.action.support.master; +import org.elasticsearch.Version; import org.elasticsearch.cluster.ack.AckedRequest; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -70,22 +71,20 @@ public final TimeValue timeout() { return timeout; } - /** - * Reads the timeout value - */ - protected void readTimeout(StreamInput in) throws IOException { - timeout = new TimeValue(in); + @Override + public TimeValue ackTimeout() { + return timeout; } - /** - * writes the timeout value - */ - protected void writeTimeout(StreamOutput out) throws IOException { - timeout.writeTo(out); + @Override + public void readFrom(StreamInput in) throws IOException { + super.readFrom(in); + timeout = new TimeValue(in); } @Override - public TimeValue ackTimeout() { - return timeout; + public void writeTo(StreamOutput out) throws IOException { + super.writeTo(out); + timeout.writeTo(out); } } diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java index 72932709799c6..0085de36f1925 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestDeleteStoredScriptAction.java @@ -47,6 +47,9 @@ public String getName() { public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException { String id = request.param("id"); DeleteStoredScriptRequest deleteStoredScriptRequest = new DeleteStoredScriptRequest(id); + deleteStoredScriptRequest.timeout(request.paramAsTime("timeout", deleteStoredScriptRequest.timeout())); + deleteStoredScriptRequest.masterNodeTimeout(request.paramAsTime("master_timeout", deleteStoredScriptRequest.masterNodeTimeout())); + return channel -> client.admin().cluster().deleteStoredScript(deleteStoredScriptRequest, new AcknowledgedRestListener<>(channel)); } } diff --git a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java index 564cb84bf44e2..2ad2db2964d56 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestPutStoredScriptAction.java @@ -58,6 +58,8 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client StoredScriptSource source = StoredScriptSource.parse(content, xContentType); PutStoredScriptRequest putRequest = new PutStoredScriptRequest(id, context, content, request.getXContentType(), source); + putRequest.masterNodeTimeout(request.paramAsTime("master_timeout", putRequest.masterNodeTimeout())); + putRequest.timeout(request.paramAsTime("timeout", putRequest.timeout())); return channel -> client.admin().cluster().putStoredScript(putRequest, new AcknowledgedRestListener<>(channel)); } } diff --git a/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java index 8562b5cabd8b6..2ca71fabbc7dc 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.admin.cluster.storedscripts; -import org.elasticsearch.Version; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,7 +27,6 @@ import org.elasticsearch.test.ESTestCase; import java.io.IOException; -import java.util.Base64; import java.util.Collections; public class PutStoredScriptRequestTests extends ESTestCase { @@ -50,25 +48,4 @@ public void testSerialization() throws IOException { } } } - - public void testSerializationBwc() throws IOException { - final byte[] rawStreamBytes = Base64.getDecoder().decode("ADwDCG11c3RhY2hlAQZzY3JpcHQCe30A"); - final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_1, Version.V_5_0_2, - Version.V_5_1_1, Version.V_5_1_2, Version.V_5_2_0); - try (StreamInput in = StreamInput.wrap(rawStreamBytes)) { - in.setVersion(version); - PutStoredScriptRequest serialized = new PutStoredScriptRequest(); - serialized.readFrom(in); - assertEquals(XContentType.JSON, serialized.xContentType()); - assertEquals("script", serialized.id()); - assertEquals(new BytesArray("{}"), serialized.content()); - - try (BytesStreamOutput out = new BytesStreamOutput()) { - out.setVersion(version); - serialized.writeTo(out); - out.flush(); - assertArrayEquals(rawStreamBytes, out.bytes().toBytesRef().bytes); - } - } - } } diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java index 12eb43ceba3ed..d83b2fae0f917 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/analyze/AnalyzeRequestTests.java @@ -19,15 +19,12 @@ package org.elasticsearch.action.admin.indices.analyze; -import org.elasticsearch.Version; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.VersionUtils; import java.io.IOException; -import java.util.Base64; public class AnalyzeRequestTests extends ESTestCase { @@ -92,20 +89,4 @@ public void testSerialization() throws IOException { } } } - - public void testSerializationBwc() throws IOException { - // AnalyzeRequest serializedRequest = new AnalyzeRequest("foo"); - // serializedRequest.text("text"); - // serializedRequest.normalizer("normalizer"); - // Using Version.V_6_0_0_beta1 - final byte[] data = Base64.getDecoder().decode("AAABA2ZvbwEEdGV4dAAAAAAAAAABCm5vcm1hbGl6ZXI="); - final Version version = VersionUtils.randomVersionBetween(random(), Version.V_5_0_0, Version.V_5_4_0); - try (StreamInput in = StreamInput.wrap(data)) { - in.setVersion(version); - AnalyzeRequest request = new AnalyzeRequest(); - request.readFrom(in); - assertEquals("foo", request.index()); - assertNull("normalizer support after 6.0.0", request.normalizer()); - } - } } diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java index 97e1bf2930377..74a87497181e5 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java @@ -19,8 +19,6 @@ package org.elasticsearch.action.admin.indices.create; -import org.elasticsearch.Version; -import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.xcontent.XContentType; @@ -28,7 +26,6 @@ import org.elasticsearch.test.ESTestCase; import java.io.IOException; -import java.util.Base64; public class CreateIndexRequestTests extends ESTestCase { @@ -48,25 +45,4 @@ public void testSerialization() throws IOException { } } } - - public void testSerializationBwc() throws IOException { - final byte[] data = Base64.getDecoder().decode("ADwDAANmb28APAMBB215X3R5cGULeyJ0eXBlIjp7fX0AAAD////+AA=="); - final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_1, Version.V_5_0_2, Version.V_5_1_1, Version.V_5_1_2, - Version.V_5_2_0); - try (StreamInput in = StreamInput.wrap(data)) { - in.setVersion(version); - CreateIndexRequest serialized = new CreateIndexRequest(); - serialized.readFrom(in); - assertEquals("foo", serialized.index()); - BytesReference bytesReference = JsonXContent.contentBuilder().startObject().startObject("type").endObject().endObject().bytes(); - assertEquals(bytesReference.utf8ToString(), serialized.mappings().get("my_type")); - - try (BytesStreamOutput out = new BytesStreamOutput()) { - out.setVersion(version); - serialized.writeTo(out); - out.flush(); - assertArrayEquals(data, out.bytes().toBytesRef().bytes); - } - } - } } diff --git a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java b/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java index 69b82e232d001..96dcef700a956 100644 --- a/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequestTests.java @@ -31,7 +31,6 @@ import org.elasticsearch.test.ESTestCase; import java.io.IOException; -import java.util.Base64; public class PutMappingRequestTests extends ESTestCase { @@ -95,17 +94,4 @@ public void testPutMappingRequestSerialization() throws IOException { } } } - - public void testSerializationBwc() throws IOException { - final byte[] data = Base64.getDecoder().decode("ADwDAQNmb28MAA8tLS0KZm9vOiAiYmFyIgoAPAMAAAA="); - final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_1, Version.V_5_0_2, - Version.V_5_1_1, Version.V_5_1_2, Version.V_5_2_0); - try (StreamInput in = StreamInput.wrap(data)) { - in.setVersion(version); - PutMappingRequest request = new PutMappingRequest(); - request.readFrom(in); - String mapping = YamlXContent.contentBuilder().startObject().field("foo", "bar").endObject().string(); - assertEquals(XContentHelper.convertToJson(new BytesArray(mapping), false, XContentType.YAML), request.source()); - } - } } diff --git a/core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java b/core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java index 37a15c5b3592f..304904f2612c4 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java +++ b/core/src/test/java/org/elasticsearch/action/ingest/PutPipelineRequestTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.action.ingest; -import org.elasticsearch.Version; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,7 +27,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.Base64; public class PutPipelineRequestTests extends ESTestCase { @@ -45,23 +43,4 @@ public void testSerializationWithXContent() throws IOException { assertEquals(XContentType.JSON, serialized.getXContentType()); assertEquals("{}", serialized.getSource().utf8ToString()); } - - public void testSerializationBwc() throws IOException { - final byte[] data = Base64.getDecoder().decode("ADwDATECe30="); - final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_1, Version.V_5_0_2, - Version.V_5_1_1, Version.V_5_1_2, Version.V_5_2_0); - try (StreamInput in = StreamInput.wrap(data)) { - in.setVersion(version); - PutPipelineRequest request = new PutPipelineRequest(); - request.readFrom(in); - assertEquals(XContentType.JSON, request.getXContentType()); - assertEquals("{}", request.getSource().utf8ToString()); - - try (BytesStreamOutput out = new BytesStreamOutput()) { - out.setVersion(version); - request.writeTo(out); - assertArrayEquals(data, out.bytes().toBytesRef().bytes); - } - } - } } diff --git a/core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java b/core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java index 6ca6b0ea8c279..d9f9f181b31b6 100644 --- a/core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java +++ b/core/src/test/java/org/elasticsearch/ingest/PipelineConfigurationTests.java @@ -19,7 +19,6 @@ package org.elasticsearch.ingest; -import org.elasticsearch.Version; import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.stream.BytesStreamOutput; @@ -35,7 +34,6 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import java.util.Base64; public class PipelineConfigurationTests extends ESTestCase { @@ -52,24 +50,6 @@ public void testSerialization() throws IOException { assertEquals("{}", serialized.getConfig().utf8ToString()); } - public void testSerializationBwc() throws IOException { - final byte[] data = Base64.getDecoder().decode("ATECe30AAAA="); - try (StreamInput in = StreamInput.wrap(data)) { - final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_1, Version.V_5_0_2, - Version.V_5_1_1, Version.V_5_1_2, Version.V_5_2_0); - in.setVersion(version); - PipelineConfiguration configuration = PipelineConfiguration.readFrom(in); - assertEquals(XContentType.JSON, configuration.getXContentType()); - assertEquals("{}", configuration.getConfig().utf8ToString()); - - try (BytesStreamOutput out = new BytesStreamOutput()) { - out.setVersion(version); - configuration.writeTo(out); - assertArrayEquals(data, out.bytes().toBytesRef().bytes); - } - } - } - public void testParser() throws IOException { ContextParser parser = PipelineConfiguration.getParser(); XContentType xContentType = randomFrom(XContentType.values()); diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java index a991d97816df9..30713d61abe07 100644 --- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryBuilderTests.java @@ -35,7 +35,6 @@ import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; @@ -54,7 +53,6 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.Base64; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -250,26 +248,6 @@ public void testCreateMultiDocumentSearcher() throws Exception { assertThat(result.clauses().get(1).getOccur(), equalTo(BooleanClause.Occur.MUST_NOT)); } - public void testSerializationBwc() throws IOException { - final byte[] data = Base64.getDecoder().decode("P4AAAAAFZmllbGQEdHlwZQAAAAAAAA57ImZvbyI6ImJhciJ9AAAAAA=="); - final Version version = randomFrom(Version.V_5_0_0, Version.V_5_0_1, Version.V_5_0_2, - Version.V_5_1_1, Version.V_5_1_2, Version.V_5_2_0); - try (StreamInput in = StreamInput.wrap(data)) { - in.setVersion(version); - PercolateQueryBuilder queryBuilder = new PercolateQueryBuilder(in); - assertEquals("type", queryBuilder.getDocumentType()); - assertEquals("field", queryBuilder.getField()); - assertEquals("{\"foo\":\"bar\"}", queryBuilder.getDocument().utf8ToString()); - assertEquals(XContentType.JSON, queryBuilder.getXContentType()); - - try (BytesStreamOutput out = new BytesStreamOutput()) { - out.setVersion(version); - queryBuilder.writeTo(out); - assertArrayEquals(data, out.bytes().toBytesRef().bytes); - } - } - } - private static BytesReference randomSource() { try { XContentBuilder xContent = XContentFactory.jsonBuilder(); diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json index 0bc0fc94c85a0..c61aecd6bb2a8 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/delete_script.json @@ -18,6 +18,14 @@ } }, "params" : { + "timeout": { + "type" : "time", + "description" : "Explicit operation timeout" + }, + "master_timeout": { + "type" : "time", + "description" : "Specify timeout for connection to master" + } } }, "body": null diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json b/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json index 39b45057ecd8f..45b97f9f2857a 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json +++ b/rest-api-spec/src/main/resources/rest-api-spec/api/put_script.json @@ -18,6 +18,14 @@ } }, "params" : { + "timeout": { + "type" : "time", + "description" : "Explicit operation timeout" + }, + "master_timeout": { + "type" : "time", + "description" : "Specify timeout for connection to master" + }, "context": { "type" : "string", "description" : "Context name to compile script against"