[API] Update and refactors Content-Type headers for ndjson APIs

Author: picandocodigo

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

@@ -65,7 +65,7 @@ def bulk(arguments = {})
           payload = body
         end
 
-        headers.merge!("Content-Type" => "application/x-ndjson")
+        headers = Utils.ndjson_headers(headers)
         perform_request(method, path, params, payload, headers).body
       end
 

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

@@ -83,7 +83,7 @@ def msearch(arguments = {})
           payload = body
         end
 
-        headers.merge!("Content-Type" => "application/x-ndjson")
+        headers = Utils.ndjson_headers(headers)
         perform_request(method, path, params, payload, headers).body
       end
 

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

@@ -69,7 +69,7 @@ def msearch_template(arguments = {})
           payload = body
         end
 
-        headers.merge!("Content-Type" => "application/x-ndjson")
+        headers = Utils.ndjson_headers(headers)
         perform_request(method, path, params, payload, headers).body
       end
 

elasticsearch-api/lib/elasticsearch/api/utils.rb

@@ -17,11 +17,9 @@
 
 module Elasticsearch
   module API
-
     # Generic utility methods
     #
     module Utils
-
       # URL-escape a string
       #
       # @example
@@ -282,6 +280,11 @@ def __report_unsupported_method(name)
         end
       end
 
+      def ndjson_headers(headers)
+        headers.merge!('Content-Type' => 'application/x-ndjson') unless ['1', 'true'].include?(ENV['ELASTIC_CLIENT_APIVERSIONING'])
+        headers
+      end
+
       extend self
     end
   end

elasticsearch-api/utils/thor/templates/_perform_request.erb

@@ -34,7 +34,7 @@ when 'mtermvectors'
 <%- end -%>
 <%- if ['bulk', 'msearch', 'msearch_template', 'find_structure'].include? @method_name -%>
   <%= self.send("#{@method_name}_body_helper".to_s) %>
-  headers.merge!("Content-Type" => "application/x-ndjson")
+  headers = <%= __utils %>.ndjson_headers(headers)
   <%= '  '*(@namespace_depth+4) %>perform_request(method, path, params, payload, headers).body
 <%- elsif @method_name == 'ping' -%>
   <%= ping_perform_request %>

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

@@ -72,7 +72,7 @@ def msearch(arguments = {})
               payload = body
             end
 
-            headers.merge!("Content-Type" => "application/x-ndjson")
+            headers = Elasticsearch::API::Utils.ndjson_headers(headers)
             perform_request(method, path, params, payload, headers).body
           end
         end

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

@@ -61,7 +61,7 @@ def bulk(arguments = {})
               payload = body
             end
 
-            headers.merge!("Content-Type" => "application/x-ndjson")
+            headers = Elasticsearch::API::Utils.ndjson_headers(headers)
             perform_request(method, path, params, payload, headers).body
           end
 

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

@@ -59,7 +59,7 @@ def find_structure(arguments = {})
               payload = body
             end
 
-            headers.merge!("Content-Type" => "application/x-ndjson")
+            headers = Elasticsearch::API::Utils.ndjson_headers(headers)
             perform_request(method, path, params, payload, headers).body
           end