ruby-esi 0.5.1 → 0.6.0

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

@@ -3,12 +3,15 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 1.17
+The version of the OpenAPI document: 1.33
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.13.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.42
 =end
 
+require 'cgi'
+
 module ESI
   class MailApi
     attr_accessor :api_client
@@ -18,10 +21,10 @@ module ESI
     end
     # Delete a mail label
     # Delete a mail label  --- Alternate route: `/dev/characters/{character_id}/mail/labels/{label_id}/`  Alternate route: `/legacy/characters/{character_id}/mail/labels/{label_id}/`  Alternate route: `/v1/characters/{character_id}/mail/labels/{label_id}/` 
-    # @param character_id An EVE character ID
-    # @param label_id An EVE label id
+    # @param character_id [Integer] An EVE character ID
+    # @param label_id [Integer] An EVE label 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] :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 delete_characters_character_id_mail_labels_label_id(character_id, label_id, opts = {})
@@ -31,10 +34,10 @@ module ESI
 
     # Delete a mail label
     # Delete a mail label  --- Alternate route: `/dev/characters/{character_id}/mail/labels/{label_id}/`  Alternate route: `/legacy/characters/{character_id}/mail/labels/{label_id}/`  Alternate route: `/v1/characters/{character_id}/mail/labels/{label_id}/` 
-    # @param character_id An EVE character ID
-    # @param label_id An EVE label id
+    # @param character_id [Integer] An EVE character ID
+    # @param label_id [Integer] An EVE label id
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @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 [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 = {})
@@ -45,15 +48,20 @@ 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"
       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'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/labels/{label_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'label_id' + '}', label_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/labels/{label_id}/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s)).sub('{' + 'label_id' + '}', CGI.escape(label_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -63,36 +71,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] 
+      # return_type
+      return_type = opts[:debug_return_type]
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
+
+      new_options = opts.merge(
+        :operation => :"MailApi.delete_characters_character_id_mail_labels_label_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
       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
       return data, status_code, headers
     end
+
     # Delete a mail
     # Delete 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 character_id An EVE character ID
-    # @param mail_id An EVE mail ID
+    # @param character_id [Integer] An EVE character ID
+    # @param mail_id [Integer] 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] :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 delete_characters_character_id_mail_mail_id(character_id, mail_id, opts = {})
@@ -102,10 +117,10 @@ module ESI
 
     # Delete a mail
     # Delete 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 character_id An EVE character ID
-    # @param mail_id An EVE mail ID
+    # @param character_id [Integer] An EVE character ID
+    # @param mail_id [Integer] 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] :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 [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 = {})
@@ -116,15 +131,20 @@ 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"
       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'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'mail_id' + '}', mail_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s)).sub('{' + 'mail_id' + '}', CGI.escape(mail_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -134,35 +154,42 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type]
 
