elasticsearch-api 7.11.2 → 8.6.0

data/utils/thor/generate_source.rb

@@ -19,8 +19,6 @@
 
 require 'thor'
 require 'pathname'
-require 'active_support/core_ext/hash/deep_merge'
-require 'active_support/inflector'
 require 'multi_json'
 require 'coderay'
 require 'pry'
@@ -40,37 +38,35 @@ module Elasticsearch
     # here.
     #
     class SourceGenerator < Thor
-      namespace 'api:code'
+      namespace 'code'
       include Thor::Actions
       include EndpointSpecifics
 
-      __root = Pathname(File.expand_path('../../..', __FILE__))
-
       desc 'generate', 'Generate source code and tests from the REST API JSON specification'
       method_option :verbose, type: :boolean, default: false,  desc: 'Output more information'
       method_option :tests,   type: :boolean, default: false,  desc: 'Generate test files'
-      method_option :api,     type: :array,   default: %w[oss xpack], desc: 'APIs to generate (oss, x-pack)'
 
       def generate
-        self.class.source_root File.expand_path(__dir__)
-        @xpack = options[:api].include? 'xpack'
-        @oss   = options[:api].include? 'oss'
+        @build_hash = if ENV['BUILD_HASH']
+                        File.read(File.expand_path('../../../tmp/rest-api-spec/build_hash',__dir__))
+                      else
+                        original_build_hash
+                      end
 
-        __generate_source(:xpack) if @xpack
-        __generate_source(:oss) if @oss
+        self.class.source_root File.expand_path(__dir__)
+        generate_source
         # -- Tree output
         print_tree if options[:verbose]
       end
 
       private
 
-      def __generate_source(api)
-        @current_api = api
-        @input = FilesHelper.input_dir(api)
-        @output = FilesHelper.output_dir(api)
+      def generate_source
+        @output = FilesHelper.output_dir
+        cleanup_directory!
 
-        FilesHelper.files(api).each do |filepath|
-          @path = Pathname(@input.join(filepath))
+        FilesHelper.files.each do |filepath|
+          @path = Pathname(filepath)
           @json = MultiJson.load(File.read(@path))
           @spec = @json.values.first
           say_status 'json', @path, :yellow
@@ -81,6 +77,10 @@ module Elasticsearch
           @full_namespace   = __full_namespace
           @namespace_depth  = @full_namespace.size > 0 ? @full_namespace.size - 1 : 0
           @module_namespace = @full_namespace[0, @namespace_depth]
+
+          # Don't generate code for internal APIs:
+          next if @module_namespace.flatten.first == '_internal'
+
           @method_name      = @full_namespace.last
           @parts            = __endpoint_parts
           @params           = @spec['params'] || {}
@@ -92,9 +92,9 @@ module Elasticsearch
           @http_path        = __http_path
           @required_parts   = __required_parts
 
-          @module_namespace.shift if @module_namespace.first == 'xpack'
           @path_to_file = @output.join(@module_namespace.join('/')).join("#{@method_name}.rb")
           dir = @output.join(@module_namespace.join('/'))
+
           empty_directory(dir, verbose: false)
 
           # Write the file with the ERB template:
@@ -107,23 +107,45 @@ module Elasticsearch
           puts
         end
 
