esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_universe_stars_star_id_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -15,30 +15,30 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetUniverseStarsStarIdOk
+    # name string
+    attr_accessor :name
+
+    # solar_system_id integer
+    attr_accessor :solar_system_id
+
+    # type_id integer
+    attr_accessor :type_id
+
     # Age of star in years
     attr_accessor :age
 
     # luminosity number
     attr_accessor :luminosity
 
-    # name string
-    attr_accessor :name
-
     # radius integer
     attr_accessor :radius
 
-    # solar_system_id integer
-    attr_accessor :solar_system_id
-
     # spectral_class string
     attr_accessor :spectral_class
 
     # temperature integer
     attr_accessor :temperature
 
-    # type_id integer
-    attr_accessor :type_id
-
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -64,28 +64,28 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'name' => :'name',
+        :'solar_system_id' => :'solar_system_id',
+        :'type_id' => :'type_id',
         :'age' => :'age',
         :'luminosity' => :'luminosity',
-        :'name' => :'name',
         :'radius' => :'radius',
-        :'solar_system_id' => :'solar_system_id',
         :'spectral_class' => :'spectral_class',
-        :'temperature' => :'temperature',
-        :'type_id' => :'type_id'
+        :'temperature' => :'temperature'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
+        :'name' => :'String',
+        :'solar_system_id' => :'Integer',
+        :'type_id' => :'Integer',
         :'age' => :'Integer',
         :'luminosity' => :'Float',
-        :'name' => :'String',
         :'radius' => :'Integer',
-        :'solar_system_id' => :'Integer',
         :'spectral_class' => :'String',
-        :'temperature' => :'Integer',
-        :'type_id' => :'Integer'
+        :'temperature' => :'Integer'
       }
     end
 
@@ -95,7 +95,19 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      if attributes.has_key?(:'name')
+        self.name = attributes[:'name']
+      end
+
+      if attributes.has_key?(:'solar_system_id')
+        self.solar_system_id = attributes[:'solar_system_id']
+      end
+
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
+      end
 
       if attributes.has_key?(:'age')
         self.age = attributes[:'age']
@@ -105,18 +117,10 @@ module ESIClient
         self.luminosity = attributes[:'luminosity']
       end
 
-      if attributes.has_key?(:'name')
-        self.name = attributes[:'name']
-      end
-
       if attributes.has_key?(:'radius')
         self.radius = attributes[:'radius']
       end
 
-      if attributes.has_key?(:'solar_system_id')
-        self.solar_system_id = attributes[:'solar_system_id']
-      end
-
       if attributes.has_key?(:'spectral_class')
         self.spectral_class = attributes[:'spectral_class']
       end
@@ -124,74 +128,69 @@ module ESIClient
       if attributes.has_key?(:'temperature')
         self.temperature = attributes[:'temperature']
       end
-
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
-      end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @age.nil?
-        invalid_properties.push("invalid value for 'age', age cannot be nil.")
+      if @name.nil?
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
-      if @luminosity.nil?
-        invalid_properties.push("invalid value for 'luminosity', luminosity cannot be nil.")
+      if @solar_system_id.nil?
+        invalid_properties.push('invalid value for "solar_system_id", solar_system_id cannot be nil.')
       end
 
-      if @name.nil?
-        invalid_properties.push("invalid value for 'name', name cannot be nil.")
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
       end
 
-      if @radius.nil?
-        invalid_properties.push("invalid value for 'radius', radius cannot be nil.")
+      if @age.nil?
+        invalid_properties.push('invalid value for "age", age cannot be nil.')
       end
 
-      if @solar_system_id.nil?
-        invalid_properties.push("invalid value for 'solar_system_id', solar_system_id cannot be nil.")
+      if @luminosity.nil?
+        invalid_properties.push('invalid value for "luminosity", luminosity cannot be nil.')
       end
 
-      if @spectral_class.nil?
-        invalid_properties.push("invalid value for 'spectral_class', spectral_class cannot be nil.")
+      if @radius.nil?
+        invalid_properties.push('invalid value for "radius", radius cannot be nil.')
       end
 
