esi_client 1.3.0 → 1.4.0

data/lib/esi_client/models/get_dogma_effects_effect_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,121 +15,120 @@ require 'date'
 module ESIClient
   # 200 ok object
   class GetDogmaEffectsEffectIdOk
-    # description string
-    attr_accessor :description
-
-    # disallow_auto_repeat boolean
-    attr_accessor :disallow_auto_repeat
+    # effect_id integer
+    attr_accessor :effect_id
 
-    # discharge_attribute_id integer
-    attr_accessor :discharge_attribute_id
+    # name string
+    attr_accessor :name
 
     # display_name string
     attr_accessor :display_name
 
-    # duration_attribute_id integer
-    attr_accessor :duration_attribute_id
+    # description string
+    attr_accessor :description
+
+    # icon_id integer
+    attr_accessor :icon_id
 
     # effect_category integer
     attr_accessor :effect_category
 
-    # effect_id integer
-    attr_accessor :effect_id
-
-    # electronic_chance boolean
-    attr_accessor :electronic_chance
+    # pre_expression integer
+    attr_accessor :pre_expression
 
-    # falloff_attribute_id integer
-    attr_accessor :falloff_attribute_id
+    # post_expression integer
+    attr_accessor :post_expression
 
-    # icon_id integer
-    attr_accessor :icon_id
+    # is_offensive boolean
+    attr_accessor :is_offensive
 
     # is_assistance boolean
     attr_accessor :is_assistance
 
-    # is_offensive boolean
-    attr_accessor :is_offensive
+    # disallow_auto_repeat boolean
+    attr_accessor :disallow_auto_repeat
+
+    # published boolean
+    attr_accessor :published
 
     # is_warp_safe boolean
     attr_accessor :is_warp_safe
 
-    # modifiers array
-    attr_accessor :modifiers
+    # range_chance boolean
+    attr_accessor :range_chance
 
-    # name string
-    attr_accessor :name
+    # electronic_chance boolean
+    attr_accessor :electronic_chance
 
-    # post_expression integer
-    attr_accessor :post_expression
+    # duration_attribute_id integer
+    attr_accessor :duration_attribute_id
 
-    # pre_expression integer
-    attr_accessor :pre_expression
+    # tracking_speed_attribute_id integer
+    attr_accessor :tracking_speed_attribute_id
 
-    # published boolean
-    attr_accessor :published
+    # discharge_attribute_id integer
+    attr_accessor :discharge_attribute_id
 
     # range_attribute_id integer
     attr_accessor :range_attribute_id
 
-    # range_chance boolean
-    attr_accessor :range_chance
-
-    # tracking_speed_attribute_id integer
-    attr_accessor :tracking_speed_attribute_id
+    # falloff_attribute_id integer
+    attr_accessor :falloff_attribute_id
 
+    # modifiers array
+    attr_accessor :modifiers
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'description' => :'description',
-        :'disallow_auto_repeat' => :'disallow_auto_repeat',
-        :'discharge_attribute_id' => :'discharge_attribute_id',
-        :'display_name' => :'display_name',
-        :'duration_attribute_id' => :'duration_attribute_id',
-        :'effect_category' => :'effect_category',
         :'effect_id' => :'effect_id',
-        :'electronic_chance' => :'electronic_chance',
-        :'falloff_attribute_id' => :'falloff_attribute_id',
-        :'icon_id' => :'icon_id',
-        :'is_assistance' => :'is_assistance',
-        :'is_offensive' => :'is_offensive',
-        :'is_warp_safe' => :'is_warp_safe',
-        :'modifiers' => :'modifiers',
         :'name' => :'name',
-        :'post_expression' => :'post_expression',
+        :'display_name' => :'display_name',
+        :'description' => :'description',
+        :'icon_id' => :'icon_id',
+        :'effect_category' => :'effect_category',
         :'pre_expression' => :'pre_expression',
