esi_client 0.7.6.2 → 0.8.5.0

data/lib/esi_client/models/get_corporations_corporation_id_blueprints_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -18,26 +18,26 @@ module ESIClient
     # Unique ID for this item.
     attr_accessor :item_id
 
-    # type_id integer
-    attr_accessor :type_id
+    # Type of the location_id
+    attr_accessor :location_flag
 
     # References a solar system, station or item_id if this blueprint is located within a container.
     attr_accessor :location_id
 
-    # A range of numbers with a minimum of -2 and no maximum value where -1 is an original and -2 is a copy. It can be a positive integer if it is a stack of blueprint originals fresh from the market (e.g. no activities performed on them yet).
-    attr_accessor :quantity
-
-    # Time Efficiency Level of the blueprint.
-    attr_accessor :time_efficiency
-
     # Material Efficiency Level of the blueprint.
     attr_accessor :material_efficiency
 
+    # A range of numbers with a minimum of -2 and no maximum value where -1 is an original and -2 is a copy. It can be a positive integer if it is a stack of blueprint originals fresh from the market (e.g. no activities performed on them yet).
+    attr_accessor :quantity
+
     # Number of runs remaining if the blueprint is a copy, -1 if it is an original.
     attr_accessor :runs
 
-    # Type of the location_id
-    attr_accessor :location_flag
+    # Time Efficiency Level of the blueprint.
+    attr_accessor :time_efficiency
+
+    # type_id integer
+    attr_accessor :type_id
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -65,13 +65,13 @@ module ESIClient
     def self.attribute_map
       {
         :'item_id' => :'item_id',
-        :'type_id' => :'type_id',
+        :'location_flag' => :'location_flag',
         :'location_id' => :'location_id',
-        :'quantity' => :'quantity',
-        :'time_efficiency' => :'time_efficiency',
         :'material_efficiency' => :'material_efficiency',
+        :'quantity' => :'quantity',
         :'runs' => :'runs',
-        :'location_flag' => :'location_flag'
+        :'time_efficiency' => :'time_efficiency',
+        :'type_id' => :'type_id'
       }
     end
 
@@ -79,13 +79,13 @@ module ESIClient
     def self.swagger_types
       {
         :'item_id' => :'Integer',
-        :'type_id' => :'Integer',
+        :'location_flag' => :'String',
         :'location_id' => :'Integer',
-        :'quantity' => :'Integer',
-        :'time_efficiency' => :'Integer',
         :'material_efficiency' => :'Integer',
+        :'quantity' => :'Integer',
         :'runs' => :'Integer',
-        :'location_flag' => :'String'
+        :'time_efficiency' => :'Integer',
+        :'type_id' => :'Integer'
       }
     end
 
@@ -101,32 +101,32 @@ module ESIClient
         self.item_id = attributes[:'item_id']
       end
 
-      if attributes.has_key?(:'type_id')
-        self.type_id = attributes[:'type_id']
+      if attributes.has_key?(:'location_flag')
+        self.location_flag = attributes[:'location_flag']
       end
 
       if attributes.has_key?(:'location_id')
         self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'quantity')
-        self.quantity = attributes[:'quantity']
-      end
-
-      if attributes.has_key?(:'time_efficiency')
-        self.time_efficiency = attributes[:'time_efficiency']
-      end
-
       if attributes.has_key?(:'material_efficiency')
         self.material_efficiency = attributes[:'material_efficiency']
       end
 
+      if attributes.has_key?(:'quantity')
+        self.quantity = attributes[:'quantity']
+      end
+
       if attributes.has_key?(:'runs')
         self.runs = attributes[:'runs']
       end
 
-      if attributes.has_key?(:'location_flag')
-        self.location_flag = attributes[:'location_flag']
+      if attributes.has_key?(:'time_efficiency')
+        self.time_efficiency = attributes[:'time_efficiency']
+      end
+
+      if attributes.has_key?(:'type_id')
+        self.type_id = attributes[:'type_id']
       end
     end
 
@@ -138,34 +138,14 @@ module ESIClient
         invalid_properties.push('invalid value for "item_id", item_id cannot be nil.')
       end
 
