Optionally require a valid content type for all rest requests with content

client/benchmark/src/main/java/org/elasticsearch/client/benchmark/transport/TransportClientBenchmark.java

@@ -28,6 +28,7 @@
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.plugin.noop.NoopPlugin;
 import org.elasticsearch.plugin.noop.action.bulk.NoopBulkAction;
@@ -80,7 +81,7 @@ public TransportBulkRequestExecutor(TransportClient client, String indexName, St
         public boolean bulkIndex(List<String> bulkData) {
             NoopBulkRequestBuilder builder = NoopBulkAction.INSTANCE.newRequestBuilder(client);
             for (String bulkItem : bulkData) {
-                builder.add(new IndexRequest(indexName, typeName).source(bulkItem.getBytes(StandardCharsets.UTF_8)));
+                builder.add(new IndexRequest(indexName, typeName).source(bulkItem.getBytes(StandardCharsets.UTF_8), XContentType.JSON));
             }
             BulkResponse bulkResponse;
             try {

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/NoopBulkRequestBuilder.java

@@ -33,6 +33,7 @@
 import org.elasticsearch.client.ElasticsearchClient;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.common.xcontent.XContentType;
 
 public class NoopBulkRequestBuilder extends ActionRequestBuilder<BulkRequest, BulkResponse, NoopBulkRequestBuilder>
         implements WriteRequestBuilder<NoopBulkRequestBuilder> {
@@ -95,17 +96,17 @@ public NoopBulkRequestBuilder add(UpdateRequestBuilder request) {
     /**
      * Adds a framed data in binary format
      */
-    public NoopBulkRequestBuilder add(byte[] data, int from, int length) throws Exception {
-        request.add(data, from, length, null, null);
+    public NoopBulkRequestBuilder add(byte[] data, int from, int length, XContentType xContentType) throws Exception {
+        request.add(data, from, length, null, null, xContentType);
         return this;
     }
 
     /**
      * Adds a framed data in binary format
      */
-    public NoopBulkRequestBuilder add(byte[] data, int from, int length, @Nullable String defaultIndex, @Nullable String defaultType)
-        throws Exception {
-        request.add(data, from, length, defaultIndex, defaultType);
+    public NoopBulkRequestBuilder add(byte[] data, int from, int length, @Nullable String defaultIndex, @Nullable String defaultType,
+                                      XContentType xContentType) throws Exception {
+        request.add(data, from, length, defaultIndex, defaultType, xContentType);
         return this;
     }
 

client/client-benchmark-noop-api-plugin/src/main/java/org/elasticsearch/plugin/noop/action/bulk/RestNoopBulkAction.java

@@ -75,7 +75,8 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         }
         bulkRequest.timeout(request.paramAsTime("timeout", BulkShardRequest.DEFAULT_TIMEOUT));
         bulkRequest.setRefreshPolicy(request.param("refresh"));
-        bulkRequest.add(request.content(), defaultIndex, defaultType, defaultRouting, defaultFields, null, defaultPipeline, null, true);
+        bulkRequest.add(request.content(), defaultIndex, defaultType, defaultRouting, defaultFields, null, defaultPipeline, null, true,
+            request.getXContentType());
 
         // short circuit the call to the transport layer
         return channel -> {

core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java

@@ -19,12 +19,14 @@
 
 package org.elasticsearch.action.admin.cluster.storedscripts;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentType;
 
 import java.io.IOException;
 
@@ -35,6 +37,7 @@ public class PutStoredScriptRequest extends AcknowledgedRequest<PutStoredScriptR
     private String id;
     private String scriptLang;
     private BytesReference script;
+    private XContentType xContentType;
 
     public PutStoredScriptRequest() {
         super();
@@ -92,17 +95,31 @@ public BytesReference script() {
         return script;
     }
 
+    public XContentType xContentType() {
+        return xContentType;
+    }
+
+    @Deprecated
     public PutStoredScriptRequest script(BytesReference source) {
         this.script = source;
         return this;
     }
 
+    public PutStoredScriptRequest script(BytesReference source, XContentType xContentType) {
+        this.script = source;
+        this.xContentType = xContentType;
+        return this;
+    }
+
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         scriptLang = in.readString();
         id = in.readOptionalString();
         script = in.readBytesReference();
+        if (in.getVersion().onOrAfter(Version.V_5_3_0_UNRELEASED) && in.readBoolean()) {
+            xContentType = XContentType.readFrom(in);
+        }
     }
 
     @Override
@@ -111,13 +128,25 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(scriptLang);
         out.writeOptionalString(id);
         out.writeBytesReference(script);
+        if (out.getVersion().onOrAfter(Version.V_5_3_0_UNRELEASED)) {
+            if (xContentType == null) {
+                out.writeBoolean(false);
+            } else {
+                out.writeBoolean(true);
+                xContentType.writeTo(out);
+            }
+        }
     }
 
     @Override
     public String toString() {
         String sSource = "_na_";
         try {
-            sSource = XContentHelper.convertToJson(script, false);
+            if (xContentType == null) {
+                sSource = XContentHelper.convertToJson(script, false);
+            } else {
+                sSource = XContentHelper.convertToJson(script, false, xContentType);
+            }
         } catch (Exception e) {
             // ignore
         }

core/src/main/java/org/elasticsearch/action/admin/cluster/storedscripts/PutStoredScriptRequestBuilder.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.action.support.master.AcknowledgedRequestBuilder;
 import org.elasticsearch.client.ElasticsearchClient;
 import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.xcontent.XContentType;
 
 public class PutStoredScriptRequestBuilder extends AcknowledgedRequestBuilder<PutStoredScriptRequest,
         PutStoredScriptResponse, PutStoredScriptRequestBuilder> {
@@ -40,9 +41,14 @@ public PutStoredScriptRequestBuilder setId(String id) {
         return this;
     }
 
+    @Deprecated
     public PutStoredScriptRequestBuilder setSource(BytesReference source) {
         request.script(source);
         return this;
     }
 
+    public PutStoredScriptRequestBuilder setSource(BytesReference source, XContentType xContentType) {
+        request.script(source, xContentType);
+        return this;
+    }
 }

core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java

@@ -331,11 +331,20 @@ public CreateIndexRequest alias(Alias alias) {
 
     /**
      * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #source(String, XContentType)}
      */
+    @Deprecated
     public CreateIndexRequest source(String source) {
         return source(source.getBytes(StandardCharsets.UTF_8));
     }
 
+    /**
+     * Sets the settings and mappings as a single source.
+     */
+    public CreateIndexRequest source(String source, XContentType xContentType) {
+        return source(source.getBytes(StandardCharsets.UTF_8), xContentType);
+    }
+
     /**
      * Sets the settings and mappings as a single source.
      */
@@ -345,23 +354,51 @@ public CreateIndexRequest source(XContentBuilder source) {
 
     /**
      * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #source(byte[], XContentType)}
      */
+    @Deprecated
     public CreateIndexRequest source(byte[] source) {
         return source(source, 0, source.length);
     }
 
     /**
      * Sets the settings and mappings as a single source.
      */
+    public CreateIndexRequest source(byte[] source, XContentType xContentType) {
+        return source(source, 0, source.length, xContentType);
+    }
+
+    /**
+     * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #source(byte[], int, int, XContentType)}
+     */
+    @Deprecated
     public CreateIndexRequest source(byte[] source, int offset, int length) {
         return source(new BytesArray(source, offset, length));
     }
 
     /**
      * Sets the settings and mappings as a single source.
      */
+    public CreateIndexRequest source(byte[] source, int offset, int length, XContentType xContentType) {
+        return source(new BytesArray(source, offset, length), xContentType);
+    }
+
+    /**
+     * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #source(BytesReference, XContentType)}
+     */
+    @Deprecated
     public CreateIndexRequest source(BytesReference source) {
         XContentType xContentType = XContentFactory.xContentType(source);
+        source(source, xContentType);
+        return this;
+    }
+
+    /**
+     * Sets the settings and mappings as a single source.
+     */
+    public CreateIndexRequest source(BytesReference source, XContentType xContentType) {
         if (xContentType != null) {
             source(XContentHelper.convertToMap(source, false).v2());
         } else {

core/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestBuilder.java

@@ -27,6 +27,7 @@
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentType;
 
 import java.util.Map;
 
@@ -191,7 +192,9 @@ public CreateIndexRequestBuilder addAlias(Alias alias) {
 
     /**
      * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #setSource(String, XContentType)}
      */
+    @Deprecated
     public CreateIndexRequestBuilder setSource(String source) {
         request.source(source);
         return this;
@@ -200,6 +203,16 @@ public CreateIndexRequestBuilder setSource(String source) {
     /**
      * Sets the settings and mappings as a single source.
      */
+    public CreateIndexRequestBuilder setSource(String source, XContentType xContentType) {
+        request.source(source, xContentType);
+        return this;
+    }
+
+    /**
+     * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #setSource(BytesReference, XContentType)}
+     */
+    @Deprecated
     public CreateIndexRequestBuilder setSource(BytesReference source) {
         request.source(source);
         return this;
@@ -208,6 +221,16 @@ public CreateIndexRequestBuilder setSource(BytesReference source) {
     /**
      * Sets the settings and mappings as a single source.
      */
+    public CreateIndexRequestBuilder setSource(BytesReference source, XContentType xContentType) {
+        request.source(source, xContentType);
+        return this;
+    }
+
+    /**
+     * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #setSource(byte[], XContentType)}
+     */
+    @Deprecated
     public CreateIndexRequestBuilder setSource(byte[] source) {
         request.source(source);
         return this;
@@ -216,11 +239,29 @@ public CreateIndexRequestBuilder setSource(byte[] source) {
     /**
      * Sets the settings and mappings as a single source.
      */
+    public CreateIndexRequestBuilder setSource(byte[] source, XContentType xContentType) {
+        request.source(source, xContentType);
+        return this;
+    }
+
+    /**
+     * Sets the settings and mappings as a single source.
+     * @deprecated use {@link #setSource(byte[], int, int, XContentType)}
+     */
+    @Deprecated
     public CreateIndexRequestBuilder setSource(byte[] source, int offset, int length) {
         request.source(source, offset, length);
         return this;
     }
 
+    /**
+     * Sets the settings and mappings as a single source.
+     */
+    public CreateIndexRequestBuilder setSource(byte[] source, int offset, int length, XContentType xContentType) {
+        request.source(source, offset, length, xContentType);
+        return this;
+    }
+
     /**
      * Sets the settings and mappings as a single source.
      */

core/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java

@@ -22,19 +22,24 @@
 import com.carrotsearch.hppc.ObjectHashSet;
 
 import org.elasticsearch.ElasticsearchGenerationException;
+import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.AcknowledgedRequest;
 import org.elasticsearch.common.Strings;
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.Index;
 
 import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
@@ -245,7 +250,7 @@ public static XContentBuilder buildFromSimplifiedDef(String type, Object... sour
      */
     public PutMappingRequest source(XContentBuilder mappingBuilder) {
         try {
-            return source(mappingBuilder.string());
+            return source(mappingBuilder.string(), mappingBuilder.contentType());
         } catch (IOException e) {
             throw new IllegalArgumentException("Failed to build json for mapping request", e);
         }
@@ -259,17 +264,30 @@ public PutMappingRequest source(Map mappingSource) {
         try {
             XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
             builder.map(mappingSource);
-            return source(builder.string());
+            return source(builder.string(), XContentType.JSON);
         } catch (IOException e) {
             throw new ElasticsearchGenerationException("Failed to generate [" + mappingSource + "]", e);
         }
     }
 
     /**
      * The mapping source definition.
+     * @deprecated use {@link #source(String, XContentType)}
      */
+    @Deprecated
     public PutMappingRequest source(String mappingSource) {
-        this.source = mappingSource;
+        return source(mappingSource, XContentFactory.xContentType(mappingSource));
+    }
+
+    /**
+     * The mapping source definition.
+     */
+    public PutMappingRequest source(String mappingSource, XContentType xContentType) {
+        try {
+            this.source = XContentHelper.convertToJson(new BytesArray(mappingSource.getBytes(StandardCharsets.UTF_8)), false, xContentType);
+        } catch (IOException e) {
+            throw new UncheckedIOException("failed to convert mapping source to json", e);
+        }
         return this;
     }
 
@@ -290,7 +308,11 @@ public void readFrom(StreamInput in) throws IOException {
         indices = in.readStringArray();
         indicesOptions = IndicesOptions.readIndicesOptions(in);
         type = in.readOptionalString();
-        source = in.readString();
+        if (in.getVersion().onOrAfter(Version.V_5_3_0_UNRELEASED)) {
+            source = in.readString();
+        } else {
+            source = XContentHelper.convertToJson(new BytesArray(in.readString().getBytes(StandardCharsets.UTF_8)), false);
+        }
         updateAllTypes = in.readBoolean();
         readTimeout(in);
         concreteIndex = in.readOptionalWriteable(Index::new);