ibm_cloud_power 1.1.1 → 2.1.0

data/lib/ibm_cloud_power/models/event.rb

@@ -6,40 +6,41 @@
 The version of the OpenAPI document: 1.0.0
 Contact: kylej@us.ibm.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-beta2
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class Event
+    # Type of action for this event
+    attr_accessor :action
+
     # ID of the Activity
     attr_accessor :event_id
 
-    # Time of activity in ISO 8601 - RFC3339
-    attr_accessor :time
-
-    # Time of activity in unix epoch
-    attr_accessor :timestamp
-
-    attr_accessor :user
-
     # Level of the event (notice, info, warning, error)
     attr_accessor :level
 
-    # Type of resource for this event
-    attr_accessor :resource
-
-    # Type of action for this event
-    attr_accessor :action
-
     # The (translated) message of the event
     attr_accessor :message
 
     # Any metadata associated with the event
     attr_accessor :metadata
 
+    # Type of resource for this event
+    attr_accessor :resource
+
+    # Time of activity in ISO 8601 - RFC3339
+    attr_accessor :time
+
+    # Time of activity in unix epoch
+    attr_accessor :timestamp
+
+    attr_accessor :user
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -65,30 +66,35 @@ module IbmCloudPower
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'action' => :'action',
         :'event_id' => :'eventID',
-        :'time' => :'time',
-        :'timestamp' => :'timestamp',
-        :'user' => :'user',
         :'level' => :'level',
-        :'resource' => :'resource',
-        :'action' => :'action',
         :'message' => :'message',
-        :'metadata' => :'metadata'
+        :'metadata' => :'metadata',
+        :'resource' => :'resource',
+        :'time' => :'time',
+        :'timestamp' => :'timestamp',
+        :'user' => :'user'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'action' => :'String',
         :'event_id' => :'String',
-        :'time' => :'DateTime',
-        :'timestamp' => :'Integer',
-        :'user' => :'EventUser',
         :'level' => :'String',
-        :'resource' => :'String',
-        :'action' => :'String',
         :'message' => :'String',
-        :'metadata' => :'Object'
+        :'metadata' => :'Object',
+        :'resource' => :'String',
+        :'time' => :'Time',
+        :'timestamp' => :'Integer',
+        :'user' => :'EventUser'
       }
     end
 
@@ -113,40 +119,40 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'event_id')
-        self.event_id = attributes[:'event_id']
+      if attributes.key?(:'action')
+        self.action = attributes[:'action']
       end
 
-      if attributes.key?(:'time')
-        self.time = attributes[:'time']
+      if attributes.key?(:'event_id')
+        self.event_id = attributes[:'event_id']
       end
 
-      if attributes.key?(:'timestamp')
-        self.timestamp = attributes[:'timestamp']
+      if attributes.key?(:'level')
+        self.level = attributes[:'level']
       end
 
-      if attributes.key?(:'user')
-        self.user = attributes[:'user']
+      if attributes.key?(:'message')
+        self.message = attributes[:'message']
       end
 
-      if attributes.key?(:'level')
-        self.level = attributes[:'level']
+      if attributes.key?(:'metadata')
+        self.metadata = attributes[:'metadata']
       end
 
       if attributes.key?(:'resource')
         self.resource = attributes[:'resource']
       end
 
-      if attributes.key?(:'action')
-        self.action = attributes[:'action']
+      if attributes.key?(:'time')
+        self.time = attributes[:'time']
       end
 
-      if attributes.key?(:'message')
-        self.message = attributes[:'message']
+      if attributes.key?(:'timestamp')
+        self.timestamp = attributes[:'timestamp']
       end
 
-      if attributes.key?(:'metadata')
-        self.metadata = attributes[:'metadata']
+      if attributes.key?(:'user')
+        self.user = attributes[:'user']
       end
     end
 
@@ -154,32 +160,32 @@ module IbmCloudPower
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if @event_id.nil?
-        invalid_properties.push('invalid value for "event_id", event_id cannot be nil.')
-      end
-
-      if @time.nil?
-        invalid_properties.push('invalid value for "time", time cannot be nil.')
+      if @action.nil?
+        invalid_properties.push('invalid value for "action", action cannot be nil.')
       end
 
-      if @timestamp.nil?
-        invalid_properties.push('invalid value for "timestamp", timestamp cannot be nil.')
+      if @event_id.nil?
+        invalid_properties.push('invalid value for "event_id", event_id cannot be nil.')
       end
 
       if @level.nil?
         invalid_properties.push('invalid value for "level", level cannot be nil.')
       end
 
+      if @message.nil?
+        invalid_properties.push('invalid value for "message", message cannot be nil.')
+      end
+
       if @resource.nil?
         invalid_properties.push('invalid value for "resource", resource cannot be nil.')
       end
 
-      if @action.nil?
-        invalid_properties.push('invalid value for "action", action cannot be nil.')
+      if @time.nil?
+        invalid_properties.push('invalid value for "time", time cannot be nil.')
       end
 