+        :'post_expression' => :'post_expression',
+        :'is_offensive' => :'is_offensive',
+        :'is_assistance' => :'is_assistance',
+        :'disallow_auto_repeat' => :'disallow_auto_repeat',
         :'published' => :'published',
-        :'range_attribute_id' => :'range_attribute_id',
+        :'is_warp_safe' => :'is_warp_safe',
         :'range_chance' => :'range_chance',
-        :'tracking_speed_attribute_id' => :'tracking_speed_attribute_id'
+        :'electronic_chance' => :'electronic_chance',
+        :'duration_attribute_id' => :'duration_attribute_id',
+        :'tracking_speed_attribute_id' => :'tracking_speed_attribute_id',
+        :'discharge_attribute_id' => :'discharge_attribute_id',
+        :'range_attribute_id' => :'range_attribute_id',
+        :'falloff_attribute_id' => :'falloff_attribute_id',
+        :'modifiers' => :'modifiers'
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'description' => :'String',
-        :'disallow_auto_repeat' => :'BOOLEAN',
-        :'discharge_attribute_id' => :'Integer',
-        :'display_name' => :'String',
-        :'duration_attribute_id' => :'Integer',
-        :'effect_category' => :'Integer',
         :'effect_id' => :'Integer',
-        :'electronic_chance' => :'BOOLEAN',
-        :'falloff_attribute_id' => :'Integer',
-        :'icon_id' => :'Integer',
-        :'is_assistance' => :'BOOLEAN',
-        :'is_offensive' => :'BOOLEAN',
-        :'is_warp_safe' => :'BOOLEAN',
-        :'modifiers' => :'Array<GetDogmaEffectsEffectIdModifier>',
         :'name' => :'String',
-        :'post_expression' => :'Integer',
+        :'display_name' => :'String',
+        :'description' => :'String',
+        :'icon_id' => :'Integer',
+        :'effect_category' => :'Integer',
         :'pre_expression' => :'Integer',
+        :'post_expression' => :'Integer',
+        :'is_offensive' => :'BOOLEAN',
+        :'is_assistance' => :'BOOLEAN',
+        :'disallow_auto_repeat' => :'BOOLEAN',
         :'published' => :'BOOLEAN',
-        :'range_attribute_id' => :'Integer',
+        :'is_warp_safe' => :'BOOLEAN',
         :'range_chance' => :'BOOLEAN',
-        :'tracking_speed_attribute_id' => :'Integer'
+        :'electronic_chance' => :'BOOLEAN',
+        :'duration_attribute_id' => :'Integer',
+        :'tracking_speed_attribute_id' => :'Integer',
+        :'discharge_attribute_id' => :'Integer',
+        :'range_attribute_id' => :'Integer',
+        :'falloff_attribute_id' => :'Integer',
+        :'modifiers' => :'Array<GetDogmaEffectsEffectIdModifier>'
       }
     end
 
@@ -139,112 +138,111 @@ 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?(:'description')
-        self.description = attributes[:'description']
-      end
-
-      if attributes.has_key?(:'disallow_auto_repeat')
-        self.disallow_auto_repeat = attributes[:'disallow_auto_repeat']
+      if attributes.has_key?(:'effect_id')
+        self.effect_id = attributes[:'effect_id']
       end
 
-      if attributes.has_key?(:'discharge_attribute_id')
-        self.discharge_attribute_id = attributes[:'discharge_attribute_id']
+      if attributes.has_key?(:'name')
+        self.name = attributes[:'name']
       end
 
       if attributes.has_key?(:'display_name')
         self.display_name = attributes[:'display_name']
       end
 
-      if attributes.has_key?(:'duration_attribute_id')
-        self.duration_attribute_id = attributes[:'duration_attribute_id']
+      if attributes.has_key?(:'description')
+        self.description = attributes[:'description']
       end
 
-      if attributes.has_key?(:'effect_category')
-        self.effect_category = attributes[:'effect_category']
+      if attributes.has_key?(:'icon_id')
+        self.icon_id = attributes[:'icon_id']
       end
 
