elasticsearch-api 7.17.7 → 8.0.0.pre1

data/spec/unit_tests_platinum/unit/watcher/put_watch_test.rb

@@ -0,0 +1,43 @@
+# 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'
+
+module Elasticsearch
+  module Test
+    class XPackWatcherPutWatchTest < Minitest::Test
+
+      context "XPack Watcher: Put watch" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'PUT', method
+            assert_equal '_watcher/watch/foo', url
+            assert_equal Hash.new, params
+            assert_equal Hash.new, body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.watcher.put_watch id: 'foo', body: {}
+        end
+
+      end
+
+    end
+  end
+end

data/spec/unit_tests_platinum/unit/watcher/query_watches_test.rb

@@ -0,0 +1,52 @@
+# 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'
+
+module Elasticsearch
+  module Test
+    class XPackWatcherQueryWatchesTest < Minitest::Test
+      context "XPack Watcher: Query watches" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal('GET', method)
+            assert_equal('_watcher/_query/watches', url)
+            assert_equal(params, {})
+            assert_nil(body)
+            true
+          end.returns(FakeResponse.new)
+
+          subject.watcher.query_watches
+        end
+
+        should "perform correct request when sending body" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal('POST', method)
+            assert_equal('_watcher/_query/watches', url)
+            assert_equal(params, {})
+            assert_equal(body, {})
+            true
+          end.returns(FakeResponse.new)
+
+          subject.watcher.query_watches(body: {})
+        end
+      end
+    end
+  end
+end

data/spec/unit_tests_platinum/unit/watcher/start_test.rb

@@ -0,0 +1,41 @@
+# 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'
+
+module Elasticsearch
+  module Test
+    class XPackWatcherStartTest < Minitest::Test
+
+      context "XPack Watcher: Start" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'POST', method
+            assert_equal '_watcher/_start', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.watcher.start
+        end
+      end
+    end
+  end
+end

data/spec/unit_tests_platinum/unit/watcher/stats_test.rb

@@ -0,0 +1,43 @@
+# 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'
+
+module Elasticsearch
+  module Test
+    class XPackWatcherStatsTest < Minitest::Test
+
+      context "XPack Watcher: Stats" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'GET', method
+            assert_equal '_watcher/stats', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.watcher.stats
+        end
+
+      end
+
+    end
+  end
+end

data/spec/unit_tests_platinum/unit/watcher/stop_test.rb

@@ -0,0 +1,43 @@
+# 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'
+
+module Elasticsearch
+  module Test
+    class XPackWatcherStopTest < Minitest::Test
+
+      context "XPack Watcher: Stop" do
+        subject { FakeClient.new }
+
+        should "perform correct request" do
+          subject.expects(:perform_request).with do |method, url, params, body|
+            assert_equal 'POST', method
+            assert_equal '_watcher/_stop', url
+            assert_equal Hash.new, params
+            assert_nil   body
+            true
+          end.returns(FakeResponse.new)
+
+          subject.watcher.stop
+        end
+
+      end
+
+    end
+  end
+end

data/utils/README.md

@@ -13,20 +13,12 @@ $ rake elasticsearch:download_artifacts
 
 Once the JSON files have been downloaded, you need to run (from this folder):
 ```bash
-$ thor api:code:generate
+$ thor code:generate
 ```
 
-- The oss Ruby code will be generated in `elasticsearch-api/lib/elasticsearch/api/actions`.  
-- The xpack Ruby code will be generated in `elasticsearch-xpack/lib/elasticsearch/xpack/api/actions`.
+- The Ruby code will be generated in `elasticsearch-api/lib/elasticsearch/api/actions`.
 - The generator runs Rubocop to autolint and clean up the generated files.
 
-Alternatively, you can pass in `oss` or `xpack` as parameters to generate only one of the 2 sets of endpoints:
-
-```bash
-$ thor api:code:generate --api=xpack
-$ thor api:code:generate --api=oss
-```
-
 ### Development
 
 The main entry point is `generate_source.rb`, which contains a class that implements a Thor task: `generate`:

data/utils/thor/.rubocop.yml

@@ -1,4 +1,2 @@
 Layout/EndAlignment:
   AutoCorrect: true
-Metrics/LineLength:
-  Max: 160

data/utils/thor/generate_source.rb

@@ -40,7 +40,7 @@ module Elasticsearch
     # here.
     #
     class SourceGenerator < Thor
-      namespace 'api:code'
+      namespace 'code'
       include Thor::Actions
       include EndpointSpecifics
 
@@ -49,26 +49,20 @@ module Elasticsearch
       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'
-
-        __generate_source(:xpack) if @xpack
-        __generate_source(:oss) if @oss
+        generate_source
         # -- Tree output
         print_tree if options[:verbose]
       end
 
       private
 
-      def __generate_source(api)
-        @current_api = api
-        @output = FilesHelper.output_dir(api)
+      def generate_source
+        @output = FilesHelper.output_dir
 
-        FilesHelper.files(api).each do |filepath|
+        FilesHelper.files.each do |filepath|
           @path = Pathname(filepath)
           @json = MultiJson.load(File.read(@path))
           @spec = @json.values.first
@@ -91,7 +85,6 @@ 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)
@@ -106,23 +99,18 @@ module Elasticsearch
           puts
         end
 
-        run_rubocop(api)
+        run_rubocop
       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
 
@@ -148,7 +136,6 @@ module Elasticsearch
 
       def __http_method
         return '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST' if @endpoint_name == 'index'
