[API] Update top-level api endpoints

Author: estolfo

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

@@ -66,18 +66,16 @@ module Actions
       #
       # @option arguments [String] :index Default index for items which don't provide one
       # @option arguments [String] :type Default document type for items which don't provide one
-      # @option arguments [Hash] :body The operation definition and data (action-data pairs), separated by newlines (*Required*). Note that this cannot be empty.
-      # @option arguments [Boolean] :include_type_name Whether a type should be expected in the body of the mappings.
+      # @option arguments [Hash] :body The operation definition and data (action-data pairs), separated by newlines (*Required*)
       # @option arguments [String] :wait_for_active_shards Sets the number of shard copies that must be active before proceeding with the bulk operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
       # @option arguments [String] :refresh If `true` then refresh the effected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes. (options: true, false, wait_for)
       # @option arguments [String] :routing Specific routing value
       # @option arguments [Time] :timeout Explicit operation timeout
       # @option arguments [String] :type Default document type for items which don't provide one
-      # @option arguments [List] :fields Default comma-separated list of fields to return in the response for updates, can be overridden on each sub-request
       # @option arguments [List] :_source True or false to return the _source field or not, or default list of fields to return, can be overridden on each sub-request
-      # @option arguments [List] :_source_exclude Default list of fields to exclude from the returned _source field, can be overridden on each sub-request
-      # @option arguments [List] :_source_include Default list of fields to extract and return from the _source field, can be overridden on each sub-request
-      # @option arguments [String] :pipeline The pipeline ID to preprocess incoming documents with
+      # @option arguments [List] :_source_excludes Default list of fields to exclude from the returned _source field, can be overridden on each sub-request
+      # @option arguments [List] :_source_includes Default list of fields to extract and return from the _source field, can be overridden on each sub-request
+      # @option arguments [String] :pipeline The pipeline id to preprocess incoming documents with
       #
       # @return [Hash] Deserialized Elasticsearch response
       #
@@ -112,12 +110,10 @@ def bulk(arguments={})
           :routing,
           :timeout,
           :type,
-          :fields,
           :_source,
           :_source_excludes,
           :_source_includes,
-          :pipeline,
-          :include_type_name ].freeze)
+          :pipeline ].freeze)
     end
   end
 end

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

@@ -21,16 +21,14 @@ module Actions
 
       # Abort a particular scroll search and clear all the resources associated with it.
       #
-      # @option arguments [List] :scroll_id A comma-separated list of scroll IDs to clear;
-      #                                     use `_all` clear all scroll search contexts
+      # @option arguments [List] :scroll_id A comma-separated list of scroll IDs to clear
+      # @option arguments [Hash] :body A comma-separated list of scroll IDs to clear if none was specified via the scroll_id parameter
       #
-      # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-search-type.html#clear-scroll
+      # @see http://www.elastic.co/guide/en/elasticsearch/reference/master/search-request-scroll.html
       #
       def clear_scroll(arguments={})
-        raise ArgumentError, "Required argument 'scroll_id' missing" unless arguments[:scroll_id]
-
-        method = HTTP_DELETE
-        path   = Utils.__pathify '_search/scroll', Utils.__listify(arguments.delete(:scroll_id))
+        method = Elasticsearch::API::HTTP_DELETE
+        path   = "_search/scroll/#{arguments[:scroll_id]}"
         params = {}
         body   = arguments[:body]
 

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

@@ -33,34 +33,24 @@ module Actions
       #
       #     index: 'my_index', body: { filtered: { filter: { terms: { foo: ['bar'] } } } }
       #
+      #
       # @option arguments [List] :index A comma-separated list of indices to restrict the results
       # @option arguments [List] :type A comma-separated list of types to restrict the results
       # @option arguments [Hash] :body A query to restrict the results specified with the Query DSL (optional)
-      # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when
-      #                                                 unavailable (missing or closed)
-      # @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves
-      #                                               into no concrete indices.
-      # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices
-      #                                              that are open, closed or both.
-      #                                              (options: open, closed, none, all)
+      # @option arguments [Boolean] :ignore_unavailable Whether specified concrete indices should be ignored when unavailable (missing or closed)
+      # @option arguments [Boolean] :ignore_throttled Whether specified concrete, expanded or aliased indices should be ignored when throttled
+      # @option arguments [Boolean] :allow_no_indices Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
+      # @option arguments [String] :expand_wildcards Whether to expand wildcard expression to concrete indices that are open, closed or both. (options: open, closed, none, all)
       # @option arguments [Number] :min_score Include only documents with a specific `_score` value in the result
