[API] Reorganizes query_rule and query_ruleset into query_rules

Author: picandocodigo

elasticsearch-api/lib/elasticsearch/api.rb

@@ -82,13 +82,12 @@ def self.included(base)
                 Elasticsearch::API::XPack,
                 Elasticsearch::API::SearchApplication,
                 Elasticsearch::API::Synonyms,
-                Elasticsearch::API::QueryRuleset,
                 Elasticsearch::API::Esql,
                 Elasticsearch::API::Inference,
                 Elasticsearch::API::Profiling,
                 Elasticsearch::API::Simulate,
                 Elasticsearch::API::Connector,
-                Elasticsearch::API::QueryRule
+                Elasticsearch::API::QueryRules
     end
 
     # The serializer class

elasticsearch-api/lib/elasticsearch/api/actions/query_rule/delete.rb renamed to elasticsearch-api/lib/elasticsearch/api/actions/query_rules/delete_rule.rb

@@ -20,7 +20,7 @@
 #
 module Elasticsearch
   module API
-    module QueryRule
+    module QueryRules
       module Actions
         # Deletes an individual query rule within a ruleset.
         #
@@ -30,8 +30,8 @@ module Actions
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-query-rule.html
         #
-        def delete(arguments = {})
-          request_opts = { endpoint: arguments[:endpoint] || 'query_rule.delete' }
+        def delete_rule(arguments = {})
+          request_opts = { endpoint: arguments[:endpoint] || 'query_rules.delete_rule' }
 
           defined_params = %i[ruleset_id rule_id].each_with_object({}) do |variable, set_variables|
             set_variables[variable] = arguments[variable] if arguments.key?(variable)

elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/delete.rb renamed to elasticsearch-api/lib/elasticsearch/api/actions/query_rules/delete_ruleset.rb

@@ -20,7 +20,7 @@
 #
 module Elasticsearch
   module API
-    module QueryRuleset
+    module QueryRules
       module Actions
         # Deletes a query ruleset.
         #
@@ -29,8 +29,8 @@ module Actions
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/delete-query-ruleset.html
         #
-        def delete(arguments = {})
-          request_opts = { endpoint: arguments[:endpoint] || 'query_ruleset.delete' }
+        def delete_ruleset(arguments = {})
+          request_opts = { endpoint: arguments[:endpoint] || 'query_rules.delete_ruleset' }
 
           defined_params = [:ruleset_id].each_with_object({}) do |variable, set_variables|
             set_variables[variable] = arguments[variable] if arguments.key?(variable)

elasticsearch-api/lib/elasticsearch/api/actions/query_rule/get.rb renamed to elasticsearch-api/lib/elasticsearch/api/actions/query_rules/get_rule.rb

@@ -20,7 +20,7 @@
 #
 module Elasticsearch
   module API
-    module QueryRule
+    module QueryRules
       module Actions
         # Returns the details about an individual query rule within a ruleset.
         #
@@ -30,8 +30,8 @@ module Actions
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/get-query-rule.html
         #
-        def get(arguments = {})
-          request_opts = { endpoint: arguments[:endpoint] || 'query_rule.get' }
+        def get_rule(arguments = {})
+          request_opts = { endpoint: arguments[:endpoint] || 'query_rules.get_rule' }
 
           defined_params = %i[ruleset_id rule_id].each_with_object({}) do |variable, set_variables|
             set_variables[variable] = arguments[variable] if arguments.key?(variable)

elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/get.rb renamed to elasticsearch-api/lib/elasticsearch/api/actions/query_rules/get_ruleset.rb

@@ -20,7 +20,7 @@
 #
 module Elasticsearch
   module API
-    module QueryRuleset
+    module QueryRules
       module Actions
         # Returns the details about a query ruleset.
         #
@@ -29,8 +29,8 @@ module Actions
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/get-query-ruleset.html
         #
-        def get(arguments = {})
-          request_opts = { endpoint: arguments[:endpoint] || 'query_ruleset.get' }
+        def get_ruleset(arguments = {})
+          request_opts = { endpoint: arguments[:endpoint] || 'query_rules.get_ruleset' }
 
           defined_params = [:ruleset_id].each_with_object({}) do |variable, set_variables|
             set_variables[variable] = arguments[variable] if arguments.key?(variable)

elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/list.rb renamed to elasticsearch-api/lib/elasticsearch/api/actions/query_rules/list_rulesets.rb

@@ -20,7 +20,7 @@
 #
 module Elasticsearch
   module API