-      if attributes.has_key?(:'effect_id')
-        self.effect_id = attributes[:'effect_id']
+      if attributes.has_key?(:'effect_category')
+        self.effect_category = attributes[:'effect_category']
       end
 
-      if attributes.has_key?(:'electronic_chance')
-        self.electronic_chance = attributes[:'electronic_chance']
+      if attributes.has_key?(:'pre_expression')
+        self.pre_expression = attributes[:'pre_expression']
       end
 
-      if attributes.has_key?(:'falloff_attribute_id')
-        self.falloff_attribute_id = attributes[:'falloff_attribute_id']
+      if attributes.has_key?(:'post_expression')
+        self.post_expression = attributes[:'post_expression']
       end
 
-      if attributes.has_key?(:'icon_id')
-        self.icon_id = attributes[:'icon_id']
+      if attributes.has_key?(:'is_offensive')
+        self.is_offensive = attributes[:'is_offensive']
       end
 
       if attributes.has_key?(:'is_assistance')
         self.is_assistance = attributes[:'is_assistance']
       end
 
-      if attributes.has_key?(:'is_offensive')
-        self.is_offensive = attributes[:'is_offensive']
+      if attributes.has_key?(:'disallow_auto_repeat')
+        self.disallow_auto_repeat = attributes[:'disallow_auto_repeat']
+      end
+
+      if attributes.has_key?(:'published')
+        self.published = attributes[:'published']
       end
 
       if attributes.has_key?(:'is_warp_safe')
         self.is_warp_safe = attributes[:'is_warp_safe']
       end
 
-      if attributes.has_key?(:'modifiers')
-        if (value = attributes[:'modifiers']).is_a?(Array)
-          self.modifiers = value
-        end
+      if attributes.has_key?(:'range_chance')
+        self.range_chance = attributes[:'range_chance']
       end
 
-      if attributes.has_key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.has_key?(:'electronic_chance')
+        self.electronic_chance = attributes[:'electronic_chance']
       end
 
-      if attributes.has_key?(:'post_expression')
-        self.post_expression = attributes[:'post_expression']
+      if attributes.has_key?(:'duration_attribute_id')
+        self.duration_attribute_id = attributes[:'duration_attribute_id']
       end
 
-      if attributes.has_key?(:'pre_expression')
-        self.pre_expression = attributes[:'pre_expression']
+      if attributes.has_key?(:'tracking_speed_attribute_id')
+        self.tracking_speed_attribute_id = attributes[:'tracking_speed_attribute_id']
       end
 
-      if attributes.has_key?(:'published')
-        self.published = attributes[:'published']
+      if attributes.has_key?(:'discharge_attribute_id')
+        self.discharge_attribute_id = attributes[:'discharge_attribute_id']
       end
 
       if attributes.has_key?(:'range_attribute_id')
         self.range_attribute_id = attributes[:'range_attribute_id']
       end
 
-      if attributes.has_key?(:'range_chance')
-        self.range_chance = attributes[:'range_chance']
+      if attributes.has_key?(:'falloff_attribute_id')
+        self.falloff_attribute_id = attributes[:'falloff_attribute_id']
       end
 
