ruby-esi 0.1.0 → 0.2.0

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

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -25,9 +25,8 @@ module ESI
     # @param character_id 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] :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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [GetCharactersCharacterIdClonesOk]
     def get_characters_character_id_clones(character_id, opts = {})
       data, _status_code, _headers = get_characters_character_id_clones_with_http_info(character_id, opts)
@@ -39,9 +38,8 @@ module ESI
     # @param character_id 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] :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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(GetCharactersCharacterIdClonesOk, Fixnum, Hash)>] GetCharactersCharacterIdClonesOk data, response status code and response headers
     def get_characters_character_id_clones_with_http_info(character_id, opts = {})
       if @api_client.config.debugging
@@ -51,23 +49,28 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling ClonesApi.get_characters_character_id_clones"
       end
+      if @api_client.config.client_side_validation && character_id < 1
+        fail ArgumentError, 'invalid value for "character_id" when calling ClonesApi.get_characters_character_id_clones, must be greater than or equal to 1.'
+      end
+
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = "/v2/characters/{character_id}/clones/".sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = "/v3/characters/{character_id}/clones/".sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # 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 = {}
@@ -89,13 +92,12 @@ module ESI
     end
 
     # Get active implants
-    # Return implants on the active clone of a character  ---  This route is cached for up to 3600 seconds
+    # Return implants on the active clone of a character  ---  This route is cached for up to 300 seconds
     # @param character_id 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] :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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<Integer>]
     def get_characters_character_id_implants(character_id, opts = {})
       data, _status_code, _headers = get_characters_character_id_implants_with_http_info(character_id, opts)
@@ -103,13 +105,12 @@ module ESI
     end
 
     # Get active implants
-    # Return implants on the active clone of a character  ---  This route is cached for up to 3600 seconds
+    # Return implants on the active clone of a character  ---  This route is cached for up to 300 seconds
     # @param character_id 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] :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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
     def get_characters_character_id_implants_with_http_info(character_id, opts = {})
       if @api_client.config.debugging
@@ -119,6 +120,10 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling ClonesApi.get_characters_character_id_implants"
       end
+      if @api_client.config.client_side_validation && character_id < 1
+        fail ArgumentError, 'invalid value for "character_id" when calling ClonesApi.get_characters_character_id_implants, must be greater than or equal to 1.'
+      end
+
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
@@ -129,13 +134,14 @@ module ESI
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # 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 = {}

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

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.8.4
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.3.1
 
 =end
 
@@ -27,8 +27,6 @@ module ESI
     # @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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [nil]
     def delete_characters_character_id_contacts(character_id, contact_ids, opts = {})
       delete_characters_character_id_contacts_with_http_info(character_id, contact_ids, opts)
@@ -42,8 +40,6 @@ 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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
     def delete_characters_character_id_contacts_with_http_info(character_id, contact_ids, opts = {})
       if @api_client.config.debugging
@@ -53,33 +49,46 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling ContactsApi.delete_characters_character_id_contacts"
       end
+      if @api_client.config.client_side_validation && character_id < 1
+        fail ArgumentError, 'invalid value for "character_id" when calling ContactsApi.delete_characters_character_id_contacts, must be greater than or equal to 1.'
+      end
+
       # verify the required parameter 'contact_ids' is set
       if @api_client.config.client_side_validation && contact_ids.nil?
         fail ArgumentError, "Missing the required parameter 'contact_ids' when calling ContactsApi.delete_characters_character_id_contacts"
       end
+      if @api_client.config.client_side_validation && contact_ids.length > 20
+        fail ArgumentError, 'invalid value for "contact_ids" when calling ContactsApi.delete_characters_character_id_contacts, number of items must be less than or equal to 20.'
+      end
+
+      if @api_client.config.client_side_validation && contact_ids.length < 1
+        fail ArgumentError, 'invalid value for "contact_ids" when calling ContactsApi.delete_characters_character_id_contacts, number of items must be greater than or equal to 1.'
+      end
+
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
       # resource path