-      if @temperature.nil?
-        invalid_properties.push("invalid value for 'temperature', temperature cannot be nil.")
+      if @spectral_class.nil?
+        invalid_properties.push('invalid value for "spectral_class", spectral_class cannot be nil.')
       end
 
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @temperature.nil?
+        invalid_properties.push('invalid value for "temperature", temperature cannot be nil.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if @name.nil?
+      return false if @solar_system_id.nil?
+      return false if @type_id.nil?
       return false if @age.nil?
       return false if @luminosity.nil?
-      return false if @name.nil?
       return false if @radius.nil?
-      return false if @solar_system_id.nil?
       return false if @spectral_class.nil?
-      spectral_class_validator = EnumAttributeValidator.new('String', ["K2 V", "K4 V", "G2 V", "G8 V", "M7 V", "K7 V", "M2 V", "K5 V", "M3 V", "G0 V", "G7 V", "G3 V", "F9 V", "G5 V", "F6 V", "K8 V", "K9 V", "K6 V", "G9 V", "G6 V", "G4 VI", "G4 V", "F8 V", "F2 V", "F1 V", "K3 V", "F0 VI", "G1 VI", "G0 VI", "K1 V", "M4 V", "M1 V", "M6 V", "M0 V", "K2 IV", "G2 VI", "K0 V", "K5 IV", "F5 VI", "G6 VI", "F6 VI", "F2 IV", "G3 VI", "M8 V", "F1 VI", "K1 IV", "F7 V", "G5 VI", "M5 V", "G7 VI", "F5 V", "F4 VI", "F8 VI", "K3 IV", "F4 IV", "F0 V", "G7 IV", "G8 VI", "F2 VI", "F4 V", "F7 VI", "F3 V", "G1 V", "G9 VI", "F3 IV", "F9 VI", "M9 V", "K0 IV", "F1 IV", "G4 IV", "F3 VI", "K4 IV", "G5 IV", "G3 IV", "G1 IV", "K7 IV", "G0 IV", "K6 IV", "K9 IV", "G2 IV", "F9 IV", "F0 IV", "K8 IV", "G8 IV", "F6 IV", "F5 IV", "A0", "A0IV", "A0IV2"])
+      spectral_class_validator = EnumAttributeValidator.new('String', ['K2 V', 'K4 V', 'G2 V', 'G8 V', 'M7 V', 'K7 V', 'M2 V', 'K5 V', 'M3 V', 'G0 V', 'G7 V', 'G3 V', 'F9 V', 'G5 V', 'F6 V', 'K8 V', 'K9 V', 'K6 V', 'G9 V', 'G6 V', 'G4 VI', 'G4 V', 'F8 V', 'F2 V', 'F1 V', 'K3 V', 'F0 VI', 'G1 VI', 'G0 VI', 'K1 V', 'M4 V', 'M1 V', 'M6 V', 'M0 V', 'K2 IV', 'G2 VI', 'K0 V', 'K5 IV', 'F5 VI', 'G6 VI', 'F6 VI', 'F2 IV', 'G3 VI', 'M8 V', 'F1 VI', 'K1 IV', 'F7 V', 'G5 VI', 'M5 V', 'G7 VI', 'F5 V', 'F4 VI', 'F8 VI', 'K3 IV', 'F4 IV', 'F0 V', 'G7 IV', 'G8 VI', 'F2 VI', 'F4 V', 'F7 VI', 'F3 V', 'G1 V', 'G9 VI', 'F3 IV', 'F9 VI', 'M9 V', 'K0 IV', 'F1 IV', 'G4 IV', 'F3 VI', 'K4 IV', 'G5 IV', 'G3 IV', 'G1 IV', 'K7 IV', 'G0 IV', 'K6 IV', 'K9 IV', 'G2 IV', 'F9 IV', 'F0 IV', 'K8 IV', 'G8 IV', 'F6 IV', 'F5 IV', 'A0', 'A0IV', 'A0IV2'])
       return false unless spectral_class_validator.valid?(@spectral_class)
       return false if @temperature.nil?
-      return false if @type_id.nil?
-      return true
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] spectral_class Object to be assigned
     def spectral_class=(spectral_class)