-      if @type_id.nil?
-        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
+      if @location_flag.nil?
+        invalid_properties.push('invalid value for "location_flag", location_flag cannot be nil.')
       end
 
       if @location_id.nil?
         invalid_properties.push('invalid value for "location_id", location_id cannot be nil.')
       end
 
-      if @quantity.nil?
-        invalid_properties.push('invalid value for "quantity", quantity cannot be nil.')
-      end
-
-      if @quantity < -2
-        invalid_properties.push('invalid value for "quantity", must be greater than or equal to -2.')
-      end
-
-      if @time_efficiency.nil?
-        invalid_properties.push('invalid value for "time_efficiency", time_efficiency cannot be nil.')
-      end
-
-      if @time_efficiency > 20
-        invalid_properties.push('invalid value for "time_efficiency", must be smaller than or equal to 20.')
-      end
-
-      if @time_efficiency < 0
-        invalid_properties.push('invalid value for "time_efficiency", must be greater than or equal to 0.')
-      end
-
       if @material_efficiency.nil?
         invalid_properties.push('invalid value for "material_efficiency", material_efficiency cannot be nil.')
       end
@@ -178,6 +158,14 @@ module ESIClient
         invalid_properties.push('invalid value for "material_efficiency", must be greater than or equal to 0.')
       end
 
+      if @quantity.nil?
+        invalid_properties.push('invalid value for "quantity", quantity cannot be nil.')
+      end
+
+      if @quantity < -2
+        invalid_properties.push('invalid value for "quantity", must be greater than or equal to -2.')
+      end
+
       if @runs.nil?
         invalid_properties.push('invalid value for "runs", runs cannot be nil.')
       end
@@ -186,8 +174,20 @@ module ESIClient
         invalid_properties.push('invalid value for "runs", must be greater than or equal to -1.')
       end
 
-      if @location_flag.nil?
-        invalid_properties.push('invalid value for "location_flag", location_flag cannot be nil.')
+      if @time_efficiency.nil?
+        invalid_properties.push('invalid value for "time_efficiency", time_efficiency cannot be nil.')
+      end
+
+      if @time_efficiency > 20
+        invalid_properties.push('invalid value for "time_efficiency", must be smaller than or equal to 20.')
+      end
+
+      if @time_efficiency < 0
+        invalid_properties.push('invalid value for "time_efficiency", must be greater than or equal to 0.')
+      end
+
+      if @type_id.nil?
+        invalid_properties.push('invalid value for "type_id", type_id cannot be nil.')
       end
 
       invalid_properties
@@ -197,54 +197,32 @@ module ESIClient
     # @return true if the model is valid
     def valid?
       return false if @item_id.nil?
-      return false if @type_id.nil?
+      return false if @location_flag.nil?
+      location_flag_validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifiers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemBay', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'Unlocked', 'Wallet', 'Wardrobe'])
+      return false unless location_flag_validator.valid?(@location_flag)
       return false if @location_id.nil?
-      return false if @quantity.nil?
-      return false if @quantity < -2
-      return false if @time_efficiency.nil?
-      return false if @time_efficiency > 20
-      return false if @time_efficiency < 0
       return false if @material_efficiency.nil?
       return false if @material_efficiency > 25
       return false if @material_efficiency < 0
+      return false if @quantity.nil?
+      return false if @quantity < -2
       return false if @runs.nil?
       return false if @runs < -1