-      local_var_path = "/v1/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = "/v2/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
       query_params = {}
+      query_params[:'contact_ids'] = @api_client.build_collection_param(contact_ids, :csv)
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
       form_params = {}
 
       # http body (model)
-      post_body = @api_client.object_to_http_body(contact_ids)
+      post_body = nil
       auth_names = ['evesso']
       data, status_code, headers = @api_client.call_api(:DELETE, local_var_path,
         :header_params => header_params,
@@ -93,15 +102,163 @@ module ESI
       return data, status_code, headers
     end
 
+    # Get alliance contacts
+    # Return contacts of an alliance  ---  This route is cached for up to 300 seconds
+    # @param alliance_id An EVE alliance 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
+    # @option opts [Integer] :page Which page of results to return (default to 1)
+    # @option opts [String] :token Access token to use if unable to set a header
+    # @return [Array<GetAlliancesAllianceIdContacts200Ok>]
+    def get_alliances_alliance_id_contacts(alliance_id, opts = {})
+      data, _status_code, _headers = get_alliances_alliance_id_contacts_with_http_info(alliance_id, opts)
+      return data
+    end
+
+    # Get alliance contacts
+    # Return contacts of an alliance  ---  This route is cached for up to 300 seconds
+    # @param alliance_id An EVE alliance ID
+    # @param [Hash] opts the optional parameters
+    # @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 [Integer] :page Which page of results to return
+    # @option opts [String] :token Access token to use if unable to set a header
+    # @return [Array<(Array<GetAlliancesAllianceIdContacts200Ok>, Fixnum, Hash)>] Array<GetAlliancesAllianceIdContacts200Ok> data, response status code and response headers
+    def get_alliances_alliance_id_contacts_with_http_info(alliance_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: ContactsApi.get_alliances_alliance_id_contacts ..."
+      end
+      # verify the required parameter 'alliance_id' is set
+      if @api_client.config.client_side_validation && alliance_id.nil?
+        fail ArgumentError, "Missing the required parameter 'alliance_id' when calling ContactsApi.get_alliances_alliance_id_contacts"
+      end
+      if @api_client.config.client_side_validation && alliance_id < 1
+        fail ArgumentError, 'invalid value for "alliance_id" when calling ContactsApi.get_alliances_alliance_id_contacts, must be greater than or equal to 1.'
+      end
+
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
+      end
+      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling ContactsApi.get_alliances_alliance_id_contacts, must be greater than or equal to 1.'
+      end
+
+      # resource path
+      local_var_path = "/v2/alliances/{alliance_id}/contacts/".sub('{' + 'alliance_id' + '}', alliance_id.to_s)
+
+      # query parameters
+      query_params = {}
+      query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
+      query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
+
+      # header parameters
+      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 = {}
+
+      # http body (model)
+      post_body = nil
+      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<GetAlliancesAllianceIdContacts200Ok>')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: ContactsApi#get_alliances_alliance_id_contacts\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Get alliance contact labels
+    # Return custom labels for an alliance's contacts  ---  This route is cached for up to 300 seconds
+    # @param alliance_id An EVE alliance 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] :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<GetAlliancesAllianceIdContactsLabels200Ok>]
+    def get_alliances_alliance_id_contacts_labels(alliance_id, opts = {})
+      data, _status_code, _headers = get_alliances_alliance_id_contacts_labels_with_http_info(alliance_id, opts)
+      return data
+    end
+
+    # Get alliance contact labels
+    # Return custom labels for an alliance&#39;s contacts  ---  This route is cached for up to 300 seconds
+    # @param alliance_id An EVE alliance ID
+    # @param [Hash] opts the optional parameters
+    # @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<GetAlliancesAllianceIdContactsLabels200Ok>, Fixnum, Hash)>] Array<GetAlliancesAllianceIdContactsLabels200Ok> data, response status code and response headers
+    def get_alliances_alliance_id_contacts_labels_with_http_info(alliance_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: ContactsApi.get_alliances_alliance_id_contacts_labels ..."
+      end
+      # verify the required parameter 'alliance_id' is set
+      if @api_client.config.client_side_validation && alliance_id.nil?
+        fail ArgumentError, "Missing the required parameter 'alliance_id' when calling ContactsApi.get_alliances_alliance_id_contacts_labels"
+      end
+      if @api_client.config.client_side_validation && alliance_id < 1
+        fail ArgumentError, 'invalid value for "alliance_id" when calling ContactsApi.get_alliances_alliance_id_contacts_labels, must be greater than or equal to 1.'
+      end
+
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
+      end
+      # resource path
+      local_var_path = "/v1/alliances/{alliance_id}/contacts/labels/".sub('{' + 'alliance_id' + '}', alliance_id.to_s)
+
+      # query parameters
+      query_params = {}
+      query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
+
+      # header parameters
+      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 = {}
+
+      # http body (model)
+      post_body = nil
+      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<GetAlliancesAllianceIdContactsLabels200Ok>')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: ContactsApi#get_alliances_alliance_id_contacts_labels\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get contacts
     # Return contacts of a character  ---  This route is cached for up to 300 seconds
     # @param character_id 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :page Which page of results to return (default to 1)
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetCharactersCharacterIdContacts200Ok>]
     def get_characters_character_id_contacts(character_id, opts = {})
       data, _status_code, _headers = get_characters_character_id_contacts_with_http_info(character_id, opts)
@@ -113,10 +270,9 @@ module ESI
     # @param character_id 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :page Which page of results to return
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetCharactersCharacterIdContacts200Ok>, Fixnum, Hash)>] Array<GetCharactersCharacterIdContacts200Ok> data, response status code and response headers
     def get_characters_character_id_contacts_with_http_info(character_id, opts = {})
       if @api_client.config.debugging