-      validator = EnumAttributeValidator.new('String', ["K2 V", "K4 V", "G2 V", "G8 V", "M7 V", "K7 V", "M2 V", "K5 V", "M3 V", "G0 V", "G7 V", "G3 V", "F9 V", "G5 V", "F6 V", "K8 V", "K9 V", "K6 V", "G9 V", "G6 V", "G4 VI", "G4 V", "F8 V", "F2 V", "F1 V", "K3 V", "F0 VI", "G1 VI", "G0 VI", "K1 V", "M4 V", "M1 V", "M6 V", "M0 V", "K2 IV", "G2 VI", "K0 V", "K5 IV", "F5 VI", "G6 VI", "F6 VI", "F2 IV", "G3 VI", "M8 V", "F1 VI", "K1 IV", "F7 V", "G5 VI", "M5 V", "G7 VI", "F5 V", "F4 VI", "F8 VI", "K3 IV", "F4 IV", "F0 V", "G7 IV", "G8 VI", "F2 VI", "F4 V", "F7 VI", "F3 V", "G1 V", "G9 VI", "F3 IV", "F9 VI", "M9 V", "K0 IV", "F1 IV", "G4 IV", "F3 VI", "K4 IV", "G5 IV", "G3 IV", "G1 IV", "K7 IV", "G0 IV", "K6 IV", "K9 IV", "G2 IV", "F9 IV", "F0 IV", "K8 IV", "G8 IV", "F6 IV", "F5 IV", "A0", "A0IV", "A0IV2"])
+      validator = EnumAttributeValidator.new('String', ['K2 V', 'K4 V', 'G2 V', 'G8 V', 'M7 V', 'K7 V', 'M2 V', 'K5 V', 'M3 V', 'G0 V', 'G7 V', 'G3 V', 'F9 V', 'G5 V', 'F6 V', 'K8 V', 'K9 V', 'K6 V', 'G9 V', 'G6 V', 'G4 VI', 'G4 V', 'F8 V', 'F2 V', 'F1 V', 'K3 V', 'F0 VI', 'G1 VI', 'G0 VI', 'K1 V', 'M4 V', 'M1 V', 'M6 V', 'M0 V', 'K2 IV', 'G2 VI', 'K0 V', 'K5 IV', 'F5 VI', 'G6 VI', 'F6 VI', 'F2 IV', 'G3 VI', 'M8 V', 'F1 VI', 'K1 IV', 'F7 V', 'G5 VI', 'M5 V', 'G7 VI', 'F5 V', 'F4 VI', 'F8 VI', 'K3 IV', 'F4 IV', 'F0 V', 'G7 IV', 'G8 VI', 'F2 VI', 'F4 V', 'F7 VI', 'F3 V', 'G1 V', 'G9 VI', 'F3 IV', 'F9 VI', 'M9 V', 'K0 IV', 'F1 IV', 'G4 IV', 'F3 VI', 'K4 IV', 'G5 IV', 'G3 IV', 'G1 IV', 'K7 IV', 'G0 IV', 'K6 IV', 'K9 IV', 'G2 IV', 'F9 IV', 'F0 IV', 'K8 IV', 'G8 IV', 'F6 IV', 'F5 IV', 'A0', 'A0IV', 'A0IV2'])
       unless validator.valid?(spectral_class)
-        fail ArgumentError, "invalid value for 'spectral_class', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "spectral_class", must be one of #{validator.allowable_values}.'
       end
       @spectral_class = spectral_class
     end
@@ -201,14 +200,14 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          name == o.name &&
+          solar_system_id == o.solar_system_id &&
+          type_id == o.type_id &&
           age == o.age &&
           luminosity == o.luminosity &&
-          name == o.name &&
           radius == o.radius &&
-          solar_system_id == o.solar_system_id &&
           spectral_class == o.spectral_class &&
-          temperature == o.temperature &&
-          type_id == o.type_id
+          temperature == o.temperature
     end
 
     # @see the `==` method
@@ -220,7 +219,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [age, luminosity, name, radius, solar_system_id, spectral_class, temperature, type_id].hash
+      [name, solar_system_id, type_id, age, luminosity, radius, spectral_class, temperature].hash
     end
 
     # Builds the object from hash
@@ -233,7 +232,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -315,7 +314,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -326,7 +325,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_universe_stations_station_id_not_found.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -18,7 +18,6 @@ module ESIClient
     # Not found message
     attr_accessor :error
 
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -39,25 +38,24 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
       if attributes.has_key?(:'error')
         self.error = attributes[:'error']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -90,7 +88,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -172,7 +170,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -183,7 +181,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_universe_stations_station_id_ok.rb

@@ -3,10 +3,10 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.6.2
+OpenAPI spec version: 0.7.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Swagger Codegen version: 2.4.0-SNAPSHOT
 
 =end
 
@@ -15,40 +15,40 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetUniverseStationsStationIdOk
-    # max_dockable_ship_volume number
-    attr_accessor :max_dockable_ship_volume
+    # station_id integer
+    attr_accessor :station_id
 
     # name string
     attr_accessor :name
 
-    # office_rental_cost number
-    attr_accessor :office_rental_cost
-
     # ID of the corporation that controls this station
     attr_accessor :owner
 
-    attr_accessor :position
+    # type_id integer
+    attr_accessor :type_id
 
     # race_id integer
     attr_accessor :race_id
 
+    attr_accessor :position
+
+    # The solar system this station is in
+    attr_accessor :system_id
+
     # reprocessing_efficiency number
     attr_accessor :reprocessing_efficiency
 
     # reprocessing_stations_take number
     attr_accessor :reprocessing_stations_take
 