-        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,26 +143,22 @@ module Elasticsearch
           if @spec['body']['required']
             'Elasticsearch::API::HTTP_POST'
           else
-            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
         else
           "Elasticsearch::API::HTTP_#{default_method}"
         end
       end
 
-      def post_and_get
-        <<~SRC
-          if arguments[: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 = []
@@ -199,9 +182,9 @@ module Elasticsearch
 
       def __parse_path(path)
         path.gsub(/^\//, '')
-          .gsub(/\/$/, '')
-          .gsub('{', "\#{#{__utils}.__listify(_")
-          .gsub('}', ')}')
+            .gsub(/\/$/, '')
+            .gsub('{', "\#{Utils.__listify(_")
+            .gsub('}', ')}')
       end
 
       def __path_variables
@@ -295,12 +278,8 @@ 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'
-      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

@@ -27,7 +27,6 @@ module Elasticsearch
         exists
         indices.exists
         indices.exists_alias
-        indices.exists_index_template
         indices.exists_template
         indices.exists_type
       ].freeze
@@ -38,9 +37,8 @@ module Elasticsearch
         delete
         get
         indices.flush_synced
-        indices.delete
-        indices.delete_index_template
         indices.delete_template
+        indices.delete
         security.get_role
         security.get_user
         snapshot.status
@@ -80,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
@@ -111,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

data/utils/thor/generator/files_helper.rb

@@ -20,58 +20,45 @@ require_relative '../../../lib/elasticsearch/api/version.rb'
 
 module Elasticsearch
   module API
+    # Helper with file related methods for code generation
     module FilesHelper
       PROJECT_PATH = File.join(File.dirname(__FILE__), '..')
       SRC_PATH   = File.join(PROJECT_PATH, '..', '..', '..', 'tmp/rest-api-spec/api/')
-      OSS_OUTPUT_DIR = '../../elasticsearch-api/lib/elasticsearch/api/actions'.freeze
-      XPACK_OUTPUT_DIR = '../../elasticsearch-xpack/lib/elasticsearch/xpack/api/actions'.freeze
-
-      TESTS_DIRECTORIES = {
-        oss: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/free",
-        xpack: "#{PROJECT_PATH}/../../../tmp/rest-api-spec/test/platinum"
-      }.freeze
+      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(api)
-        json_files = if api == :xpack
-                       xpack_files
-                     else
-                       Dir.entries(SRC_PATH) - xpack_files
-                     end
+      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
 
-      XPACK_ENDPOINTS = [
-        'autoscaling', 'cross_cluster_replication', 'ccr', 'data_frame_transform_deprecated',
-        'enrich', 'eql', 'fleet', 'ilm', 'logstash', 'migration', 'watcher', 'slm'
-      ]
-      XPACK_ENDPOINTS_REGEXP = /data_stream|ml_|reload_search_analyzers|transform|freeze|unfreeze/
-
-      def self.xpack_files
-        xpack_tests = Dir.entries(TESTS_DIRECTORIES[:xpack])
-        Dir.entries(SRC_PATH).map do |entry|
-          filename = entry.split('.').first
-          next if filename == 'snapshot'
-
-          if xpack_tests.include?(filename) ||
-                                  XPACK_ENDPOINTS.include?(filename) ||
-                                  entry.match?(XPACK_ENDPOINTS_REGEXP)
-            entry
-          end
-        end.compact
-      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
 
-      def self.gem_version
+      def self.documentation_url(documentation_url)
+        branch = `git rev-parse --abbrev-ref HEAD`
+        return documentation_url if branch == "main\n"
+
         regex = /([0-9]{1,2}\.[0-9x]{1,2})/
-        Elasticsearch::API::VERSION.match(regex)[0]
+        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 version == '8.0'
+          documentation_url
+        else
+          documentation_url.gsub(/\/(current|master|main)\//, "/#{version}/")
+        end
+      end
+
+      def cleanup_output_dir!
+        FileUtils.remove_dir(OUTPUT_DIR)
+        Dir.mkdir(OUTPUT_DIR)
       end
     end
   end

data/utils/thor/templates/{_params_registry.erb → _body.erb}

@@ -16,16 +16,19 @@
 # specific language governing permissions and limitations
 # under the License.
 %>
-
-<%- unless @params.empty? -%>
-  <%= '  '*(@namespace_depth+3) %># Register this action with its valid params when the module is loaded.
-  <%= '  '*(@namespace_depth+3) %>#
-  <%= '  '*(@namespace_depth+3) %># @since 6.2.0
-  <%- if @endpoint_name == 'indices.stats' -%>
-    <%= indices_stats_params_registry %>
-  <%- else -%>
-    <%= '  '*(@namespace_depth+3) %>ParamsRegistry.register(:<%= @method_name %>, [
-    <%= '  '*(@namespace_depth+4) %><%= @params.keys.map { |k| ":#{k}" }.join(",\n#{'  '*(@namespace_depth+4)}") %>
-    <%= '  '*(@namespace_depth+3) %>].freeze)
-  <%- end -%>
+<%-
+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

@@ -16,7 +16,6 @@
 # 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 %>
@@ -54,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

@@ -16,38 +16,26 @@
 # specific language governing permissions and limitations
 # under the License.
 %>
-<%- 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 -%>
+<%= '  '*(@namespace_depth+4) %>arguments = arguments.clone
+<%- 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 -%>