@@ -126,24 +282,33 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling ContactsApi.get_characters_character_id_contacts"
       end
+      if @api_client.config.client_side_validation && character_id < 1
+        fail ArgumentError, 'invalid value for "character_id" when calling ContactsApi.get_characters_character_id_contacts, must be greater than or equal to 1.'
+      end
+
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
+      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling ContactsApi.get_characters_character_id_contacts, must be greater than or equal to 1.'
+      end
+
       # resource path
-      local_var_path = "/v1/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = "/v2/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # 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 = {}
@@ -165,13 +330,12 @@ module ESI
     end
 
     # Get contact labels
-    # Return custom labels for contacts the character defined  ---  This route is cached for up to 300 seconds
+    # Return custom labels for a character's contacts  ---  This route is cached for up to 300 seconds
     # @param character_id 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] :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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetCharactersCharacterIdContactsLabels200Ok>]
     def get_characters_character_id_contacts_labels(character_id, opts = {})
       data, _status_code, _headers = get_characters_character_id_contacts_labels_with_http_info(character_id, opts)
@@ -179,13 +343,12 @@ module ESI
     end
 
     # Get contact labels
-    # Return custom labels for contacts the character defined  ---  This route is cached for up to 300 seconds
+    # Return custom labels for a character&#39;s contacts  ---  This route is cached for up to 300 seconds
     # @param character_id 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] :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
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetCharactersCharacterIdContactsLabels200Ok>, Fixnum, Hash)>] Array<GetCharactersCharacterIdContactsLabels200Ok> data, response status code and response headers
     def get_characters_character_id_contacts_labels_with_http_info(character_id, opts = {})
       if @api_client.config.debugging
@@ -195,6 +358,10 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling ContactsApi.get_characters_character_id_contacts_labels"
       end