-      if @message.nil?
-        invalid_properties.push('invalid value for "message", message cannot be nil.')
+      if @timestamp.nil?
+        invalid_properties.push('invalid value for "timestamp", timestamp cannot be nil.')
       end
 
       invalid_properties
@@ -188,15 +194,15 @@ module IbmCloudPower
     # 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 @action.nil?
       return false if @event_id.nil?
-      return false if @time.nil?
-      return false if @timestamp.nil?
       return false if @level.nil?
       level_validator = EnumAttributeValidator.new('String', ["notice", "info", "warning", "error"])
       return false unless level_validator.valid?(@level)
-      return false if @resource.nil?
-      return false if @action.nil?
       return false if @message.nil?
+      return false if @resource.nil?
+      return false if @time.nil?
+      return false if @timestamp.nil?
       true
     end
 
@@ -215,15 +221,15 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          action == o.action &&
           event_id == o.event_id &&
-          time == o.time &&
-          timestamp == o.timestamp &&
-          user == o.user &&
           level == o.level &&
-          resource == o.resource &&
-          action == o.action &&
           message == o.message &&
-          metadata == o.metadata
+          metadata == o.metadata &&
+          resource == o.resource &&
+          time == o.time &&
+          timestamp == o.timestamp &&
+          user == o.user
     end
 
     # @see the `==` method
@@ -235,7 +241,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [event_id, time, timestamp, user, level, resource, action, message, metadata].hash
+      [action, event_id, level, message, metadata, resource, time, timestamp, user].hash
     end
 
     # Builds the object from hash
@@ -250,8 +256,11 @@ module IbmCloudPower
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -259,8 +268,6 @@ module IbmCloudPower
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -273,8 +280,8 @@ module IbmCloudPower
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -304,7 +311,9 @@ module IbmCloudPower
           end
         end
       else # model
-        IbmCloudPower.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = IbmCloudPower.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -330,7 +339,7 @@ module IbmCloudPower
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -353,5 +362,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/event_user.rb

@@ -6,38 +6,44 @@
 The version of the OpenAPI document: 1.0.0
 Contact: kylej@us.ibm.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-beta2
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class EventUser
-    # ID of user who created/caused the event
-    attr_accessor :user_id
+    # Email of the User
+    attr_accessor :email
 
     # Name of the User
     attr_accessor :name
 
-    # Email of the User
-    attr_accessor :email
+    # ID of user who created/caused the event
+    attr_accessor :user_id
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'user_id' => :'userID',
+        :'email' => :'email',
         :'name' => :'name',
-        :'email' => :'email'
+        :'user_id' => :'userID'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'user_id' => :'String',
+        :'email' => :'String',
         :'name' => :'String',
-        :'email' => :'String'
+        :'user_id' => :'String'
       }
     end
 
@@ -62,16 +68,16 @@ module IbmCloudPower
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'user_id')
-        self.user_id = attributes[:'user_id']
+      if attributes.key?(:'email')
+        self.email = attributes[:'email']
       end
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'email')
-        self.email = attributes[:'email']
+      if attributes.key?(:'user_id')
+        self.user_id = attributes[:'user_id']
       end
     end
 
@@ -98,9 +104,9 @@ module IbmCloudPower
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          user_id == o.user_id &&
+          email == o.email &&
           name == o.name &&
-          email == o.email
+          user_id == o.user_id
     end
 
     # @see the `==` method
@@ -112,7 +118,7 @@ module IbmCloudPower
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [user_id, name, email].hash
+      [email, name, user_id].hash
     end
 
     # Builds the object from hash
@@ -127,8 +133,11 @@ module IbmCloudPower
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -136,8 +145,6 @@ module IbmCloudPower
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -150,8 +157,8 @@ module IbmCloudPower
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -181,7 +188,9 @@ module IbmCloudPower
           end
         end
       else # model
-        IbmCloudPower.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = IbmCloudPower.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -207,7 +216,7 @@ module IbmCloudPower
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -230,5 +239,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end

data/lib/ibm_cloud_power/models/events.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: 1.0.0
 Contact: kylej@us.ibm.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-beta2
+OpenAPI Generator version: 6.2.1
 
 =end
 
 require 'date'
+require 'time'
 
 module IbmCloudPower
   class Events
@@ -24,6 +25,11 @@ module IbmCloudPower
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -109,8 +115,11 @@ module IbmCloudPower
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -118,8 +127,6 @@ module IbmCloudPower
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -132,8 +139,8 @@ module IbmCloudPower
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -163,7 +170,9 @@ module IbmCloudPower
           end
         end
       else # model
-        IbmCloudPower.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = IbmCloudPower.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -189,7 +198,7 @@ module IbmCloudPower
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -212,5 +221,7 @@ module IbmCloudPower
         value
       end
     end
+
   end
+
 end