ruby-esi 0.3.0 → 0.5.0

data/lib/ruby-esi/api/mail_api.rb

@@ -3,15 +3,12 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.3.8
+OpenAPI spec version: 1.17
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.13
-
+Swagger Codegen version: 3.0.42
 =end
 
-require 'uri'
-
 module ESI
   class MailApi
     attr_accessor :api_client
@@ -39,7 +36,7 @@ module ESI
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_characters_character_id_mail_labels_label_id_with_http_info(character_id, label_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.delete_characters_character_id_mail_labels_label_id ...'
@@ -48,10 +45,6 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.delete_characters_character_id_mail_labels_label_id"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.delete_characters_character_id_mail_labels_label_id, must be greater than or equal to 1.'
-      end
-
       # verify the required parameter 'label_id' is set
       if @api_client.config.client_side_validation && label_id.nil?
         fail ArgumentError, "Missing the required parameter 'label_id' when calling MailApi.delete_characters_character_id_mail_labels_label_id"
@@ -63,29 +56,32 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/labels/{label_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'label_id' + '}', label_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['evesso']
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#delete_characters_character_id_mail_labels_label_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -111,7 +107,7 @@ module ESI
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def delete_characters_character_id_mail_mail_id_with_http_info(character_id, mail_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.delete_characters_character_id_mail_mail_id ...'
@@ -120,10 +116,6 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.delete_characters_character_id_mail_mail_id"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.delete_characters_character_id_mail_mail_id, must be greater than or equal to 1.'
-      end
-
       # verify the required parameter 'mail_id' is set
       if @api_client.config.client_side_validation && mail_id.nil?
         fail ArgumentError, "Missing the required parameter 'mail_id' when calling MailApi.delete_characters_character_id_mail_mail_id"
@@ -135,29 +127,32 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'mail_id' + '}', mail_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['evesso']
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#delete_characters_character_id_mail_mail_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -187,7 +182,7 @@ module ESI
     # @option opts [Array<Integer>] :labels Fetch only mails that match one or more of the given labels
     # @option opts [Integer] :last_mail_id List only mail with an ID lower than the given ID, if present
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(Array<GetCharactersCharacterIdMail200Ok>, Fixnum, Hash)>] Array<GetCharactersCharacterIdMail200Ok> data, response status code and response headers
+    # @return [Array<(Array<GetCharactersCharacterIdMail200Ok>, Integer, Hash)>] Array<GetCharactersCharacterIdMail200Ok> data, response status code and response headers
     def get_characters_character_id_mail_with_http_info(character_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.get_characters_character_id_mail ...'
@@ -196,52 +191,42 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.get_characters_character_id_mail"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.get_characters_character_id_mail, must be greater than or equal to 1.'
-      end
-
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       end
-      if @api_client.config.client_side_validation && !opts[:'labels'].nil? && opts[:'labels'].length > 25
-        fail ArgumentError, 'invalid value for "opts[:"labels"]" when calling MailApi.get_characters_character_id_mail, number of items must be less than or equal to 25.'
-      end
-
-      if @api_client.config.client_side_validation && !opts[:'labels'].nil? && opts[:'labels'].length < 1
-        fail ArgumentError, 'invalid value for "opts[:"labels"]" when calling MailApi.get_characters_character_id_mail, number of items must be greater than or equal to 1.'
-      end
-
       # resource path
       local_var_path = '/characters/{character_id}/mail/'.sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'labels'] = @api_client.build_collection_param(opts[:'labels'], :csv) if !opts[:'labels'].nil?
       query_params[:'last_mail_id'] = opts[:'last_mail_id'] if !opts[:'last_mail_id'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['evesso']
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetCharactersCharacterIdMail200Ok>' 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetCharactersCharacterIdMail200Ok>')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#get_characters_character_id_mail\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -267,7 +252,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(GetCharactersCharacterIdMailLabelsOk, Fixnum, Hash)>] GetCharactersCharacterIdMailLabelsOk data, response status code and response headers
+    # @return [Array<(GetCharactersCharacterIdMailLabelsOk, Integer, Hash)>] GetCharactersCharacterIdMailLabelsOk data, response status code and response headers
     def get_characters_character_id_mail_labels_with_http_info(character_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.get_characters_character_id_mail_labels ...'
@@ -276,10 +261,6 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.get_characters_character_id_mail_labels"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.get_characters_character_id_mail_labels, must be greater than or equal to 1.'
-      end
-
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       end
@@ -287,31 +268,33 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/labels/'.sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['evesso']
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetCharactersCharacterIdMailLabelsOk' 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetCharactersCharacterIdMailLabelsOk')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#get_characters_character_id_mail_labels\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -337,7 +320,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(Array<GetCharactersCharacterIdMailLists200Ok>, Fixnum, Hash)>] Array<GetCharactersCharacterIdMailLists200Ok> data, response status code and response headers
+    # @return [Array<(Array<GetCharactersCharacterIdMailLists200Ok>, Integer, Hash)>] Array<GetCharactersCharacterIdMailLists200Ok> data, response status code and response headers
     def get_characters_character_id_mail_lists_with_http_info(character_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.get_characters_character_id_mail_lists ...'
@@ -346,10 +329,6 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.get_characters_character_id_mail_lists"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.get_characters_character_id_mail_lists, must be greater than or equal to 1.'
-      end
-
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       end
@@ -357,31 +336,33 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/lists/'.sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['evesso']
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'Array<GetCharactersCharacterIdMailLists200Ok>' 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Array<GetCharactersCharacterIdMailLists200Ok>')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#get_characters_character_id_mail_lists\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -409,7 +390,7 @@ module ESI
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(GetCharactersCharacterIdMailMailIdOk, Fixnum, Hash)>] GetCharactersCharacterIdMailMailIdOk data, response status code and response headers
+    # @return [Array<(GetCharactersCharacterIdMailMailIdOk, Integer, Hash)>] GetCharactersCharacterIdMailMailIdOk data, response status code and response headers
     def get_characters_character_id_mail_mail_id_with_http_info(character_id, mail_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.get_characters_character_id_mail_mail_id ...'
@@ -418,10 +399,6 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.get_characters_character_id_mail_mail_id"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.get_characters_character_id_mail_mail_id, must be greater than or equal to 1.'
-      end
-
       # verify the required parameter 'mail_id' is set
       if @api_client.config.client_side_validation && mail_id.nil?
         fail ArgumentError, "Missing the required parameter 'mail_id' when calling MailApi.get_characters_character_id_mail_mail_id"
@@ -433,31 +410,33 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'mail_id' + '}', mail_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = nil
-      auth_names = ['evesso']
+      post_body = opts[:body] 
+
+      return_type = opts[:return_type] || 'GetCharactersCharacterIdMailMailIdOk' 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:GET, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'GetCharactersCharacterIdMailMailIdOk')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#get_characters_character_id_mail_mail_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -465,41 +444,37 @@ module ESI
     end
     # Send a new mail
     # Create and send a new mail  --- Alternate route: `/dev/characters/{character_id}/mail/`  Alternate route: `/legacy/characters/{character_id}/mail/`  Alternate route: `/v1/characters/{character_id}/mail/` 
+    # @param body The mail to send
     # @param character_id An EVE character ID
-    # @param mail The mail to send
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
     # @option opts [String] :token Access token to use if unable to set a header
     # @return [Integer]
-    def post_characters_character_id_mail(character_id, mail, opts = {})
-      data, _status_code, _headers = post_characters_character_id_mail_with_http_info(character_id, mail, opts)
+    def post_characters_character_id_mail(body, character_id, opts = {})
+      data, _status_code, _headers = post_characters_character_id_mail_with_http_info(body, character_id, opts)
       data
     end
 
     # Send a new mail
     # Create and send a new mail  --- Alternate route: &#x60;/dev/characters/{character_id}/mail/&#x60;  Alternate route: &#x60;/legacy/characters/{character_id}/mail/&#x60;  Alternate route: &#x60;/v1/characters/{character_id}/mail/&#x60; 
+    # @param body The mail to send
     # @param character_id An EVE character ID
-    # @param mail The mail to send
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(Integer, Fixnum, Hash)>] Integer data, response status code and response headers
-    def post_characters_character_id_mail_with_http_info(character_id, mail, opts = {})
+    # @return [Array<(Integer, Integer, Hash)>] Integer data, response status code and response headers
+    def post_characters_character_id_mail_with_http_info(body, character_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.post_characters_character_id_mail ...'
       end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling MailApi.post_characters_character_id_mail"
+      end
       # verify the required parameter 'character_id' is set
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.post_characters_character_id_mail"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.post_characters_character_id_mail, must be greater than or equal to 1.'
-      end
-
-      # verify the required parameter 'mail' is set
-      if @api_client.config.client_side_validation && mail.nil?
-        fail ArgumentError, "Missing the required parameter 'mail' when calling MailApi.post_characters_character_id_mail"
-      end
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       end
@@ -507,30 +482,34 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/'.sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(mail)
-      auth_names = ['evesso']
+      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+
+      return_type = opts[:return_type] || 'Integer' 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Integer')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#post_characters_character_id_mail\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -538,41 +517,37 @@ module ESI
     end
     # Create a mail label
     # Create a mail label  --- Alternate route: `/dev/characters/{character_id}/mail/labels/`  Alternate route: `/legacy/characters/{character_id}/mail/labels/`  Alternate route: `/v2/characters/{character_id}/mail/labels/` 
+    # @param body Label to create
     # @param character_id An EVE character ID
-    # @param label Label to create
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
     # @option opts [String] :token Access token to use if unable to set a header
     # @return [Integer]
-    def post_characters_character_id_mail_labels(character_id, label, opts = {})
-      data, _status_code, _headers = post_characters_character_id_mail_labels_with_http_info(character_id, label, opts)
+    def post_characters_character_id_mail_labels(body, character_id, opts = {})
+      data, _status_code, _headers = post_characters_character_id_mail_labels_with_http_info(body, character_id, opts)
       data
     end
 
     # Create a mail label
     # Create a mail label  --- Alternate route: &#x60;/dev/characters/{character_id}/mail/labels/&#x60;  Alternate route: &#x60;/legacy/characters/{character_id}/mail/labels/&#x60;  Alternate route: &#x60;/v2/characters/{character_id}/mail/labels/&#x60; 
+    # @param body Label to create
     # @param character_id An EVE character ID
-    # @param label Label to create
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(Integer, Fixnum, Hash)>] Integer data, response status code and response headers
-    def post_characters_character_id_mail_labels_with_http_info(character_id, label, opts = {})
+    # @return [Array<(Integer, Integer, Hash)>] Integer data, response status code and response headers
+    def post_characters_character_id_mail_labels_with_http_info(body, character_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.post_characters_character_id_mail_labels ...'
       end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling MailApi.post_characters_character_id_mail_labels"
+      end
       # verify the required parameter 'character_id' is set
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.post_characters_character_id_mail_labels"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.post_characters_character_id_mail_labels, must be greater than or equal to 1.'
-      end
-
-      # verify the required parameter 'label' is set
-      if @api_client.config.client_side_validation && label.nil?
-        fail ArgumentError, "Missing the required parameter 'label' when calling MailApi.post_characters_character_id_mail_labels"
-      end
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
       end
@@ -580,30 +555,34 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/labels/'.sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(label)
-      auth_names = ['evesso']
+      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+
+      return_type = opts[:return_type] || 'Integer' 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:POST, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => 'Integer')
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#post_characters_character_id_mail_labels\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -611,43 +590,39 @@ module ESI
     end
     # Update metadata about a mail
     # Update metadata about a mail  --- Alternate route: `/dev/characters/{character_id}/mail/{mail_id}/`  Alternate route: `/legacy/characters/{character_id}/mail/{mail_id}/`  Alternate route: `/v1/characters/{character_id}/mail/{mail_id}/` 
+    # @param body Data used to update the mail
     # @param character_id An EVE character ID
-    # @param contents Data used to update the mail
     # @param mail_id An EVE mail ID
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
     # @option opts [String] :token Access token to use if unable to set a header
     # @return [nil]
-    def put_characters_character_id_mail_mail_id(character_id, contents, mail_id, opts = {})
-      put_characters_character_id_mail_mail_id_with_http_info(character_id, contents, mail_id, opts)
+    def put_characters_character_id_mail_mail_id(body, character_id, mail_id, opts = {})
+      put_characters_character_id_mail_mail_id_with_http_info(body, character_id, mail_id, opts)
       nil
     end
 
     # Update metadata about a mail
     # Update metadata about a mail  --- Alternate route: &#x60;/dev/characters/{character_id}/mail/{mail_id}/&#x60;  Alternate route: &#x60;/legacy/characters/{character_id}/mail/{mail_id}/&#x60;  Alternate route: &#x60;/v1/characters/{character_id}/mail/{mail_id}/&#x60; 
+    # @param body Data used to update the mail
     # @param character_id An EVE character ID
-    # @param contents Data used to update the mail
     # @param mail_id An EVE mail ID
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
     # @option opts [String] :token Access token to use if unable to set a header
-    # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
-    def put_characters_character_id_mail_mail_id_with_http_info(character_id, contents, mail_id, opts = {})
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
+    def put_characters_character_id_mail_mail_id_with_http_info(body, character_id, mail_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: MailApi.put_characters_character_id_mail_mail_id ...'
       end
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling MailApi.put_characters_character_id_mail_mail_id"
+      end
       # verify the required parameter 'character_id' is set
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling MailApi.put_characters_character_id_mail_mail_id"
       end
-      if @api_client.config.client_side_validation && character_id < 1
-        fail ArgumentError, 'invalid value for "character_id" when calling MailApi.put_characters_character_id_mail_mail_id, must be greater than or equal to 1.'
-      end
-
-      # verify the required parameter 'contents' is set
-      if @api_client.config.client_side_validation && contents.nil?
-        fail ArgumentError, "Missing the required parameter 'contents' when calling MailApi.put_characters_character_id_mail_mail_id"
-      end
       # verify the required parameter 'mail_id' is set
       if @api_client.config.client_side_validation && mail_id.nil?
         fail ArgumentError, "Missing the required parameter 'mail_id' when calling MailApi.put_characters_character_id_mail_mail_id"
@@ -659,29 +634,34 @@ module ESI
       local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'mail_id' + '}', mail_id.to_s)
 
       # query parameters
-      query_params = {}
+      query_params = opts[:query_params] || {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
 
       # header parameters
-      header_params = {}
+      header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
-      form_params = {}
+      form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(contents)
-      auth_names = ['evesso']
+      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+
+      return_type = opts[:return_type] 
+
+      auth_names = opts[:auth_names] || ['evesso']
       data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
-        :auth_names => auth_names)
+        :auth_names => auth_names,
+        :return_type => return_type)
+
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: MailApi#put_characters_character_id_mail_mail_id\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end