+      if @api_client.config.client_side_validation && character_id < 1
+        fail ArgumentError, 'invalid value for "character_id" when calling ContactsApi.get_characters_character_id_contacts_labels, must be greater than or equal to 1.'
+      end
+
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
@@ -205,13 +372,14 @@ module ESI
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # 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 = {}
@@ -237,10 +405,9 @@ module ESI
     # @param corporation_id An EVE corporation 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] :if_none_match ETag from a previous request. A 304 will be returned if this matches the current ETag
     # @option opts [Integer] :page Which page of results to return (default to 1)
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<GetCorporationsCorporationIdContacts200Ok>]
     def get_corporations_corporation_id_contacts(corporation_id, opts = {})
       data, _status_code, _headers = get_corporations_corporation_id_contacts_with_http_info(corporation_id, opts)
@@ -252,10 +419,9 @@ module ESI
     # @param corporation_id An EVE corporation ID
     # @param [Hash] opts the optional parameters
     # @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 [Integer] :page Which page of results to return
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(Array<GetCorporationsCorporationIdContacts200Ok>, Fixnum, Hash)>] Array<GetCorporationsCorporationIdContacts200Ok> data, response status code and response headers
     def get_corporations_corporation_id_contacts_with_http_info(corporation_id, opts = {})
       if @api_client.config.debugging
@@ -265,24 +431,33 @@ module ESI
       if @api_client.config.client_side_validation && corporation_id.nil?
         fail ArgumentError, "Missing the required parameter 'corporation_id' when calling ContactsApi.get_corporations_corporation_id_contacts"
       end
+      if @api_client.config.client_side_validation && corporation_id < 1
+        fail ArgumentError, 'invalid value for "corporation_id" when calling ContactsApi.get_corporations_corporation_id_contacts, must be greater than or equal to 1.'
+      end
+
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
+      if @api_client.config.client_side_validation && !opts[:'page'].nil? && opts[:'page'] < 1
+        fail ArgumentError, 'invalid value for "opts[:"page"]" when calling ContactsApi.get_corporations_corporation_id_contacts, must be greater than or equal to 1.'
+      end
+
       # resource path