-    # services array
-    attr_accessor :services
-
-    # station_id integer
-    attr_accessor :station_id
+    # max_dockable_ship_volume number
+    attr_accessor :max_dockable_ship_volume
 
-    # The solar system this station is in
-    attr_accessor :system_id
+    # office_rental_cost number
+    attr_accessor :office_rental_cost
 
-    # type_id integer
-    attr_accessor :type_id
+    # services array
+    attr_accessor :services
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -75,36 +75,36 @@ module ESIClient
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'max_dockable_ship_volume' => :'max_dockable_ship_volume',
+        :'station_id' => :'station_id',
         :'name' => :'name',
-        :'office_rental_cost' => :'office_rental_cost',
         :'owner' => :'owner',
-        :'position' => :'position',
+        :'type_id' => :'type_id',
         :'race_id' => :'race_id',
+        :'position' => :'position',
+        :'system_id' => :'system_id',
         :'reprocessing_efficiency' => :'reprocessing_efficiency',
         :'reprocessing_stations_take' => :'reprocessing_stations_take',
-        :'services' => :'services',
-        :'station_id' => :'station_id',
-        :'system_id' => :'system_id',
-        :'type_id' => :'type_id'
+        :'max_dockable_ship_volume' => :'max_dockable_ship_volume',
+        :'office_rental_cost' => :'office_rental_cost',
+        :'services' => :'services'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'max_dockable_ship_volume' => :'Float',
+        :'station_id' => :'Integer',
         :'name' => :'String',
-        :'office_rental_cost' => :'Float',
         :'owner' => :'Integer',
-        :'position' => :'GetUniverseStationsStationIdPosition',
+        :'type_id' => :'Integer',
         :'race_id' => :'Integer',
+        :'position' => :'GetUniverseStationsStationIdPosition',
+        :'system_id' => :'Integer',
         :'reprocessing_efficiency' => :'Float',
         :'reprocessing_stations_take' => :'Float',
-        :'services' => :'Array<String>',
-        :'station_id' => :'Integer',
-        :'system_id' => :'Integer',
-        :'type_id' => :'Integer'
+        :'max_dockable_ship_volume' => :'Float',
+        :'office_rental_cost' => :'Float',
+        :'services' => :'Array<String>'
       }
     end
 
@@ -114,32 +114,36 @@ module ESIClient
       return unless attributes.is_a?(Hash)
 
       # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}){|(k,v), h| h[k.to_sym] = v}
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
-      if attributes.has_key?(:'max_dockable_ship_volume')
-        self.max_dockable_ship_volume = attributes[:'max_dockable_ship_volume']
+      if attributes.has_key?(:'station_id')
+        self.station_id = attributes[:'station_id']
       end
 
       if attributes.has_key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'office_rental_cost')
-        self.office_rental_cost = attributes[:'office_rental_cost']
-      end
-
       if attributes.has_key?(:'owner')
         self.owner = attributes[:'owner']
       end
 
-      if attributes.has_key?(:'position')
-        self.position = attributes[:'position']
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
 
       if attributes.has_key?(:'race_id')
         self.race_id = attributes[:'race_id']
       end
 
+      if attributes.has_key?(:'position')
+        self.position = attributes[:'position']
+      end
+
+      if attributes.has_key?(:'system_id')
+        self.system_id = attributes[:'system_id']
+      end
+
       if attributes.has_key?(:'reprocessing_efficiency')
         self.reprocessing_efficiency = attributes[:'reprocessing_efficiency']
       end
@@ -148,82 +152,82 @@ module ESIClient
         self.reprocessing_stations_take = attributes[:'reprocessing_stations_take']
       end
 
-      if attributes.has_key?(:'services')
-        if (value = attributes[:'services']).is_a?(Array)
-          self.services = value
-        end
-      end
-
-      if attributes.has_key?(:'station_id')
-        self.station_id = attributes[:'station_id']
+      if attributes.has_key?(:'max_dockable_ship_volume')
+        self.max_dockable_ship_volume = attributes[:'max_dockable_ship_volume']
       end
 
-      if attributes.has_key?(:'system_id')
-        self.system_id = attributes[:'system_id']
+      if attributes.has_key?(:'office_rental_cost')
+        self.office_rental_cost = attributes[:'office_rental_cost']
       end
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'services')
+        if (value = attributes[:'services']).is_a?(Array)
+          self.services = value
+        end
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @max_dockable_ship_volume.nil?
-        invalid_properties.push("invalid value for 'max_dockable_ship_volume', max_dockable_ship_volume cannot be nil.")
+      if @station_id.nil?
+        invalid_properties.push('invalid value for "station_id", station_id cannot be nil.')
       end
 
       if @name.nil?