-      return false if @location_flag.nil?
-      location_flag_validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'SubsystemBay', 'Unlocked', 'Wallet', 'Wardrobe'])
-      return false unless location_flag_validator.valid?(@location_flag)
+      return false if @time_efficiency.nil?
+      return false if @time_efficiency > 20
+      return false if @time_efficiency < 0
+      return false if @type_id.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] quantity Value to be assigned
-    def quantity=(quantity)
-      if quantity.nil?
-        fail ArgumentError, 'quantity cannot be nil'
-      end
-
-      if quantity < -2
-        fail ArgumentError, 'invalid value for "quantity", must be greater than or equal to -2.'
-      end
-
-      @quantity = quantity
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] time_efficiency Value to be assigned
-    def time_efficiency=(time_efficiency)
-      if time_efficiency.nil?
-        fail ArgumentError, 'time_efficiency cannot be nil'
-      end
-
-      if time_efficiency > 20
-        fail ArgumentError, 'invalid value for "time_efficiency", must be smaller than or equal to 20.'
-      end
-
-      if time_efficiency < 0
-        fail ArgumentError, 'invalid value for "time_efficiency", must be greater than or equal to 0.'
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] location_flag Object to be assigned
+    def location_flag=(location_flag)
+      validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifiers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemBay', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'Unlocked', 'Wallet', 'Wardrobe'])
+      unless validator.valid?(location_flag)
+        fail ArgumentError, 'invalid value for "location_flag", must be one of #{validator.allowable_values}.'
       end
-
-      @time_efficiency = time_efficiency
+      @location_flag = location_flag
     end
 
     # Custom attribute writer method with validation
@@ -265,6 +243,20 @@ module ESIClient
       @material_efficiency = material_efficiency
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] quantity Value to be assigned
+    def quantity=(quantity)
+      if quantity.nil?
+        fail ArgumentError, 'quantity cannot be nil'
+      end
+
+      if quantity < -2
+        fail ArgumentError, 'invalid value for "quantity", must be greater than or equal to -2.'
+      end
+
+      @quantity = quantity
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] runs Value to be assigned
     def runs=(runs)
@@ -279,14 +271,22 @@ module ESIClient
       @runs = runs
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] location_flag Object to be assigned
-    def location_flag=(location_flag)
-      validator = EnumAttributeValidator.new('String', ['AssetSafety', 'AutoFit', 'Bonus', 'Booster', 'BoosterBay', 'Capsule', 'Cargo', 'CorpDeliveries', 'CorpSAG1', 'CorpSAG2', 'CorpSAG3', 'CorpSAG4', 'CorpSAG5', 'CorpSAG6', 'CorpSAG7', 'CrateLoot', 'Deliveries', 'DroneBay', 'DustBattle', 'DustDatabank', 'FighterBay', 'FighterTube0', 'FighterTube1', 'FighterTube2', 'FighterTube3', 'FighterTube4', 'FleetHangar', 'Hangar', 'HangarAll', 'HiSlot0', 'HiSlot1', 'HiSlot2', 'HiSlot3', 'HiSlot4', 'HiSlot5', 'HiSlot6', 'HiSlot7', 'HiddenModifers', 'Implant', 'Impounded', 'JunkyardReprocessed', 'JunkyardTrashed', 'LoSlot0', 'LoSlot1', 'LoSlot2', 'LoSlot3', 'LoSlot4', 'LoSlot5', 'LoSlot6', 'LoSlot7', 'Locked', 'MedSlot0', 'MedSlot1', 'MedSlot2', 'MedSlot3', 'MedSlot4', 'MedSlot5', 'MedSlot6', 'MedSlot7', 'OfficeFolder', 'Pilot', 'PlanetSurface', 'QuafeBay', 'Reward', 'RigSlot0', 'RigSlot1', 'RigSlot2', 'RigSlot3', 'RigSlot4', 'RigSlot5', 'RigSlot6', 'RigSlot7', 'SecondaryStorage', 'ServiceSlot0', 'ServiceSlot1', 'ServiceSlot2', 'ServiceSlot3', 'ServiceSlot4', 'ServiceSlot5', 'ServiceSlot6', 'ServiceSlot7', 'ShipHangar', 'ShipOffline', 'Skill', 'SkillInTraining', 'SpecializedAmmoHold', 'SpecializedCommandCenterHold', 'SpecializedFuelBay', 'SpecializedGasHold', 'SpecializedIndustrialShipHold', 'SpecializedLargeShipHold', 'SpecializedMaterialBay', 'SpecializedMediumShipHold', 'SpecializedMineralHold', 'SpecializedOreHold', 'SpecializedPlanetaryCommoditiesHold', 'SpecializedSalvageHold', 'SpecializedShipHold', 'SpecializedSmallShipHold', 'StructureActive', 'StructureFuel', 'StructureInactive', 'StructureOffline', 'SubSystemSlot0', 'SubSystemSlot1', 'SubSystemSlot2', 'SubSystemSlot3', 'SubSystemSlot4', 'SubSystemSlot5', 'SubSystemSlot6', 'SubSystemSlot7', 'SubsystemBay', 'Unlocked', 'Wallet', 'Wardrobe'])
-      unless validator.valid?(location_flag)
-        fail ArgumentError, 'invalid value for "location_flag", must be one of #{validator.allowable_values}.'
+    # Custom attribute writer method with validation
+    # @param [Object] time_efficiency Value to be assigned
+    def time_efficiency=(time_efficiency)
+      if time_efficiency.nil?
+        fail ArgumentError, 'time_efficiency cannot be nil'
       end