-      if attributes.has_key?(:'tracking_speed_attribute_id')
-        self.tracking_speed_attribute_id = attributes[:'tracking_speed_attribute_id']
+      if attributes.has_key?(:'modifiers')
+        if (value = attributes[:'modifiers']).is_a?(Array)
+          self.modifiers = 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 @effect_id.nil?
-        invalid_properties.push("invalid value for 'effect_id', effect_id cannot be nil.")
+        invalid_properties.push('invalid value for "effect_id", effect_id 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 @effect_id.nil?
-      return true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -252,27 +250,27 @@ module ESIClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          description == o.description &&
-          disallow_auto_repeat == o.disallow_auto_repeat &&
-          discharge_attribute_id == o.discharge_attribute_id &&
-          display_name == o.display_name &&
-          duration_attribute_id == o.duration_attribute_id &&
-          effect_category == o.effect_category &&
           effect_id == o.effect_id &&
-          electronic_chance == o.electronic_chance &&
-          falloff_attribute_id == o.falloff_attribute_id &&
-          icon_id == o.icon_id &&
-          is_assistance == o.is_assistance &&
-          is_offensive == o.is_offensive &&
-          is_warp_safe == o.is_warp_safe &&
-          modifiers == o.modifiers &&
           name == o.name &&
-          post_expression == o.post_expression &&
+          display_name == o.display_name &&
+          description == o.description &&
+          icon_id == o.icon_id &&
+          effect_category == o.effect_category &&
           pre_expression == o.pre_expression &&
+          post_expression == o.post_expression &&
+          is_offensive == o.is_offensive &&
+          is_assistance == o.is_assistance &&
+          disallow_auto_repeat == o.disallow_auto_repeat &&
           published == o.published &&
-          range_attribute_id == o.range_attribute_id &&
+          is_warp_safe == o.is_warp_safe &&
           range_chance == o.range_chance &&
-          tracking_speed_attribute_id == o.tracking_speed_attribute_id
+          electronic_chance == o.electronic_chance &&
+          duration_attribute_id == o.duration_attribute_id &&
+          tracking_speed_attribute_id == o.tracking_speed_attribute_id &&
+          discharge_attribute_id == o.discharge_attribute_id &&
+          range_attribute_id == o.range_attribute_id &&
+          falloff_attribute_id == o.falloff_attribute_id &&
+          modifiers == o.modifiers
     end
 
     # @see the `==` method
@@ -284,7 +282,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [description, disallow_auto_repeat, discharge_attribute_id, display_name, duration_attribute_id, effect_category, effect_id, electronic_chance, falloff_attribute_id, icon_id, is_assistance, is_offensive, is_warp_safe, modifiers, name, post_expression, pre_expression, published, range_attribute_id, range_chance, tracking_speed_attribute_id].hash
+      [effect_id, name, display_name, description, icon_id, effect_category, pre_expression, post_expression, is_offensive, is_assistance, disallow_auto_repeat, published, is_warp_safe, range_chance, electronic_chance, duration_attribute_id, tracking_speed_attribute_id, discharge_attribute_id, range_attribute_id, falloff_attribute_id, modifiers].hash
     end
 
     # Builds the object from hash
@@ -297,7 +295,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]]))
@@ -379,7 +377,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) }
@@ -390,7 +388,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end

data/lib/esi_client/models/get_fleets_fleet_id_members_200_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
 
@@ -18,8 +18,14 @@ module ESIClient
     # character_id integer
     attr_accessor :character_id
 
-    # join_time string
-    attr_accessor :join_time
+    # ship_type_id integer
+    attr_accessor :ship_type_id
+
+    # ID of the wing the member is in. If not applicable, will be set to -1
+    attr_accessor :wing_id
+
+    # ID of the squad the member is in. If not applicable, will be set to -1
+    attr_accessor :squad_id
 
     # Member’s role in fleet
     attr_accessor :role
@@ -27,24 +33,18 @@ module ESIClient
     # Localized role names
     attr_accessor :role_name
 
-    # ship_type_id integer
-    attr_accessor :ship_type_id
+    # join_time string
+    attr_accessor :join_time
+
+    # Whether the member take fleet warps
+    attr_accessor :takes_fleet_warp
 
     # Solar system the member is located in
     attr_accessor :solar_system_id
 
-    # ID of the squad the member is in. If not applicable, will be set to -1
-    attr_accessor :squad_id
-
     # Station in which the member is docked in, if applicable
     attr_accessor :station_id
 