-      local_var_path = "/v1/corporations/{corporation_id}/contacts/".sub('{' + 'corporation_id' + '}', corporation_id.to_s)
+      local_var_path = "/v2/corporations/{corporation_id}/contacts/".sub('{' + 'corporation_id' + '}', corporation_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # 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 = {}
@@ -303,18 +478,87 @@ module ESI
       return data, status_code, headers
     end
 
+    # Get corporation contact labels
+    # Return custom labels for a corporation's contacts  ---  This route is cached for up to 300 seconds
+    # @param corporation_id An EVE corporation 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] :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<GetCorporationsCorporationIdContactsLabels200Ok>]
+    def get_corporations_corporation_id_contacts_labels(corporation_id, opts = {})
+      data, _status_code, _headers = get_corporations_corporation_id_contacts_labels_with_http_info(corporation_id, opts)
+      return data
+    end
+
+    # Get corporation contact labels
+    # Return custom labels for a corporation&#39;s contacts  ---  This route is cached for up to 300 seconds
+    # @param corporation_id An EVE corporation ID
+    # @param [Hash] opts the optional parameters
+    # @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<GetCorporationsCorporationIdContactsLabels200Ok>, Fixnum, Hash)>] Array<GetCorporationsCorporationIdContactsLabels200Ok> data, response status code and response headers
+    def get_corporations_corporation_id_contacts_labels_with_http_info(corporation_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "Calling API: ContactsApi.get_corporations_corporation_id_contacts_labels ..."
+      end
+      # verify the required parameter 'corporation_id' is set
+      if @api_client.config.client_side_validation && corporation_id.nil?
+        fail ArgumentError, "Missing the required parameter 'corporation_id' when calling ContactsApi.get_corporations_corporation_id_contacts_labels"
+      end
+      if @api_client.config.client_side_validation && corporation_id < 1
+        fail ArgumentError, 'invalid value for "corporation_id" when calling ContactsApi.get_corporations_corporation_id_contacts_labels, must be greater than or equal to 1.'
+      end
+
+      if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
+        fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
+      end
+      # resource path
+      local_var_path = "/v1/corporations/{corporation_id}/contacts/labels/".sub('{' + 'corporation_id' + '}', corporation_id.to_s)
+
+      # query parameters
+      query_params = {}
+      query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
+      query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
+
+      # header parameters
+      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 = {}
+
+      # http body (model)
+      post_body = nil
+      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<GetCorporationsCorporationIdContactsLabels200Ok>')
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: ContactsApi#get_corporations_corporation_id_contacts_labels\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Add contacts
     # Bulk add contacts with same settings  --- 
     # @param character_id An EVE character ID
-    # @param contact_ids A list of contacts to add
-    # @param standing Standing for the new contact
+    # @param contact_ids A list of contacts
+    # @param standing Standing for the contact
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [Integer] :label_id Add a custom label to the new contact (default to 0)
+    # @option opts [Array<Integer>] :label_ids Add custom labels to the new contact
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [BOOLEAN] :watched Whether the new contact should be watched, note this is only effective on characters (default to false)
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
+    # @option opts [BOOLEAN] :watched Whether the contact should be watched, note this is only effective on characters (default to false)
     # @return [Array<Integer>]
     def post_characters_character_id_contacts(character_id, contact_ids, standing, opts = {})
       data, _status_code, _headers = post_characters_character_id_contacts_with_http_info(character_id, contact_ids, standing, opts)
@@ -324,15 +568,13 @@ module ESI
     # Add contacts
     # Bulk add contacts with same settings  --- 
     # @param character_id An EVE character ID
-    # @param contact_ids A list of contacts to add
-    # @param standing Standing for the new contact
+    # @param contact_ids A list of contacts
+    # @param standing Standing for the contact
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @option opts [Integer] :label_id Add a custom label to the new contact
+    # @option opts [Array<Integer>] :label_ids Add custom labels to the new contact
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
-    # @option opts [BOOLEAN] :watched Whether the new contact should be watched, note this is only effective on characters
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
+    # @option opts [BOOLEAN] :watched Whether the contact should be watched, note this is only effective on characters
     # @return [Array<(Array<Integer>, Fixnum, Hash)>] Array<Integer> data, response status code and response headers
     def post_characters_character_id_contacts_with_http_info(character_id, contact_ids, standing, opts = {})
       if @api_client.config.debugging
@@ -342,6 +584,10 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling ContactsApi.post_characters_character_id_contacts"
       end
+      if @api_client.config.client_side_validation && character_id < 1
+        fail ArgumentError, 'invalid value for "character_id" when calling ContactsApi.post_characters_character_id_contacts, must be greater than or equal to 1.'
+      end
+
       # verify the required parameter 'contact_ids' is set
       if @api_client.config.client_side_validation && contact_ids.nil?
         fail ArgumentError, "Missing the required parameter 'contact_ids' when calling ContactsApi.post_characters_character_id_contacts"
@@ -361,23 +607,27 @@ module ESI
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
+      if @api_client.config.client_side_validation && !opts[:'label_ids'].nil? && opts[:'label_ids'].length > 63
+        fail ArgumentError, 'invalid value for "opts[:"label_ids"]" when calling ContactsApi.post_characters_character_id_contacts, number of items must be less than or equal to 63.'
+      end
+
       # resource path
-      local_var_path = "/v1/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = "/v2/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'standing'] = standing
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
-      query_params[:'label_id'] = opts[:'label_id'] if !opts[:'label_id'].nil?
+      query_params[:'label_ids'] = @api_client.build_collection_param(opts[:'label_ids'], :csv) if !opts[:'label_ids'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
       query_params[:'watched'] = opts[:'watched'] if !opts[:'watched'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
       form_params = {}
@@ -401,15 +651,13 @@ module ESI
     # Edit contacts
     # Bulk edit contacts with same settings  --- 
     # @param character_id An EVE character ID
-    # @param contact_ids A list of contacts to edit
+    # @param contact_ids A list of contacts
     # @param standing Standing for the contact
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from (default to tranquility)
-    # @option opts [Integer] :label_id Add a custom label to the contact, use 0 for clearing label (default to 0)
+    # @option opts [Array<Integer>] :label_ids Add custom labels to the contact
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
     # @option opts [BOOLEAN] :watched Whether the contact should be watched, note this is only effective on characters (default to false)
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [nil]
     def put_characters_character_id_contacts(character_id, contact_ids, standing, opts = {})
       put_characters_character_id_contacts_with_http_info(character_id, contact_ids, standing, opts)
@@ -419,15 +667,13 @@ module ESI
     # Edit contacts
     # Bulk edit contacts with same settings  --- 
     # @param character_id An EVE character ID
-    # @param contact_ids A list of contacts to edit
+    # @param contact_ids A list of contacts
     # @param standing Standing for the contact
     # @param [Hash] opts the optional parameters
     # @option opts [String] :datasource The server name you would like data from
-    # @option opts [Integer] :label_id Add a custom label to the contact, use 0 for clearing label
+    # @option opts [Array<Integer>] :label_ids Add custom labels to the contact
     # @option opts [String] :token Access token to use if unable to set a header
-    # @option opts [String] :user_agent Client identifier, takes precedence over headers
     # @option opts [BOOLEAN] :watched Whether the contact should be watched, note this is only effective on characters
-    # @option opts [String] :x_user_agent Client identifier, takes precedence over User-Agent
     # @return [Array<(nil, Fixnum, Hash)>] nil, response status code and response headers
     def put_characters_character_id_contacts_with_http_info(character_id, contact_ids, standing, opts = {})
       if @api_client.config.debugging
@@ -437,6 +683,10 @@ module ESI
       if @api_client.config.client_side_validation && character_id.nil?
         fail ArgumentError, "Missing the required parameter 'character_id' when calling ContactsApi.put_characters_character_id_contacts"
       end
+      if @api_client.config.client_side_validation && character_id < 1
+        fail ArgumentError, 'invalid value for "character_id" when calling ContactsApi.put_characters_character_id_contacts, must be greater than or equal to 1.'
+      end
+
       # verify the required parameter 'contact_ids' is set
       if @api_client.config.client_side_validation && contact_ids.nil?
         fail ArgumentError, "Missing the required parameter 'contact_ids' when calling ContactsApi.put_characters_character_id_contacts"
@@ -456,23 +706,27 @@ module ESI
       if @api_client.config.client_side_validation && opts[:'datasource'] && !['tranquility', 'singularity'].include?(opts[:'datasource'])
         fail ArgumentError, 'invalid value for "datasource", must be one of tranquility, singularity'
       end
+      if @api_client.config.client_side_validation && !opts[:'label_ids'].nil? && opts[:'label_ids'].length > 63
+        fail ArgumentError, 'invalid value for "opts[:"label_ids"]" when calling ContactsApi.put_characters_character_id_contacts, number of items must be less than or equal to 63.'
+      end
+
       # resource path
-      local_var_path = "/v1/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
+      local_var_path = "/v2/characters/{character_id}/contacts/".sub('{' + 'character_id' + '}', character_id.to_s)
 
       # query parameters
       query_params = {}
       query_params[:'standing'] = standing
       query_params[:'datasource'] = opts[:'datasource'] if !opts[:'datasource'].nil?
-      query_params[:'label_id'] = opts[:'label_id'] if !opts[:'label_id'].nil?
+      query_params[:'label_ids'] = @api_client.build_collection_param(opts[:'label_ids'], :csv) if !opts[:'label_ids'].nil?
       query_params[:'token'] = opts[:'token'] if !opts[:'token'].nil?
-      query_params[:'user_agent'] = opts[:'user_agent'] if !opts[:'user_agent'].nil?
       query_params[:'watched'] = opts[:'watched'] if !opts[:'watched'].nil?
 
       # header parameters
       header_params = {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'X-User-Agent'] = opts[:'x_user_agent'] if !opts[:'x_user_agent'].nil?
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
       form_params = {}