-      @location_flag = location_flag
+
+      if time_efficiency > 20
+        fail ArgumentError, 'invalid value for "time_efficiency", must be smaller than or equal to 20.'
+      end
+
+      if time_efficiency < 0
+        fail ArgumentError, 'invalid value for "time_efficiency", must be greater than or equal to 0.'
+      end
+
+      @time_efficiency = time_efficiency
     end
 
     # Checks equality by comparing each attribute.
@@ -295,13 +295,13 @@ module ESIClient
       return true if self.equal?(o)
       self.class == o.class &&
           item_id == o.item_id &&
-          type_id == o.type_id &&
+          location_flag == o.location_flag &&
           location_id == o.location_id &&
-          quantity == o.quantity &&
-          time_efficiency == o.time_efficiency &&
           material_efficiency == o.material_efficiency &&
+          quantity == o.quantity &&
           runs == o.runs &&
-          location_flag == o.location_flag
+          time_efficiency == o.time_efficiency &&
+          type_id == o.type_id
     end
 
     # @see the `==` method
@@ -313,7 +313,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [item_id, type_id, location_id, quantity, time_efficiency, material_efficiency, runs, location_flag].hash
+      [item_id, location_flag, location_id, material_efficiency, quantity, runs, time_efficiency, type_id].hash
     end
 
     # Builds the object from hash

data/lib/esi_client/models/get_corporations_corporation_id_bookmarks_200_ok.rb

@@ -3,7 +3,7 @@
 
 #An OpenAPI for EVE Online
 
-OpenAPI spec version: 0.7.6
+OpenAPI spec version: 0.8.5
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
 Swagger Codegen version: 2.4.0-SNAPSHOT
@@ -18,40 +18,40 @@ module ESIClient
     # bookmark_id integer
     attr_accessor :bookmark_id
 
+    attr_accessor :coordinates
+
+    # created string
+    attr_accessor :created
+
     # creator_id integer
     attr_accessor :creator_id
 
     # folder_id integer
     attr_accessor :folder_id
 
-    # created string
-    attr_accessor :created
+    attr_accessor :item
 
     # label string
     attr_accessor :label
 
-    # notes string
-    attr_accessor :notes
-
     # location_id integer
     attr_accessor :location_id
 
-    attr_accessor :item
-
-    attr_accessor :coordinates
+    # notes string
+    attr_accessor :notes
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'bookmark_id' => :'bookmark_id',
+        :'coordinates' => :'coordinates',
+        :'created' => :'created',
         :'creator_id' => :'creator_id',
         :'folder_id' => :'folder_id',
-        :'created' => :'created',
+        :'item' => :'item',
         :'label' => :'label',
-        :'notes' => :'notes',
         :'location_id' => :'location_id',
-        :'item' => :'item',
-        :'coordinates' => :'coordinates'
+        :'notes' => :'notes'
       }
     end
 
@@ -59,14 +59,14 @@ module ESIClient
     def self.swagger_types
       {
         :'bookmark_id' => :'Integer',
+        :'coordinates' => :'GetCorporationsCorporationIdBookmarksCoordinates',
+        :'created' => :'DateTime',
         :'creator_id' => :'Integer',
         :'folder_id' => :'Integer',
-        :'created' => :'DateTime',
+        :'item' => :'GetCorporationsCorporationIdBookmarksItem',
         :'label' => :'String',
-        :'notes' => :'String',
         :'location_id' => :'Integer',
-        :'item' => :'GetCorporationsCorporationIdBookmarksItem',
-        :'coordinates' => :'GetCorporationsCorporationIdBookmarksCoordinates'
+        :'notes' => :'String'
       }
     end
 
