[API] Generator: Fix module definition in generated classes

Author: picandocodigo

elasticsearch-api/utils/thor/generate_source.rb

@@ -68,6 +68,7 @@ def generate
           @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)

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

@@ -3,9 +3,12 @@
 # See the LICENSE file in the project root for more information
 
 module Elasticsearch
+<%- if @xpack -%>
+  <%= '  '*(@namespace_depth) %>module XPack
+<%- end %>
 <%= '  '*(@namespace_depth) %>module API
 <%- @module_namespace.each_with_index do |name, i| -%>
-  <%= '  '*i %>module <%= name == 'xpack' ? 'XPack' : name.capitalize %>
+  <%= '  '*i %>module <%= name.capitalize %>
 <%- end -%>
 <%= '  '*(@namespace_depth+2) %>module Actions
 <%= ERB.new(File.new("./thor/templates/_documentation_top.erb").read, trim_mode: '-').result(binding) -%>