1 files changed, 32 insertions, 1 deletions
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java
index 661a1a1d01..807e238724 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequestBuilder.java
@@ -23,6 +23,7 @@ import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.MasterNodeOperationRequestBuilder;
 import org.elasticsearch.client.ElasticsearchClient;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.XContentType;
 
 import java.util.List;
 import java.util.Map;
@@ -153,19 +154,35 @@ public class RestoreSnapshotRequestBuilder extends MasterNodeOperationRequestBui
     }
 
     /**
-     * Sets repository-specific restore settings in JSON, YAML or properties format
+     * Sets repository-specific restore settings in JSON or YAML format
      * <p>
      * See repository documentation for more information.
      *
      * @param source repository-specific snapshot settings
      * @return this builder
+     * @deprecated use {@link #setSettings(String, XContentType)} to avoid content type detection
      */
+    @Deprecated
     public RestoreSnapshotRequestBuilder setSettings(String source) {
         request.settings(source);
         return this;
     }
 
     /**
+     * Sets repository-specific restore settings in JSON or YAML format
+     * <p>
+     * See repository documentation for more information.
+     *
+     * @param source repository-specific snapshot settings
+     * @param xContentType the content type of the source
+     * @return this builder
+     */
+    public RestoreSnapshotRequestBuilder setSettings(String source, XContentType xContentType) {
+        request.settings(source, xContentType);
+        return this;
+    }
+
+    /**
      * Sets repository-specific restore settings
      * <p>
      * See repository documentation for more information.
@@ -251,7 +268,9 @@ public class RestoreSnapshotRequestBuilder extends MasterNodeOperationRequestBui
      *
      * @param source index settings
      * @return this builder
+     * @deprecated use {@link #setIndexSettings(String, XContentType)} to avoid content type detection
      */
+    @Deprecated
     public RestoreSnapshotRequestBuilder setIndexSettings(String source) {
         request.indexSettings(source);
         return this;
@@ -261,6 +280,18 @@ public class RestoreSnapshotRequestBuilder extends MasterNodeOperationRequestBui
      * Sets index settings that should be added or replaced during restore
      *
      * @param source index settings
+     * @param xContentType the content type of the source
+     * @return this builder
+     */
+    public RestoreSnapshotRequestBuilder setIndexSettings(String source, XContentType xContentType) {
+        request.indexSettings(source, xContentType);
+        return this;
+    }
+
+    /**
+     * Sets index settings that should be added or replaced during restore
+     *
+     * @param source index settings
      * @return this builder
      */
     public RestoreSnapshotRequestBuilder setIndexSettings(Map<String, Object> source) {