@@ -82,6 +82,14 @@ module ESIClient
         self.bookmark_id = attributes[:'bookmark_id']
       end
 
+      if attributes.has_key?(:'coordinates')
+        self.coordinates = attributes[:'coordinates']
+      end
+
+      if attributes.has_key?(:'created')
+        self.created = attributes[:'created']
+      end
+
       if attributes.has_key?(:'creator_id')
         self.creator_id = attributes[:'creator_id']
       end
@@ -90,28 +98,20 @@ module ESIClient
         self.folder_id = attributes[:'folder_id']
       end
 
-      if attributes.has_key?(:'created')
-        self.created = attributes[:'created']
+      if attributes.has_key?(:'item')
+        self.item = attributes[:'item']
       end
 
       if attributes.has_key?(:'label')
         self.label = attributes[:'label']
       end
 
-      if attributes.has_key?(:'notes')
-        self.notes = attributes[:'notes']
-      end
-
       if attributes.has_key?(:'location_id')
         self.location_id = attributes[:'location_id']
       end
 
-      if attributes.has_key?(:'item')
-        self.item = attributes[:'item']
-      end
-
-      if attributes.has_key?(:'coordinates')
-        self.coordinates = attributes[:'coordinates']
+      if attributes.has_key?(:'notes')
+        self.notes = attributes[:'notes']
       end
     end
 
@@ -123,26 +123,26 @@ module ESIClient
         invalid_properties.push('invalid value for "bookmark_id", bookmark_id cannot be nil.')
       end
 
-      if @creator_id.nil?
-        invalid_properties.push('invalid value for "creator_id", creator_id cannot be nil.')
-      end
-
       if @created.nil?
         invalid_properties.push('invalid value for "created", created cannot be nil.')
       end
 
-      if @label.nil?
-        invalid_properties.push('invalid value for "label", label cannot be nil.')
+      if @creator_id.nil?
+        invalid_properties.push('invalid value for "creator_id", creator_id cannot be nil.')
       end
 
-      if @notes.nil?
-        invalid_properties.push('invalid value for "notes", notes cannot be nil.')
+      if @label.nil?
+        invalid_properties.push('invalid value for "label", label cannot be nil.')
       end
 
       if @location_id.nil?
         invalid_properties.push('invalid value for "location_id", location_id cannot be nil.')
       end
 
+      if @notes.nil?
+        invalid_properties.push('invalid value for "notes", notes cannot be nil.')
+      end
+
       invalid_properties
     end
 
@@ -150,11 +150,11 @@ module ESIClient
     # @return true if the model is valid
     def valid?
       return false if @bookmark_id.nil?
-      return false if @creator_id.nil?
       return false if @created.nil?
+      return false if @creator_id.nil?
       return false if @label.nil?
-      return false if @notes.nil?
       return false if @location_id.nil?
+      return false if @notes.nil?
       true
     end
 
@@ -164,14 +164,14 @@ module ESIClient
       return true if self.equal?(o)
       self.class == o.class &&
           bookmark_id == o.bookmark_id &&
+          coordinates == o.coordinates &&
+          created == o.created &&
           creator_id == o.creator_id &&
           folder_id == o.folder_id &&
-          created == o.created &&
+          item == o.item &&
           label == o.label &&
-          notes == o.notes &&
           location_id == o.location_id &&
-          item == o.item &&
-          coordinates == o.coordinates
+          notes == o.notes
     end
 
     # @see the `==` method
@@ -183,7 +183,7 @@ module ESIClient
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [bookmark_id, creator_id, folder_id, created, label, notes, location_id, item, coordinates].hash
+      [bookmark_id, coordinates, created, creator_id, folder_id, item, label, location_id, notes].hash
     end
 
     # Builds the object from hash