-        invalid_properties.push("invalid value for 'name', name cannot be nil.")
+        invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
 
-      if @office_rental_cost.nil?
-        invalid_properties.push("invalid value for 'office_rental_cost', office_rental_cost cannot be nil.")
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
       end
 
-      if @reprocessing_efficiency.nil?
-        invalid_properties.push("invalid value for 'reprocessing_efficiency', reprocessing_efficiency cannot be nil.")
+      if @position.nil?
+        invalid_properties.push('invalid value for "position", position cannot be nil.')
       end
 
-      if @reprocessing_stations_take.nil?
-        invalid_properties.push("invalid value for 'reprocessing_stations_take', reprocessing_stations_take cannot be nil.")
+      if @system_id.nil?
+        invalid_properties.push('invalid value for "system_id", system_id cannot be nil.')
       end
 
-      if @services.nil?
-        invalid_properties.push("invalid value for 'services', services cannot be nil.")
+      if @reprocessing_efficiency.nil?
+        invalid_properties.push('invalid value for "reprocessing_efficiency", reprocessing_efficiency cannot be nil.')
       end
 
-      if @station_id.nil?
-        invalid_properties.push("invalid value for 'station_id', station_id cannot be nil.")
+      if @reprocessing_stations_take.nil?
+        invalid_properties.push('invalid value for "reprocessing_stations_take", reprocessing_stations_take cannot be nil.')
       end
 
-      if @system_id.nil?
-        invalid_properties.push("invalid value for 'system_id', system_id cannot be nil.")
+      if @max_dockable_ship_volume.nil?
+        invalid_properties.push('invalid value for "max_dockable_ship_volume", max_dockable_ship_volume cannot be nil.')
       end
 
-      if @type_id.nil?
-        invalid_properties.push("invalid value for 'type_id', type_id cannot be nil.")
+      if @office_rental_cost.nil?
+        invalid_properties.push('invalid value for "office_rental_cost", office_rental_cost cannot be nil.')
+      end
+
+      if @services.nil?
+        invalid_properties.push('invalid value for "services", services cannot be nil.')
       end
 
-      return invalid_properties
+      invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if @max_dockable_ship_volume.nil?
+      return false if @station_id.nil?
       return false if @name.nil?
-      return false if @office_rental_cost.nil?
+      return false if @type_id.nil?
+      return false if @position.nil?
+      return false if @system_id.nil?
       return false if @reprocessing_efficiency.nil?
       return false if @reprocessing_stations_take.nil?
+      return false if @max_dockable_ship_volume.nil?
+      return false if @office_rental_cost.nil?
       return false if @services.nil?
-      return false if @station_id.nil?
-      return false if @system_id.nil?
-      return false if @type_id.nil?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -231,18 +235,18 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          max_dockable_ship_volume == o.max_dockable_ship_volume &&
+          station_id == o.station_id &&
           name == o.name &&
-          office_rental_cost == o.office_rental_cost &&
           owner == o.owner &&
-          position == o.position &&
+          type_id == o.type_id &&
           race_id == o.race_id &&
+          position == o.position &&
+          system_id == o.system_id &&
           reprocessing_efficiency == o.reprocessing_efficiency &&
           reprocessing_stations_take == o.reprocessing_stations_take &&
-          services == o.services &&
-          station_id == o.station_id &&
-          system_id == o.system_id &&
-          type_id == o.type_id
+          max_dockable_ship_volume == o.max_dockable_ship_volume &&
+          office_rental_cost == o.office_rental_cost &&
+          services == o.services
     end
 
     # @see the `==` method
@@ -254,7 +258,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [max_dockable_ship_volume, name, office_rental_cost, owner, position, race_id, reprocessing_efficiency, reprocessing_stations_take, services, station_id, system_id, type_id].hash
+      [station_id, name, owner, type_id, race_id, position, system_id, reprocessing_efficiency, reprocessing_stations_take, max_dockable_ship_volume, office_rental_cost, services].hash
     end
 
     # Builds the object from hash
@@ -267,7 +271,7 @@ module ESIClient
           # check to ensure the input is an array given that the the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map{ |v| _deserialize($1, v) } )
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
@@ -349,7 +353,7 @@ module ESIClient
     # @return [Hash] Returns the value in the form of hash
     def _to_hash(value)
       if value.is_a?(Array)
-        value.compact.map{ |v| _to_hash(v) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -360,7 +364,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end