-    # Whether the member take fleet warps
-    attr_accessor :takes_fleet_warp
-
-    # ID of the wing the member is in. If not applicable, will be set to -1
-    attr_accessor :wing_id
-
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -71,15 +71,15 @@ module ESIClient
     def self.attribute_map
       {
         :'character_id' => :'character_id',
-        :'join_time' => :'join_time',
-        :'role' => :'role',
-        :'role_name' => :'role_name',
         :'ship_type_id' => :'ship_type_id',
-        :'solar_system_id' => :'solar_system_id',
+        :'wing_id' => :'wing_id',
         :'squad_id' => :'squad_id',
-        :'station_id' => :'station_id',
+        :'role' => :'role',
+        :'role_name' => :'role_name',
+        :'join_time' => :'join_time',
         :'takes_fleet_warp' => :'takes_fleet_warp',
-        :'wing_id' => :'wing_id'
+        :'solar_system_id' => :'solar_system_id',
+        :'station_id' => :'station_id'
       }
     end
 
@@ -87,15 +87,15 @@ module ESIClient
     def self.swagger_types
       {
         :'character_id' => :'Integer',
-        :'join_time' => :'DateTime',
-        :'role' => :'String',
-        :'role_name' => :'String',
         :'ship_type_id' => :'Integer',
-        :'solar_system_id' => :'Integer',
+        :'wing_id' => :'Integer',
         :'squad_id' => :'Integer',
-        :'station_id' => :'Integer',
+        :'role' => :'String',
+        :'role_name' => :'String',
+        :'join_time' => :'DateTime',
         :'takes_fleet_warp' => :'BOOLEAN',
-        :'wing_id' => :'Integer'
+        :'solar_system_id' => :'Integer',
+        :'station_id' => :'Integer'
       }
     end
 
@@ -105,14 +105,22 @@ 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?(:'character_id')
         self.character_id = attributes[:'character_id']
       end
 
-      if attributes.has_key?(:'join_time')
-        self.join_time = attributes[:'join_time']
+      if attributes.has_key?(:'ship_type_id')
+        self.ship_type_id = attributes[:'ship_type_id']
+      end
+
+      if attributes.has_key?(:'wing_id')
+        self.wing_id = attributes[:'wing_id']
+      end
+
+      if attributes.has_key?(:'squad_id')
+        self.squad_id = attributes[:'squad_id']
       end
 
       if attributes.has_key?(:'role')
@@ -123,98 +131,89 @@ module ESIClient
         self.role_name = attributes[:'role_name']
       end
 
-      if attributes.has_key?(:'ship_type_id')
-        self.ship_type_id = attributes[:'ship_type_id']
+      if attributes.has_key?(:'join_time')
+        self.join_time = attributes[:'join_time']
       end
 
-      if attributes.has_key?(:'solar_system_id')
-        self.solar_system_id = attributes[:'solar_system_id']
+      if attributes.has_key?(:'takes_fleet_warp')
+        self.takes_fleet_warp = attributes[:'takes_fleet_warp']
       end
 
-      if attributes.has_key?(:'squad_id')
-        self.squad_id = attributes[:'squad_id']
+      if attributes.has_key?(:'solar_system_id')
+        self.solar_system_id = attributes[:'solar_system_id']
       end
 
       if attributes.has_key?(:'station_id')
         self.station_id = attributes[:'station_id']
       end