-        run_rubocop(api)
+        run_rubocop
+        add_hash
+      end
+
+      def add_hash
+        Dir.glob("#{FilesHelper.output_dir}/**/*.rb").each do |file|
+          content = File.read(file)
+          new_content = content.gsub(/(^#\sunder\sthe\sLicense.\n#)/) do |_|
+            match = Regexp.last_match
+            "#{match[1]}\n#{build_hash_comment}"
+          end
+          File.open(file, 'w') { |f| f.puts new_content }
+        end
+      end
+
+      def build_hash_comment
+        [
+          "Auto generated from build hash #{@build_hash}",
+          '@see https://github.com/elastic/elasticsearch/tree/main/rest-api-spec',
+          ''
+        ].map { |b| "# #{b}" }.join("\n").strip
+      end
+
+      def original_build_hash
+        content = File.read("#{FilesHelper.output_dir}/info.rb")
+        return unless (match = content.match(/Auto generated from build hash ([a-f0-9]+)/))
+
+        match[1]
       end
 
       def __full_namespace
         names = @endpoint_name.split('.')
-        if @current_api == :xpack
-          names = (names.first == 'xpack' ? names : ['xpack', names].flatten)
-          # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
-          names.map do |name|
-            name
-              .gsub(/^ml$/, 'machine_learning')
-              .gsub(/^ilm$/, 'index_lifecycle_management')
-              .gsub(/^ccr/, 'cross_cluster_replication')
-              .gsub(/^slm/, 'snapshot_lifecycle_management')
-          end
-        else
-          names
+        # Return an array to expand 'ccr', 'ilm', 'ml' and 'slm'
+        names.map do |name|
+          name
+            .gsub(/^ml$/, 'machine_learning')
+            .gsub(/^ilm$/, 'index_lifecycle_management')
+            .gsub(/^ccr/, 'cross_cluster_replication')
+            .gsub(/^slm/, 'snapshot_lifecycle_management')
         end
       end
 
@@ -149,6 +171,8 @@ module Elasticsearch
 
       def __http_method
         return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
+        return '_name ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @method_name == 'create_service_token'
+        return post_and_get if @endpoint_name == 'count'
 
         default_method = @spec['url']['paths'].map { |a| a['methods'] }.flatten.first
         if @spec['body'] && default_method == 'GET'
@@ -156,22 +180,26 @@ module Elasticsearch
           if @spec['body']['required']
             'Elasticsearch::API::HTTP_POST'
           else
-            <<~SRC
-              if arguments[:body]
-                Elasticsearch::API::HTTP_POST
-              else
-                Elasticsearch::API::HTTP_GET
-              end
-            SRC
+            post_and_get
           end
         else
           "Elasticsearch::API::HTTP_#{default_method}"
         end
       end
 
+      def post_and_get
+        # the METHOD is defined after doing arguments.delete(:body), so we need to check for `body`
+        <<~SRC
+          if body
+            Elasticsearch::API::HTTP_POST
+          else
+            Elasticsearch::API::HTTP_GET
+          end
+        SRC
+      end
+
       def __http_path
         return "\"#{__parse_path(@paths.first)}\"" if @paths.size == 1
-        return termvectors_path if @method_name == 'termvectors'
 
         result = ''
         anchor_string = []
@@ -195,9 +223,9 @@ module Elasticsearch
 
       def __parse_path(path)
         path.gsub(/^\//, '')
-            .gsub(/\/$/, '')
-            .gsub('{', "\#{#{__utils}.__listify(_")
-            .gsub('}', ')}')
+          .gsub(/\/$/, '')
+          .gsub('{', "\#{Utils.__listify(_")
+          .gsub('}', ')}')
       end
 
       def __path_variables
@@ -227,6 +255,7 @@ module Elasticsearch
 
       def docs_helper(name, info)
         info['type'] = 'String' if info['type'] == 'enum' # Rename 'enums' to 'strings'
+        info['type'] = 'Integer' if info['type'] == 'int' # Rename 'int' to 'Integer'
         tipo = info['type'] ? info['type'].capitalize : 'String'
         description = info['description'] ? info['description'].strip : '[TODO]'
         options = info['options'] ? "(options: #{info['options'].join(', ').strip})" : nil
@@ -290,12 +319,15 @@ module Elasticsearch
         say_status('tree', lines.first + "\n" + lines[1, lines.size].map { |l| ' ' * 14 + l }.join("\n"))
       end
 
-      def __utils
-        (@current_api == :xpack) ? 'Elasticsearch::API::Utils' : 'Utils'
+      def cleanup_directory!
+        Dir["#{@output}/**/*.rb"].each do |file|
+          # file = File.join(@output, f)
+          File.delete(file) unless (['.', '..'].include? file) || Pathname(file).directory?
+        end
       end
 
-      def run_rubocop(api)
-        system("rubocop -c ./thor/.rubocop.yml --format autogenconf -x #{FilesHelper::output_dir(api)}")
+      def run_rubocop
+        system("rubocop -c ./thor/.rubocop.yml --format autogenconf -x #{FilesHelper::output_dir}")
       end
     end
   end

data/utils/thor/generator/endpoint_specifics.rb

@@ -78,21 +78,7 @@ module Elasticsearch
       def module_name_helper(name)
         return name.upcase if %w[sql ssl].include? name
 
-        name.split('_').map(&:capitalize).join
-      end
-
-      def termvectors_path
-        <<~SRC
-          if _index && _type && _id
-            "\#{Utils.__listify(_index)}/\#{Utils.__listify(_type)}/\#{Utils.__listify(_id)}/\#{endpoint}"
-          elsif _index && _type
-            "\#{Utils.__listify(_index)}/\#{Utils.__listify(_type)}/\#{endpoint}"
-          elsif _index && _id
-            "\#{Utils.__listify(_index)}/\#{endpoint}/\#{Utils.__listify(_id)}"
-          else
-            "\#{Utils.__listify(_index)}/\#{endpoint}"
-          end
-        SRC
+        name.split('_').map(&:capitalize).map{ |n| n == 'Xpack' ? 'XPack' : n }.join
       end
 
       def ping_perform_request
@@ -109,18 +95,6 @@ module Elasticsearch
         SRC
       end
 
-      def indices_stats_params_registry
-        <<~SRC
-          ParamsRegistry.register(:stats_params, [
-            #{@spec['params'].keys.map { |k| ":#{k}" }.join(",\n")}
-          ].freeze)
-
-          ParamsRegistry.register(:stats_parts, [
-            #{@parts['metric']['options'].push('metric').map { |k| ":#{k}" }.join(",\n")}
-          ].freeze)
-        SRC
-      end
-
       def msearch_body_helper
         <<~SRC
           case
@@ -170,6 +144,10 @@ module Elasticsearch
         SRC
       end
 
+      def find_structure_body_helper
+        bulk_body_helper
+      end
+
       def bulk_doc_helper(info)
         <<~SRC
           # @option arguments [String|Array] :body #{info}. Array of Strings, Header/Data pairs,

data/utils/thor/generator/files_helper.rb

@@ -20,40 +20,45 @@ require_relative '../../../lib/elasticsearch/api/version.rb'
 
 module Elasticsearch
   module API
+    # Helper with file related methods for code generation
     module FilesHelper
-      OSS_SRC_PATH   = '../../../../../tmp/elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api/'.freeze
-      OSS_OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
-
-      XPACK_SRC_PATH   = '../../../../../tmp/elasticsearch/x-pack/plugin/src/test/resources/rest-api-spec/api'.freeze
-      XPACK_OUTPUT_DIR = '../../elasticsearch-xpack/lib/elasticsearch/xpack/api/actions'.freeze
-
-      # Path to directory with JSON API specs
-      def self.input_dir(api)
-        input_dir = if api == :xpack
-                      File.expand_path(XPACK_SRC_PATH, __FILE__)
-                    else
-                      File.expand_path(OSS_SRC_PATH, __FILE__)
-                    end
-        Pathname(input_dir)
+      PROJECT_PATH = File.join(File.dirname(__FILE__), '..')
+      SRC_PATH   = File.join(PROJECT_PATH, '..', '..', '..', 'tmp/rest-api-spec/api/')
+      OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
+      TESTS_DIRECTORY = "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/free".freeze
+
+      # Only get JSON files and remove hidden files
+      def self.files
+        json_files = Dir.entries(SRC_PATH)
+
+        json_files.reject do |file|
+          File.extname(file) != '.json' ||
+            File.basename(file) == '_common.json'
+        end.map { |file| "#{SRC_PATH}#{file}" }
       end
 
       # Path to directory to copy generated files
-      def self.output_dir(api)
-        api == :xpack ? Pathname(XPACK_OUTPUT_DIR) : Pathname(OSS_OUTPUT_DIR)
+      def self.output_dir
+        Pathname(OUTPUT_DIR)
       end
 
-      # Only get JSON files and remove hidden files
-      def self.files(api)
-        Dir.entries(input_dir(api).to_s).reject do |f|
-          f.start_with?('.') ||
-            f.start_with?('_') ||
-            File.extname(f) != '.json'
+      def self.documentation_url(documentation_url)
+        branch = `git rev-parse --abbrev-ref HEAD`
+        return documentation_url.gsub(/\/(master|main)\//, "/current/") if branch == "main\n"
+
+        regex = /([0-9]{1,2}\.[0-9x]{1,2})/
+        version = Elasticsearch::API::VERSION.match(regex)[0]
+        # TODO - How do we fix this so it doesn't depend on which branch we're running from
+        if ENV['IGNORE_VERSION']
+          documentation_url.gsub(/\/(master|main)\//, "/current/")
+        else
+          documentation_url.gsub(/\/(current|master|main)\//, "/#{version}/")
         end
       end
 
-      def self.gem_version
-        regex = /([0-9]{1,2}\.[0-9x]{1,2})/
-        Elasticsearch::API::VERSION.match(regex)[0]
+      def cleanup_output_dir!
+        FileUtils.remove_dir(OUTPUT_DIR)
+        Dir.mkdir(OUTPUT_DIR)
       end
     end
   end

data/utils/thor/templates/_body.erb

@@ -0,0 +1,34 @@
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
+<%-
+case @endpoint_name
+when 'mtermvectors'
+-%>
+  body = if(ids = arguments.delete(:ids))
+    { :ids => ids }
+  else
+    arguments.delete(:body)
+  end
+<%- when 'cluster.reroute', 'cluster.put_settings' %>
+  body = arguments.delete(:body) || {}
+<%- when 'ml.find_file_structure' %>
+  body = Utils.__bulkify(arguments.delete(:body))
+<%- else -%>
+  <%= '  '*(@namespace_depth+3) %>body   = <%= @spec['body'].nil? ? 'nil' : 'arguments.delete(:body)' %>
+<%- end -%>

data/utils/thor/templates/_documentation_top.erb

@@ -1,3 +1,21 @@
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
 <%- if @spec['documentation']['description'] -%>
   <%= '  '*(@namespace_depth+3) %># <%= @spec['documentation']['description'].gsub("\n", "\n#{'  '*(@namespace_depth+3)}# ") -%>
 <%- else %>
@@ -35,5 +53,5 @@
 <% end -%>
 <%= '  '*(@namespace_depth+3) -%>#
 <%# Documentation link -%>
-<%=  '  '*(@namespace_depth+3) %># @see <%= @spec['documentation']['url'] ? @spec['documentation']['url'].gsub(/\/(current|master)\//, "/#{Elasticsearch::API::FilesHelper.gem_version}/") : "[TODO]" %>
+<%=  '  '*(@namespace_depth+3) %># @see <%= @spec['documentation']['url'] ? Elasticsearch::API::FilesHelper.documentation_url(@spec['documentation']['url']) : "[TODO]" %>
 <%= '  '*(@namespace_depth+3) %>#

data/utils/thor/templates/_method_setup.erb

@@ -1,35 +1,40 @@
-<%- if @endpoint_name == 'indices.stats' %>
-  method = HTTP_GET
-  parts  = Utils.__extract_parts arguments, ParamsRegistry.get(:stats_parts)
-  path   = Utils.__pathify Utils.__listify(arguments[:index]), '_stats', Utils.__listify(parts)
-  params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(:stats_params)
-  params[:fields] = Utils.__listify(params[:fields], :escape => false) if params[:fields]
-  params[:groups] = Utils.__listify(params[:groups], :escape => false) if params[:groups]
-<%- else %>
-  <%= '  '*(@namespace_depth+4) %>arguments = arguments.clone
-  <%- if @method_name == 'mtermvectors' -%>
-    ids = arguments.delete(:ids)
-  <%- end -%>
-  <%- if @method_name == 'search' -%>
-    arguments[:index] = UNDERSCORE_ALL if ! arguments[:index] && arguments[:type]
-  <%- end -%>
-  <%- @parts.each do |name, _| %>
-    <%- unless @method_name == 'get_field_mapping' && name == 'fields' %>
-      <%= '  '*(@namespace_depth+3) + "_#{name}" %> = arguments.delete(:<%=name %>)
-    <%- end -%>
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
+<%- if @method_name == 'search' -%>
+  arguments[:index] = UNDERSCORE_ALL if ! arguments[:index] && arguments[:type]
+<%- end -%>
+<%- @parts.each do |name, _| %>
+  <%- unless @method_name == 'get_field_mapping' && name == 'fields' %>
+    <%= '  '*(@namespace_depth+3) + "_#{name}" %> = arguments.delete(:<%=name %>)
   <%- end -%>
+<%- end -%>
 
-  <%= '  '*(@namespace_depth+4) %>method = <%= @http_method %>
-  <%- if @method_name == 'termvectors' %>
-    endpoint = arguments.delete(:endpoint) || '_termvectors'
-  <%- end -%>
-  <%= '  '*(@namespace_depth+4) %>path   = <%= @http_path %>
-  <%- unless @params.empty? -%>
-    <%= '  '*(@namespace_depth+4) %>params = <%= __utils %>.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
-  <%- else -%>
-    <%= '  '*(@namespace_depth+4) %>params = {}
-  <%- end -%>
-  <%- @specific_params.each do |param| -%>
-    <%= param %>
-  <%- end -%>
+<%= '  '*(@namespace_depth+4) %>method = <%= @http_method %>
+<%- if @method_name == 'termvectors' %>
+  endpoint = arguments.delete(:endpoint) || '_termvectors'
+<%- end -%>
+<%= '  '*(@namespace_depth+4) %>path   = <%= @http_path %>
+<%- unless @params.empty? -%>
+  <%= '  '*(@namespace_depth+4) %>params = Utils.process_params(arguments)
+<%- else -%>
+  <%= '  '*(@namespace_depth+4) %>params = {}
+<%- end -%>
+<%- @specific_params.each do |param| -%>
+  <%= param %>
 <%- end -%>

data/utils/thor/templates/_perform_request.erb

@@ -1,38 +1,50 @@
-<%-
-case @endpoint_name
-when 'mtermvectors'
--%>
-  if ids
-    body = { :ids => ids }
-  else
-    body = arguments[:body]
-  end
-<%- when 'cluster.reroute', 'cluster.put_settings' %>
-  body = arguments[:body] || {}
-<%- when 'ml.find_file_structure' %>
-  body = <%= __utils %>.__bulkify(arguments.delete(:body))
-<%- else -%>
-  <%= '  '*(@namespace_depth+3) %>body   = <%= @spec['body'].nil? ? 'nil' : 'arguments[:body]' %>
-<%- end -%>
-<%- if ['bulk', 'msearch', 'msearch_template'].include? @method_name -%>
+<%#
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+%>
+<%- 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")
-  <%= '  '*(@namespace_depth+4) %>perform_request(method, path, params, payload, headers).body
+  Elasticsearch::API::Response.new(
+    perform_request(method, path, params, payload, headers)
+  )
 <%- elsif @method_name == 'ping' -%>
   <%= ping_perform_request %>
 <%- else -%>
   <%- if needs_ignore_404?(@endpoint_name) %>
-    <%= __utils %>.__rescue_from_not_found do
+    Utils.__rescue_from_not_found do
       perform_request(method, path, params, body, headers).status == 200 ? true : false
     end
   <%- elsif needs_complex_ignore_404?(@endpoint_name) -%>
     if Array(arguments[:ignore]).include?(404)
-      <%= __utils %>.__rescue_from_not_found { perform_request(method, path, params, body, headers).body }
+    Utils.__rescue_from_not_found {
+      Elasticsearch::API::Response.new(
+        perform_request(method, path, params, body, headers)
+      )
+    }
     else
-      perform_request(method, path, params, body, headers).body
+    Elasticsearch::API::Response.new(
+      perform_request(method, path, params, body, headers)
+    )
     end
   <%- else -%>
-      perform_request(method, path, params, body, headers).body
+    Elasticsearch::API::Response.new(
+      perform_request(method, path, params, body, headers)
+    )
   <%- end -%>
 <%- end -%>
 <%= '  '*(@namespace_depth+3) %>end

data/utils/thor/templates/method.erb

@@ -14,11 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+#
 module Elasticsearch
-<%- if @current_api == :xpack -%>
-  <%= '  '*(@namespace_depth) %>module XPack
-<%- end %>
 <%= '  '*(@namespace_depth) %>module API
 <%- @module_namespace.each_with_index do |name, i| -%>
   <%= '  '*i %>module <%= module_name_helper(name) %>
@@ -36,14 +33,18 @@ module Elasticsearch
   <%= '  '*(@namespace_depth+2) %>end
 <%- else -%>
   <%- if @method_name == 'get_field_mapping' %>
+    arguments = arguments.clone
     _fields = arguments.delete(:field) || arguments.delete(:fields)
     raise ArgumentError, "Required argument 'field' missing" unless _fields
   <%- else -%>
     <%- @required_parts.each do |required| %><%# Arguments -%>
       <%= '  '*(@namespace_depth+3) + "raise ArgumentError, \"Required argument '#{required}' missing\" unless arguments[:#{required}]" + "\n" -%>
     <%- end -%>
+    arguments = arguments.clone
     <%- end -%>
     headers = arguments.delete(:headers) || {}
+    <%- #Body %>
+    <%= ERB.new(File.new("./thor/templates/_body.erb").read, trim_mode: '-').result(binding) %>
     <%- # Method setup -%>
     <%= ERB.new(File.new("./thor/templates/_method_setup.erb").read, trim_mode: '-').result(binding) %>
     <%- # Perform request -%>
@@ -60,10 +61,6 @@ module Elasticsearch
     termvectors(arguments.merge endpoint: '_termvector')
   end
 <%- end -%>
-<%# Params Registry Template -%>
-<%- unless @endpoint_name == 'create' -%>
-  <%= ERB.new(File.new("./thor/templates/_params_registry.erb").read, trim_mode: '-').result(binding) %>
-<%- end -%>
 
 <%- @namespace_depth.downto(1) do |i| -%>
 <%= '  '*(i-1) %>end

data/utils/thor/templates/test.erb

@@ -1,6 +1,19 @@
-# Licensed to Elasticsearch B.V under one or more agreements.
-# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
-# See the LICENSE file in the project root for more information
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
 require 'test_helper'
 

data/utils/thor/templates/test_helper.rb

@@ -15,10 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-
-require 'rubygems' if RUBY_1_8
-
 require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["COVERAGE"]
 
 require 'test/unit'