pulp_container_client 2.22.0 → 2.23.0

data/lib/pulp_container_client/models/container_container_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 ContainerRemote.
@@ -89,6 +90,28 @@ module PulpContainerClient
     # A URL to a sigstore to download image signatures from
     attr_accessor :sigstore
 
+    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
       {
@@ -120,6 +143,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
       {
@@ -191,10 +219,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')
@@ -279,6 +311,8 @@ module PulpContainerClient
 
       if attributes.key?(:'upstream_name')
         self.upstream_name = attributes[:'upstream_name']
+      else
+        self.upstream_name = nil
       end
 
       if attributes.key?(:'include_tags')
@@ -301,6 +335,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.')
@@ -354,20 +389,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
 
       if @upstream_name.nil?
@@ -388,6 +423,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?
@@ -401,10 +437,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
       return false if @upstream_name.nil?
       return false if @upstream_name.to_s.length < 1
       return false if !@sigstore.nil? && @sigstore.to_s.length < 1
@@ -532,8 +568,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
@@ -542,8 +578,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
@@ -552,8 +588,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
@@ -562,8 +598,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
@@ -586,7 +622,11 @@ module PulpContainerClient
     # Custom attribute writer method with validation
     # @param [Object] sigstore Value to be assigned
     def sigstore=(sigstore)
-      if !sigstore.nil? && sigstore.to_s.length < 1
+      if sigstore.nil?
+        fail ArgumentError, 'sigstore cannot be nil'
+      end
+
+      if sigstore.to_s.length < 1
         fail ArgumentError, 'invalid value for "sigstore", the character length must be great than or equal to 1.'
       end
 
@@ -641,37 +681,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
@@ -701,7 +737,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
 
@@ -727,7 +765,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
@@ -750,5 +788,7 @@ module PulpContainerClient
         value
       end
     end
+
   end
+
 end

data/lib/pulp_container_client/models/container_container_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 ContainerRemote.
@@ -88,6 +89,28 @@ module PulpContainerClient
     # A URL to a sigstore to download image signatures from
     attr_accessor :sigstore
 
+    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
       {
@@ -119,13 +142,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',
@@ -142,7 +170,7 @@ module PulpContainerClient
         :'sock_read_timeout' => :'Float',
         :'headers' => :'Array<Object>',
         :'rate_limit' => :'Integer',
-        :'hidden_fields' => :'Array<ContainerContainerPullThroughRemoteResponseHiddenFields>',
+        :'hidden_fields' => :'Array<ContainerContainerPullThroughRemoteResponseHiddenFieldsInner>',
         :'upstream_name' => :'String',
         :'include_tags' => :'Array<String>',
         :'exclude_tags' => :'Array<String>',
@@ -201,10 +229,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')
@@ -275,6 +307,8 @@ module PulpContainerClient
 
       if attributes.key?(:'upstream_name')
         self.upstream_name = attributes[:'upstream_name']
+      else
+        self.upstream_name = nil
       end
 
       if attributes.key?(:'include_tags')
@@ -297,6 +331,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.')
@@ -310,20 +345,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
 
       if @upstream_name.nil?
@@ -336,13 +371,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
       return false if @upstream_name.nil?
       true
     end
@@ -360,8 +396,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
@@ -370,8 +406,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
@@ -380,8 +416,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
@@ -390,8 +426,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
@@ -445,37 +481,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
@@ -505,7 +537,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
 
@@ -531,7 +565,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
@@ -554,5 +588,7 @@ module PulpContainerClient
         value
       end
     end
+
   end
+
 end

data/lib/pulp_container_client/models/container_container_repository.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
   # Serializer for Container Repositories.
@@ -44,6 +45,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
       {
@@ -89,6 +95,8 @@ module PulpContainerClient
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'description')
@@ -111,6 +119,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.')
@@ -134,6 +143,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 !@description.nil? && @description.to_s.length < 1
@@ -204,37 +214,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
@@ -264,7 +270,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
 
@@ -290,7 +298,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
@@ -313,5 +321,7 @@ module PulpContainerClient
         value
       end
     end
+
   end
+
 end