-
-      if attributes.has_key?(:'takes_fleet_warp')
-        self.takes_fleet_warp = attributes[:'takes_fleet_warp']
-      end
-
-      if attributes.has_key?(:'wing_id')
-        self.wing_id = attributes[:'wing_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 @character_id.nil?
-        invalid_properties.push("invalid value for 'character_id', character_id cannot be nil.")
+        invalid_properties.push('invalid value for "character_id", character_id cannot be nil.')
       end
 
-      if @join_time.nil?
-        invalid_properties.push("invalid value for 'join_time', join_time cannot be nil.")
+      if @ship_type_id.nil?
+        invalid_properties.push('invalid value for "ship_type_id", ship_type_id cannot be nil.')
       end
 
-      if @role.nil?
-        invalid_properties.push("invalid value for 'role', role cannot be nil.")
+      if @wing_id.nil?
+        invalid_properties.push('invalid value for "wing_id", wing_id cannot be nil.')
       end
 
-      if @role_name.nil?
-        invalid_properties.push("invalid value for 'role_name', role_name cannot be nil.")
+      if @squad_id.nil?
+        invalid_properties.push('invalid value for "squad_id", squad_id cannot be nil.')
       end
 
-      if @ship_type_id.nil?
-        invalid_properties.push("invalid value for 'ship_type_id', ship_type_id cannot be nil.")
+      if @role.nil?
+        invalid_properties.push('invalid value for "role", role 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 @role_name.nil?
+        invalid_properties.push('invalid value for "role_name", role_name cannot be nil.')
       end
 
-      if @squad_id.nil?
-        invalid_properties.push("invalid value for 'squad_id', squad_id cannot be nil.")
+      if @join_time.nil?
+        invalid_properties.push('invalid value for "join_time", join_time cannot be nil.')
       end
 
       if @takes_fleet_warp.nil?
-        invalid_properties.push("invalid value for 'takes_fleet_warp', takes_fleet_warp cannot be nil.")
+        invalid_properties.push('invalid value for "takes_fleet_warp", takes_fleet_warp cannot be nil.')
       end
 
-      if @wing_id.nil?
-        invalid_properties.push("invalid value for 'wing_id', wing_id cannot be nil.")
+      if @solar_system_id.nil?
+        invalid_properties.push('invalid value for "solar_system_id", solar_system_id 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 @character_id.nil?
-      return false if @join_time.nil?
+      return false if @ship_type_id.nil?
+      return false if @wing_id.nil?
+      return false if @squad_id.nil?
       return false if @role.nil?
-      role_validator = EnumAttributeValidator.new('String', ["fleet_commander", "wing_commander", "squad_commander", "squad_member"])
+      role_validator = EnumAttributeValidator.new('String', ['fleet_commander', 'wing_commander', 'squad_commander', 'squad_member'])
       return false unless role_validator.valid?(@role)
       return false if @role_name.nil?
-      return false if @ship_type_id.nil?
-      return false if @solar_system_id.nil?
-      return false if @squad_id.nil?
+      return false if @join_time.nil?
       return false if @takes_fleet_warp.nil?
-      return false if @wing_id.nil?
-      return true
+      return false if @solar_system_id.nil?
+      true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] role Object to be assigned
     def role=(role)
-      validator = EnumAttributeValidator.new('String', ["fleet_commander", "wing_commander", "squad_commander", "squad_member"])
+      validator = EnumAttributeValidator.new('String', ['fleet_commander', 'wing_commander', 'squad_commander', 'squad_member'])
       unless validator.valid?(role)
-        fail ArgumentError, "invalid value for 'role', must be one of #{validator.allowable_values}."
+        fail ArgumentError, 'invalid value for "role", must be one of #{validator.allowable_values}.'
       end
       @role = role
     end
@@ -225,15 +224,15 @@ module ESIClient
       return true if self.equal?(o)
       self.class == o.class &&
           character_id == o.character_id &&
-          join_time == o.join_time &&
-          role == o.role &&
-          role_name == o.role_name &&
           ship_type_id == o.ship_type_id &&
-          solar_system_id == o.solar_system_id &&
+          wing_id == o.wing_id &&
           squad_id == o.squad_id &&
-          station_id == o.station_id &&
+          role == o.role &&
+          role_name == o.role_name &&
+          join_time == o.join_time &&
           takes_fleet_warp == o.takes_fleet_warp &&
-          wing_id == o.wing_id
+          solar_system_id == o.solar_system_id &&
+          station_id == o.station_id
     end
 
     # @see the `==` method
@@ -245,7 +244,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [character_id, join_time, role, role_name, ship_type_id, solar_system_id, squad_id, station_id, takes_fleet_warp, wing_id].hash
+      [character_id, ship_type_id, wing_id, squad_id, role, role_name, join_time, takes_fleet_warp, solar_system_id, station_id].hash
     end
 
     # Builds the object from hash
@@ -258,7 +257,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]]))
@@ -340,7 +339,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) }
@@ -351,7 +350,5 @@ module ESIClient
         value
       end
     end
-
   end
-
 end