pulp_container_client 2.22.0 → 2.23.0

data/lib/pulp_container_client/models/container_container_pull_through_remote.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 Contact: pulp-list@redhat.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+Generator version: 7.10.0
 
 =end
 
 require 'date'
+require 'time'
 
 module PulpContainerClient
   # A serializer for a remote used in the pull-through distribution.
@@ -82,6 +83,28 @@ module PulpContainerClient
     #              A list of remotes to exclude during pull-through caching.             Wildcards *, ? are recognized.             'excludes' is evaluated after 'includes'.             
     attr_accessor :excludes
 
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -111,6 +134,11 @@ module PulpContainerClient
       }
     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
       {
@@ -180,10 +208,14 @@ module PulpContainerClient
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'url')
         self.url = attributes[:'url']
+      else
+        self.url = nil
       end
 
       if attributes.key?(:'ca_cert')
@@ -282,6 +314,7 @@ module PulpContainerClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
@@ -335,20 +368,20 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "download_concurrency", must be greater than or equal to 1.')
       end
 
-      if !@total_timeout.nil? && @total_timeout < 0
-        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.')
+      if !@total_timeout.nil? && @total_timeout < 0.0
+        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.0.')
       end
 
-      if !@connect_timeout.nil? && @connect_timeout < 0
-        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.')
+      if !@connect_timeout.nil? && @connect_timeout < 0.0
+        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.0.')
       end
 
-      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
-        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.')
+      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
+        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.')
       end
 
-      if !@sock_read_timeout.nil? && @sock_read_timeout < 0
-        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.')
+      if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
+        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.0.')
       end
 
       invalid_properties
@@ -357,6 +390,7 @@ module PulpContainerClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @name.nil?
       return false if @name.to_s.length < 1
       return false if @url.nil?
@@ -370,10 +404,10 @@ module PulpContainerClient
       return false if !@username.nil? && @username.to_s.length < 1
       return false if !@password.nil? && @password.to_s.length < 1
       return false if !@download_concurrency.nil? && @download_concurrency < 1
-      return false if !@total_timeout.nil? && @total_timeout < 0
-      return false if !@connect_timeout.nil? && @connect_timeout < 0
-      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
-      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0
+      return false if !@total_timeout.nil? && @total_timeout < 0.0
+      return false if !@connect_timeout.nil? && @connect_timeout < 0.0
+      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
+      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
       true
     end
 
@@ -498,8 +532,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] total_timeout Value to be assigned
     def total_timeout=(total_timeout)
-      if !total_timeout.nil? && total_timeout < 0
-        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.'
+      if !total_timeout.nil? && total_timeout < 0.0
+        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.0.'
       end
 
       @total_timeout = total_timeout
@@ -508,8 +542,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] connect_timeout Value to be assigned
     def connect_timeout=(connect_timeout)
-      if !connect_timeout.nil? && connect_timeout < 0
-        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.'
+      if !connect_timeout.nil? && connect_timeout < 0.0
+        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.0.'
       end
 
       @connect_timeout = connect_timeout
@@ -518,8 +552,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_connect_timeout Value to be assigned
     def sock_connect_timeout=(sock_connect_timeout)
-      if !sock_connect_timeout.nil? && sock_connect_timeout < 0
-        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.'
+      if !sock_connect_timeout.nil? && sock_connect_timeout < 0.0
+        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.'
       end
 
       @sock_connect_timeout = sock_connect_timeout
@@ -528,8 +562,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_read_timeout Value to be assigned
     def sock_read_timeout=(sock_read_timeout)
-      if !sock_read_timeout.nil? && sock_read_timeout < 0
-        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.'
+      if !sock_read_timeout.nil? && sock_read_timeout < 0.0
+        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.0.'
       end
 
       @sock_read_timeout = sock_read_timeout
@@ -581,37 +615,33 @@ module PulpContainerClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[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]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -641,7 +671,9 @@ module PulpContainerClient
           end
         end
       else # model
-        PulpContainerClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = PulpContainerClient.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -667,7 +699,7 @@ module PulpContainerClient
           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
@@ -690,5 +722,7 @@ module PulpContainerClient
         value
       end
     end
+
   end
+
 end

data/lib/pulp_container_client/models/container_container_pull_through_remote_response.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 Contact: pulp-list@redhat.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+Generator version: 7.10.0
 
 =end
 
 require 'date'
+require 'time'
 
 module PulpContainerClient
   # A serializer for a remote used in the pull-through distribution.
@@ -81,6 +82,28 @@ module PulpContainerClient
     #              A list of remotes to exclude during pull-through caching.             Wildcards *, ? are recognized.             'excludes' is evaluated after 'includes'.             
     attr_accessor :excludes
 
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -110,13 +133,18 @@ module PulpContainerClient
       }
     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
       {
         :'pulp_href' => :'String',
         :'prn' => :'String',
-        :'pulp_created' => :'DateTime',
-        :'pulp_last_updated' => :'DateTime',
+        :'pulp_created' => :'Time',
+        :'pulp_last_updated' => :'Time',
         :'name' => :'String',
         :'url' => :'String',
         :'ca_cert' => :'String',
@@ -133,7 +161,7 @@ module PulpContainerClient
         :'sock_read_timeout' => :'Float',
         :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer',
-        :'hidden_fields' => :'Array<ContainerContainerPullThroughRemoteResponseHiddenFields>',
+        :'hidden_fields' => :'Array<ContainerContainerPullThroughRemoteResponseHiddenFieldsInner>',
         :'includes' => :'Array<String>',
         :'excludes' => :'Array<String>'
       }
@@ -190,10 +218,14 @@ module PulpContainerClient
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'url')
         self.url = attributes[:'url']
+      else
+        self.url = nil
       end
 
       if attributes.key?(:'ca_cert')
