[API] Generator: Use full name for http methods and Utils so XPack can find them

Author: picandocodigo

elasticsearch-api/utils/thor/generate_source.rb

@@ -121,17 +121,17 @@ def __endpoint_parts
       def __http_method
         case @endpoint_name
         when 'index'
-          '_id ? HTTP_PUT : HTTP_POST'
+          '_id ? Elasticsearch::API::HTTP_PUT : Elasticsearch::API::HTTP_POST'
         when 'count'
           <<~SRC
             if arguments[:body]
-              HTTP_POST
+              Elasticsearch::API::HTTP_POST
             else
-              HTTP_GET
+              Elasticsearch::API::HTTP_GET
             end
           SRC
         else
-          "HTTP_#{@spec['url']['paths'].map { |a| a['methods'] }.flatten.first}"
+          "Elasticsearch::API::HTTP_#{@spec['url']['paths'].map { |a| a['methods'] }.flatten.first}"
         end
       end
 
@@ -161,7 +161,7 @@ def __http_path
 
       def __parse_path(path)
         path.gsub(/^\//, '')
-            .gsub('{', '#{Utils.__listify(_')
+            .gsub('{', '#{Elasticsearch::API::Utils.__listify(_')
             .gsub('}', ')}')
       end
 

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

@@ -25,7 +25,7 @@
   <%- end -%>
   <%= '  '*(@namespace_depth+4) %>path   = <%= @http_path %>
   <%- unless @params.empty? -%>
-    <%= '  '*(@namespace_depth+4) %>params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
+    <%= '  '*(@namespace_depth+4) %>params = Elasticsearch::API::Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
   <%- else -%>
     <%= '  '*(@namespace_depth+4) %>params = {}
   <%- end -%>

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

@@ -19,12 +19,12 @@ when 'mtermvectors'
   <%= ping_perform_request %>
 <%- else -%>
   <%- if needs_ignore_404?(@endpoint_name) %>
-    Utils.__rescue_from_not_found do
+    Elasticsearch::API::Utils.__rescue_from_not_found do
       perform_request(method, path, params, body).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).body }
+      Elasticsearch::API::Utils.__rescue_from_not_found { perform_request(method, path, params, body).body }
     else
       perform_request(method, path, params, body).body
     end