-      # @option arguments [String] :preference Specify the node or shard the operation should be performed on
-      #                                        (default: random)
-      # @option arguments [String] :routing Specific routing value
+      # @option arguments [String] :preference Specify the node or shard the operation should be performed on (default: random)
+      # @option arguments [List] :routing A comma-separated list of specific routing values
       # @option arguments [String] :q Query in the Lucene query string syntax
       # @option arguments [String] :analyzer The analyzer to use for the query string
-      # @option arguments [Boolean] :analyze_wildcard Specify whether wildcard and prefix queries should be
-      #                                               analyzed (default: false)
-      # @option arguments [String] :default_operator The default operator for query string query (AND or OR)
-      #                                              (options: AND, OR)
-      # @option arguments [String] :df The field to use as default where no field prefix is given in the query
-      #                                string
-      # @option arguments [Boolean] :lenient Specify whether format-based query failures (such as providing text
-      #                                      to a numeric field) should be ignored
-      # @option arguments [Boolean] :lowercase_expanded_terms Specify whether query terms should be lowercased
-      #
-      # @option arguments [Boolean] :terminate_after Specify the maximum count for each shard, upon reaching
-      #                                              which the query execution will terminate early.
+      # @option arguments [Boolean] :analyze_wildcard Specify whether wildcard and prefix queries should be analyzed (default: false)
+      # @option arguments [String] :default_operator The default operator for query string query (AND or OR) (options: AND, OR)
+      # @option arguments [String] :df The field to use as default where no field prefix is given in the query string
+      # @option arguments [Boolean] :lenient Specify whether format-based query failures (such as providing text to a numeric field) should be ignored
+      # @option arguments [Number] :terminate_after The maximum count for each shard, upon reaching which the query execution will terminate early
       #
       # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/search-count.html
       #
@@ -79,6 +69,7 @@ def count(arguments={})
       # @since 6.1.1
       ParamsRegistry.register(:count, [
           :ignore_unavailable,
+          :ignore_throttled,
           :allow_no_indices,
           :expand_wildcards,
           :min_score,
@@ -90,7 +81,6 @@ def count(arguments={})
           :default_operator,
           :df,
           :lenient,
-          :lowercase_expanded_terms,
           :terminate_after ].freeze)
     end
   end

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

@@ -30,17 +30,15 @@ module Actions
       #     client.delete index: 'myindex', type: 'mytype', id: '1', routing: 'abc123'
       #
       # @option arguments [String] :id The document ID (*Required*)
-      # @option arguments [Number,List] :ignore The list of HTTP errors to ignore; only `404` supported at the moment
       # @option arguments [String] :index The name of the index (*Required*)
-      # @option arguments [String] :type The type of the document (*Required*)
-      # @option arguments [String] :consistency Specific write consistency setting for the operation
-      #                                         (options: one, quorum, all)
-      # @option arguments [Boolean] :include_type_name Whether a type should be expected in the body of the mappings.
+      # @option arguments [String] :type The type of the document
+      # @option arguments [String] :wait_for_active_shards Sets the number of shard copies that must be active before proceeding with the delete operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
       # @option arguments [String] :parent ID of parent document
-      # @option arguments [Boolean] :refresh Refresh the index after performing the operation
-      # @option arguments [String] :replication Specific replication type (options: sync, async)
+      # @option arguments [String] :refresh If `true` then refresh the effected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes. (options: true, false, wait_for)
       # @option arguments [String] :routing Specific routing value
       # @option arguments [Time] :timeout Explicit operation timeout
+      # @option arguments [Number] :if_seq_no only perform the delete operation if the last operation that has changed the document has the specified sequence number
+      # @option arguments [Number] :if_primary_term only perform the delete operation if the last operation that has changed the document has the specified primary term
       # @option arguments [Number] :version Explicit version number for concurrency control
       # @option arguments [String] :version_type Specific version type (options: internal, external, external_gte, force)
       #
@@ -70,17 +68,15 @@ def delete(arguments={})
       #
       # @since 6.1.1
       ParamsRegistry.register(:delete, [
-          :consistency,
+          :wait_for_active_shards,
           :parent,
           :refresh,
-          :if_seq_no,
-          :replication,
           :routing,
           :timeout,
-          :version,
-          :version_type,
+          :if_seq_no,
           :if_primary_term,
-          :include_type_name ].freeze)
+          :version,
+          :version_type ].freeze)
     end
   end
 end