@@ -278,6 +310,7 @@ module PulpContainerClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
@@ -291,20 +324,20 @@ module PulpContainerClient
         invalid_properties.push('invalid value for "download_concurrency", must be greater than or equal to 1.')
       end
 
-      if !@total_timeout.nil? && @total_timeout < 0
-        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.')
+      if !@total_timeout.nil? && @total_timeout < 0.0
+        invalid_properties.push('invalid value for "total_timeout", must be greater than or equal to 0.0.')
       end
 
-      if !@connect_timeout.nil? && @connect_timeout < 0
-        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.')
+      if !@connect_timeout.nil? && @connect_timeout < 0.0
+        invalid_properties.push('invalid value for "connect_timeout", must be greater than or equal to 0.0.')
       end
 
-      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
-        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.')
+      if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
+        invalid_properties.push('invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.')
       end
 
-      if !@sock_read_timeout.nil? && @sock_read_timeout < 0
-        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.')
+      if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
+        invalid_properties.push('invalid value for "sock_read_timeout", must be greater than or equal to 0.0.')
       end
 
       invalid_properties
@@ -313,13 +346,14 @@ module PulpContainerClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @name.nil?
       return false if @url.nil?
       return false if !@download_concurrency.nil? && @download_concurrency < 1
-      return false if !@total_timeout.nil? && @total_timeout < 0
-      return false if !@connect_timeout.nil? && @connect_timeout < 0
-      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0
-      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0
+      return false if !@total_timeout.nil? && @total_timeout < 0.0
+      return false if !@connect_timeout.nil? && @connect_timeout < 0.0
+      return false if !@sock_connect_timeout.nil? && @sock_connect_timeout < 0.0
+      return false if !@sock_read_timeout.nil? && @sock_read_timeout < 0.0
       true
     end
 
@@ -336,8 +370,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] total_timeout Value to be assigned
     def total_timeout=(total_timeout)
-      if !total_timeout.nil? && total_timeout < 0
-        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.'
+      if !total_timeout.nil? && total_timeout < 0.0
+        fail ArgumentError, 'invalid value for "total_timeout", must be greater than or equal to 0.0.'
       end
 
       @total_timeout = total_timeout
@@ -346,8 +380,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] connect_timeout Value to be assigned
     def connect_timeout=(connect_timeout)
-      if !connect_timeout.nil? && connect_timeout < 0
-        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.'
+      if !connect_timeout.nil? && connect_timeout < 0.0
+        fail ArgumentError, 'invalid value for "connect_timeout", must be greater than or equal to 0.0.'
       end
 
       @connect_timeout = connect_timeout
@@ -356,8 +390,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_connect_timeout Value to be assigned
     def sock_connect_timeout=(sock_connect_timeout)
-      if !sock_connect_timeout.nil? && sock_connect_timeout < 0
-        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.'
+      if !sock_connect_timeout.nil? && sock_connect_timeout < 0.0
+        fail ArgumentError, 'invalid value for "sock_connect_timeout", must be greater than or equal to 0.0.'
       end
 
       @sock_connect_timeout = sock_connect_timeout
@@ -366,8 +400,8 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sock_read_timeout Value to be assigned
     def sock_read_timeout=(sock_read_timeout)
-      if !sock_read_timeout.nil? && sock_read_timeout < 0
-        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.'
+      if !sock_read_timeout.nil? && sock_read_timeout < 0.0
+        fail ArgumentError, 'invalid value for "sock_read_timeout", must be greater than or equal to 0.0.'
       end
 
       @sock_read_timeout = sock_read_timeout
@@ -419,37 +453,33 @@ module PulpContainerClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[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]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -479,7 +509,9 @@ module PulpContainerClient
           end
         end
       else # model
-        PulpContainerClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = PulpContainerClient.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -505,7 +537,7 @@ module PulpContainerClient
           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
@@ -528,5 +560,7 @@ module PulpContainerClient
         value
       end
     end
+
   end
+
 end

data/lib/pulp_container_client/models/{container_container_pull_through_remote_response_hidden_fields.rb → container_container_pull_through_remote_response_hidden_fields_inner.rb}

@@ -6,14 +6,15 @@
 The version of the OpenAPI document: v3
 Contact: pulp-list@redhat.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+Generator version: 7.10.0
 
 =end
 
 require 'date'
+require 'time'
 
 module PulpContainerClient
-  class ContainerContainerPullThroughRemoteResponseHiddenFields
+  class ContainerContainerPullThroughRemoteResponseHiddenFieldsInner
     attr_accessor :name
 
     attr_accessor :is_set
@@ -26,6 +27,11 @@ module PulpContainerClient
       }
     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
       {
@@ -44,29 +50,34 @@ module PulpContainerClient
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PulpContainerClient::ContainerContainerPullThroughRemoteResponseHiddenFields` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PulpContainerClient::ContainerContainerPullThroughRemoteResponseHiddenFieldsInner` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PulpContainerClient::ContainerContainerPullThroughRemoteResponseHiddenFields`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PulpContainerClient::ContainerContainerPullThroughRemoteResponseHiddenFieldsInner`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'is_set')
         self.is_set = attributes[:'is_set']
+      else
+        self.is_set = nil
       end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
@@ -82,6 +93,7 @@ module PulpContainerClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @name.nil?
       return false if @is_set.nil?
       true
@@ -112,37 +124,33 @@ module PulpContainerClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{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)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[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]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -172,7 +180,9 @@ module PulpContainerClient
           end
         end
       else # model
-        PulpContainerClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = PulpContainerClient.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -198,7 +208,7 @@ module PulpContainerClient
           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
@@ -221,5 +231,7 @@ module PulpContainerClient
         value
       end
     end
+
   end
+
 end