-    module QueryRuleset
+    module QueryRules
       module Actions
         # Lists query rulesets.
         #
@@ -30,8 +30,8 @@ module Actions
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/list-query-rulesets.html
         #
-        def list(arguments = {})
-          request_opts = { endpoint: arguments[:endpoint] || 'query_ruleset.list' }
+        def list_rulesets(arguments = {})
+          request_opts = { endpoint: arguments[:endpoint] || 'query_rules.list_rulesets' }
 
           arguments = arguments.clone
           headers = arguments.delete(:headers) || {}

elasticsearch-api/lib/elasticsearch/api/actions/query_rule/put.rb renamed to elasticsearch-api/lib/elasticsearch/api/actions/query_rules/put_rule.rb

@@ -20,7 +20,7 @@
 #
 module Elasticsearch
   module API
-    module QueryRule
+    module QueryRules
       module Actions
         # Creates or updates a query rule within a ruleset.
         #
@@ -31,8 +31,8 @@ module Actions
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/put-query-rule.html
         #
-        def put(arguments = {})
-          request_opts = { endpoint: arguments[:endpoint] || 'query_rule.put' }
+        def put_rule(arguments = {})
+          request_opts = { endpoint: arguments[:endpoint] || 'query_rules.put_rule' }
 
           defined_params = %i[ruleset_id rule_id].each_with_object({}) do |variable, set_variables|
             set_variables[variable] = arguments[variable] if arguments.key?(variable)

elasticsearch-api/lib/elasticsearch/api/actions/query_ruleset/put.rb renamed to elasticsearch-api/lib/elasticsearch/api/actions/query_rules/put_ruleset.rb

@@ -20,7 +20,7 @@
 #
 module Elasticsearch
   module API
-    module QueryRuleset
+    module QueryRules
       module Actions
         # Creates or updates a query ruleset.
         #
@@ -30,8 +30,8 @@ module Actions
         #
         # @see https://www.elastic.co/guide/en/elasticsearch/reference/current/put-query-ruleset.html
         #
-        def put(arguments = {})
-          request_opts = { endpoint: arguments[:endpoint] || 'query_ruleset.put' }
+        def put_ruleset(arguments = {})
+          request_opts = { endpoint: arguments[:endpoint] || 'query_rules.put_ruleset' }
 
           defined_params = [:ruleset_id].each_with_object({}) do |variable, set_variables|
             set_variables[variable] = arguments[variable] if arguments.key?(variable)

elasticsearch-api/lib/elasticsearch/api/namespace/query_rule.rb renamed to elasticsearch-api/lib/elasticsearch/api/namespace/query_rules.rb

@@ -17,19 +17,19 @@
 
 module Elasticsearch
   module API
-    module QueryRule
+    module QueryRules
       module Actions; end
 
-      # Client for the "query_rule" namespace (includes the {QueryRule::Actions} methods)
+      # Client for the "query_rules" namespace (includes the {QueryRules::Actions} methods)
       #
-      class QueryRuleClient
-        include Common::Client, Common::Client::Base, QueryRule::Actions
+      class QueryRulesClient
+        include Common::Client, Common::Client::Base, QueryRules::Actions
       end
 
-      # Proxy method for {QueryRuleClient}, available in the receiving object
+      # Proxy method for {QueryRulesClient}, available in the receiving object
       #
-      def query_rule
-        @query_rule ||= QueryRuleClient.new(self)
+      def query_rules
+        @query_rules ||= QueryRulesClient.new(self)
       end
     end
   end

elasticsearch-api/spec/elasticsearch/api/actions/query_ruleset/delete_spec.rb renamed to elasticsearch-api/spec/elasticsearch/api/actions/query_rules/delete_ruleset_spec.rb

@@ -17,7 +17,7 @@
 
 require 'spec_helper'
 
-describe 'client.query_ruleset#delete' do
+describe 'client.query_rules#delete_ruleset' do
 
   let(:expected_args) do
     [
@@ -26,11 +26,11 @@
       {},
       nil,
       {},
-      { defined_params: { ruleset_id: 'foo' }, endpoint: 'query_ruleset.delete' }
+      { defined_params: { ruleset_id: 'foo' }, endpoint: 'query_rules.delete_ruleset' }
     ]
   end
 
   it 'performs the request' do
-    expect(client_double.query_ruleset.delete(ruleset_id: 'foo')).to be_a Elasticsearch::API::Response
+    expect(client_double.query_rules.delete_ruleset(ruleset_id: 'foo')).to be_a Elasticsearch::API::Response
   end
 end