-      return_type = opts[:return_type] 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
+      new_options = opts.merge(
+        :operation => :"MailApi.delete_characters_character_id_mail_mail_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
       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
       return data, status_code, headers
     end
+
     # Return mail headers
     # Return the 50 most recent mail headers belonging to the character that match the query criteria. Queries can be filtered by label, and last_mail_id can be used to paginate backwards  --- Alternate route: `/dev/characters/{character_id}/mail/`  Alternate route: `/legacy/characters/{character_id}/mail/`  Alternate route: `/v1/characters/{character_id}/mail/`  --- This route is cached for up to 30 seconds
-    # @param character_id An EVE character ID
+    # @param character_id [Integer] An EVE character 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] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @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
@@ -175,9 +202,9 @@ module ESI
 
     # Return mail headers
     # Return the 50 most recent mail headers belonging to the character that match the query criteria. Queries can be filtered by label, and last_mail_id can be used to paginate backwards  --- 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;  --- This route is cached for up to 30 seconds
-    # @param character_id An EVE character ID
+    # @param character_id [Integer] An EVE character ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @option opts [String] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @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
@@ -191,11 +218,24 @@ 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 && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      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
+
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
+      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)
+      local_var_path = '/characters/{character_id}/mail/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -207,36 +247,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
-      return_type = opts[:return_type] || 'Array<GetCharactersCharacterIdMail200Ok>' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetCharactersCharacterIdMail200Ok>'
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
+
+      new_options = opts.merge(
+        :operation => :"MailApi.get_characters_character_id_mail",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       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
       return data, status_code, headers
     end
+
     # Get mail labels and unread counts
     # Return a list of the users mail labels, unread counts for each label and a total unread count.  --- Alternate route: `/dev/characters/{character_id}/mail/labels/`  Alternate route: `/v3/characters/{character_id}/mail/labels/`  --- This route is cached for up to 30 seconds
-    # @param character_id An EVE character ID
+    # @param character_id [Integer] An EVE character 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] :datasource The server name you would like data from (default to 'tranquility')
     # @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 [GetCharactersCharacterIdMailLabelsOk]
@@ -247,9 +294,9 @@ module ESI
 
     # Get mail labels and unread counts
     # Return a list of the users mail labels, unread counts for each label and a total unread count.  --- Alternate route: &#x60;/dev/characters/{character_id}/mail/labels/&#x60;  Alternate route: &#x60;/v3/characters/{character_id}/mail/labels/&#x60;  --- This route is cached for up to 30 seconds
-    # @param character_id An EVE character ID
+    # @param character_id [Integer] An EVE character ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @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, Integer, Hash)>] GetCharactersCharacterIdMailLabelsOk data, response status code and response headers
@@ -261,11 +308,16 @@ 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 && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      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
+
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/labels/'.sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/labels/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -275,36 +327,43 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetCharactersCharacterIdMailLabelsOk'
 
-      return_type = opts[:return_type] || 'GetCharactersCharacterIdMailLabelsOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"MailApi.get_characters_character_id_mail_labels",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       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
       return data, status_code, headers
     end
+
     # Return mailing list subscriptions
     # Return all mailing lists that the character is subscribed to  --- Alternate route: `/dev/characters/{character_id}/mail/lists/`  Alternate route: `/legacy/characters/{character_id}/mail/lists/`  Alternate route: `/v1/characters/{character_id}/mail/lists/`  --- This route is cached for up to 120 seconds
-    # @param character_id An EVE character ID
+    # @param character_id [Integer] An EVE character 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] :datasource The server name you would like data from (default to 'tranquility')
     # @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<GetCharactersCharacterIdMailLists200Ok>]
@@ -315,9 +374,9 @@ module ESI
 
     # Return mailing list subscriptions
     # Return all mailing lists that the character is subscribed to  --- Alternate route: &#x60;/dev/characters/{character_id}/mail/lists/&#x60;  Alternate route: &#x60;/legacy/characters/{character_id}/mail/lists/&#x60;  Alternate route: &#x60;/v1/characters/{character_id}/mail/lists/&#x60;  --- This route is cached for up to 120 seconds
-    # @param character_id An EVE character ID
+    # @param character_id [Integer] An EVE character ID
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @option opts [String] :datasource The server name you would like data from (default to 'tranquility')
     # @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>, Integer, Hash)>] Array<GetCharactersCharacterIdMailLists200Ok> data, response status code and response headers
@@ -329,11 +388,16 @@ 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 && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      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
+
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/lists/'.sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/lists/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -343,37 +407,44 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Array<GetCharactersCharacterIdMailLists200Ok>'
 
-      return_type = opts[:return_type] || 'Array<GetCharactersCharacterIdMailLists200Ok>' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"MailApi.get_characters_character_id_mail_lists",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       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
       return data, status_code, headers
     end
+
     # Return a mail
     # Return the contents of an EVE 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}/`  --- This route is cached for up to 30 seconds
-    # @param character_id An EVE character ID
-    # @param mail_id An EVE mail ID
+    # @param character_id [Integer] An EVE character ID
+    # @param mail_id [Integer] 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] :datasource The server name you would like data from (default to 'tranquility')
     # @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 [GetCharactersCharacterIdMailMailIdOk]
@@ -384,10 +455,10 @@ module ESI
 
     # Return a mail
     # Return the contents of an EVE 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;  --- This route is cached for up to 30 seconds
-    # @param character_id An EVE character ID
-    # @param mail_id An EVE mail ID
+    # @param character_id [Integer] An EVE character ID
+    # @param mail_id [Integer] 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] :datasource The server name you would like data from (default to 'tranquility')
     # @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, Integer, Hash)>] GetCharactersCharacterIdMailMailIdOk data, response status code and response headers
@@ -399,15 +470,20 @@ 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"
       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'
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'mail_id' + '}', mail_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s)).sub('{' + 'mail_id' + '}', CGI.escape(mail_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -417,69 +493,81 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       header_params[:'If-None-Match'] = opts[:'if_none_match'] if !opts[:'if_none_match'].nil?
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'GetCharactersCharacterIdMailMailIdOk'
 
-      return_type = opts[:return_type] || 'GetCharactersCharacterIdMailMailIdOk' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path,
+      new_options = opts.merge(
+        :operation => :"MailApi.get_characters_character_id_mail_mail_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
       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
       return data, status_code, headers
     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 character_id [Integer] An EVE character ID
+    # @param mail [PostCharactersCharacterIdMailMail] 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] :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(body, character_id, opts = {})
-      data, _status_code, _headers = post_characters_character_id_mail_with_http_info(body, character_id, opts)
+    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)
       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 character_id [Integer] An EVE character ID
+    # @param mail [PostCharactersCharacterIdMailMail] 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] :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 [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 = {})
+    def post_characters_character_id_mail_with_http_info(character_id, mail, 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 && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      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
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/'.sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -489,70 +577,85 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(mail)
 
-      return_type = opts[:return_type] || 'Integer' 
+      # return_type
+      return_type = opts[:debug_return_type] || 'Integer'
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
+
+      new_options = opts.merge(
+        :operation => :"MailApi.post_characters_character_id_mail",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       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
       return data, status_code, headers
     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 character_id [Integer] An EVE character ID
+    # @param label [PostCharactersCharacterIdMailLabelsLabel] 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] :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(body, character_id, opts = {})
-      data, _status_code, _headers = post_characters_character_id_mail_labels_with_http_info(body, character_id, opts)
+    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)
       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 character_id [Integer] An EVE character ID
+    # @param label [PostCharactersCharacterIdMailLabelsLabel] Label to create
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @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 [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 = {})
+    def post_characters_character_id_mail_labels_with_http_info(character_id, label, 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 && opts[:'datasource'] && !['tranquility'].include?(opts[:'datasource'])
-        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility'
+      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
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/labels/'.sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/labels/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -562,76 +665,91 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(label)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Integer'
 
-      return_type = opts[:return_type] || 'Integer' 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path,
+      new_options = opts.merge(
+        :operation => :"MailApi.post_characters_character_id_mail_labels",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       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
       return data, status_code, headers
     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 mail_id An EVE mail ID
+    # @param character_id [Integer] An EVE character ID
+    # @param mail_id [Integer] An EVE mail ID
+    # @param contents [PutCharactersCharacterIdMailMailIdContents] Data used to update the mail
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from (default to tranquility)
+    # @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(body, character_id, mail_id, opts = {})
-      put_characters_character_id_mail_mail_id_with_http_info(body, character_id, mail_id, opts)
+    def put_characters_character_id_mail_mail_id(character_id, mail_id, contents, opts = {})
+      put_characters_character_id_mail_mail_id_with_http_info(character_id, mail_id, contents, 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 mail_id An EVE mail ID
+    # @param character_id [Integer] An EVE character ID
+    # @param mail_id [Integer] An EVE mail ID
+    # @param contents [PutCharactersCharacterIdMailMailIdContents] Data used to update the mail
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :datasource The server name you would like data from
+    # @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 [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 = {})
+    def put_characters_character_id_mail_mail_id_with_http_info(character_id, mail_id, contents, 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 '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"
       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'
+      # 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
+      allowable_values = ["tranquility"]
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !allowable_values.include?(opts[:'datasource'])
+        fail ArgumentError, "invalid value for \"datasource\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', character_id.to_s).sub('{' + 'mail_id' + '}', mail_id.to_s)
+      local_var_path = '/characters/{character_id}/mail/{mail_id}/'.sub('{' + 'character_id' + '}', CGI.escape(character_id.to_s)).sub('{' + 'mail_id' + '}', CGI.escape(mail_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -641,27 +759,36 @@ module ESI
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+      content_type = @api_client.select_header_content_type(['application/json'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(body) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(contents)
+
+      # return_type
+      return_type = opts[:debug_return_type]
 
-      return_type = opts[:return_type] 
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['evesso']
 
-      auth_names = opts[:auth_names] || ['evesso']
-      data, status_code, headers = @api_client.call_api(:PUT, local_var_path,
+      new_options = opts.merge(
+        :operation => :"MailApi.put_characters_character_id_mail_mail_id",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
         :body => post_body,
         :auth_names => auth_names,
-        :return_type => return_type)
+        :return_type => return_type
+      )
 
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, new_options)
       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