Updates content type header for 9.x

Author: picandocodigo

elasticsearch-api/lib/elasticsearch/api/actions/bulk.rb

@@ -163,7 +163,10 @@ def bulk(arguments = {})
                     body
                   end
 
-        headers.merge!('Content-Type' => 'application/x-ndjson')
+        headers.merge!({
+                         'Content-Type' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9',
+                         'Accept' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9'
+                       })
         Elasticsearch::API::Response.new(
           perform_request(method, path, params, payload, headers, request_opts)
         )

elasticsearch-api/lib/elasticsearch/api/actions/fleet/msearch.rb

@@ -97,7 +97,10 @@ def msearch(arguments = {})
             payload = body
           end
 
-          headers.merge!('Content-Type' => 'application/x-ndjson')
+          headers.merge!({
+                           'Content-Type' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9',
+                           'Accept' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9'
+                         })
           Elasticsearch::API::Response.new(
             perform_request(method, path, params, payload, headers, request_opts)
           )

elasticsearch-api/lib/elasticsearch/api/actions/msearch.rb

@@ -103,7 +103,10 @@ def msearch(arguments = {})
           payload = body
         end
 
-        headers.merge!('Content-Type' => 'application/x-ndjson')
+        headers.merge!({
+                         'Content-Type' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9',
+                         'Accept' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9'
+                       })
         Elasticsearch::API::Response.new(
           perform_request(method, path, params, payload, headers, request_opts)
         )

elasticsearch-api/lib/elasticsearch/api/actions/msearch_template.rb

@@ -81,7 +81,10 @@ def msearch_template(arguments = {})
           payload = body
         end
 
-        headers.merge!('Content-Type' => 'application/x-ndjson')
+        headers.merge!({
+                         'Content-Type' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9',
+                         'Accept' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9'
+                       })
         Elasticsearch::API::Response.new(
           perform_request(method, path, params, payload, headers, request_opts)
         )

elasticsearch-api/lib/elasticsearch/api/actions/text_structure/find_structure.rb

@@ -136,7 +136,10 @@ def find_structure(arguments = {})
                       body
                     end
 
-          headers.merge!('Content-Type' => 'application/x-ndjson')
+          headers.merge!({
+                           'Content-Type' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9',
+                           'Accept' => 'application/vnd.elasticsearch+x-ndjson; compatible-with=9'
+                         })
           Elasticsearch::API::Response.new(
             perform_request(method, path, params, payload, headers, request_opts)
           )

elasticsearch/lib/elasticsearch.rb

@@ -52,6 +52,7 @@ def initialize(arguments = {}, &block)
       api_key(arguments) if arguments[:api_key]
       setup_cloud(arguments) if arguments[:cloud_id]
       set_user_agent!(arguments) unless sent_user_agent?(arguments)
+      set_content_type!(arguments)
       @transport = Elastic::Transport::Client.new(arguments, &block)
     end
 
@@ -175,9 +176,21 @@ def set_user_agent!(arguments)
       if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
         user_agent << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} #{RbConfig::CONFIG['target_cpu']}"
       end
+      set_header({ user_agent: user_agent.join('; ') }, arguments)
+    end
+
+    def set_content_type!(arguments)
+      headers = {
+        'content-type' => 'application/vnd.elasticsearch+json; compatible-with=9',
+        'accept' => 'application/vnd.elasticsearch+json; compatible-with=9,text/plain'
+      }
+      set_header(headers, arguments)
+    end
+
+    def set_header(header, arguments)
       arguments[:transport_options] ||= {}
       arguments[:transport_options][:headers] ||= {}
-      arguments[:transport_options][:headers].merge!({ user_agent: user_agent.join('; ') })
+      arguments[:transport_options][:headers].merge!(header)
     end
   end