svix 1.38.0 → 1.39.0

data/lib/svix/models/event_type_example_out.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.1.1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0
+Generator version: 7.9.0
 
 =end
 
@@ -61,12 +61,15 @@ module Svix
         if (value = attributes[:'example']).is_a?(Hash)
           self.example = value
         end
+      else
+        self.example = 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 @example.nil?
         invalid_properties.push('invalid value for "example", example cannot be nil.')
@@ -78,6 +81,7 @@ module Svix
     # 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 @example.nil?
       true
     end
@@ -106,36 +110,30 @@ module Svix
     # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      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]]))
+        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 :Time
         Time.parse(value)
@@ -170,7 +168,7 @@ module Svix
       else # model
         # models (e.g. Pet) or oneOf
         klass = Svix.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/svix/models/event_type_from_open_api.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.1.1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0
+Generator version: 7.9.0
 
 =end
 
@@ -19,6 +19,11 @@ module Svix
 
     attr_accessor :description
 
+    attr_accessor :feature_flag
+
+    # The event type group's name
+    attr_accessor :group_name
+
     # The event type's name
     attr_accessor :name
 
@@ -29,6 +34,8 @@ module Svix
       {
         :'deprecated' => :'deprecated',
         :'description' => :'description',
+        :'feature_flag' => :'featureFlag',
+        :'group_name' => :'groupName',
         :'name' => :'name',
         :'schemas' => :'schemas'
       }
@@ -44,6 +51,8 @@ module Svix
       {
         :'deprecated' => :'Boolean',
         :'description' => :'String',
+        :'feature_flag' => :'String',
+        :'group_name' => :'String',
         :'name' => :'String',
         :'schemas' => :'Hash<String, Object>'
       }
@@ -52,6 +61,8 @@ module Svix
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'feature_flag',
+        :'group_name',
         :'schemas'
       ])
     end
@@ -73,14 +84,28 @@ module Svix
 
       if attributes.key?(:'deprecated')
         self.deprecated = attributes[:'deprecated']
+      else
+        self.deprecated = nil
       end
 
       if attributes.key?(:'description')
         self.description = attributes[:'description']
+      else
+        self.description = nil
+      end
+
+      if attributes.key?(:'feature_flag')
+        self.feature_flag = attributes[:'feature_flag']
+      end
+
+      if attributes.key?(:'group_name')
+        self.group_name = attributes[:'group_name']
       end
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'schemas')
@@ -93,6 +118,7 @@ module Svix
     # 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 @deprecated.nil?
         invalid_properties.push('invalid value for "deprecated", deprecated cannot be nil.')
@@ -102,6 +128,24 @@ module Svix
         invalid_properties.push('invalid value for "description", description cannot be nil.')
       end
 
+      if !@feature_flag.nil? && @feature_flag.to_s.length > 256
+        invalid_properties.push('invalid value for "feature_flag", the character length must be smaller than or equal to 256.')
+      end
+
+      pattern = Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
+      if !@feature_flag.nil? && @feature_flag !~ pattern
+        invalid_properties.push("invalid value for \"feature_flag\", must conform to the pattern #{pattern}.")
+      end
+
+      if !@group_name.nil? && @group_name.to_s.length > 256
+        invalid_properties.push('invalid value for "group_name", the character length must be smaller than or equal to 256.')
+      end
+
+      pattern = Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
+      if !@group_name.nil? && @group_name !~ pattern
+        invalid_properties.push("invalid value for \"group_name\", must conform to the pattern #{pattern}.")
+      end
+
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
       end
@@ -121,14 +165,49 @@ module Svix
     # 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 @deprecated.nil?
       return false if @description.nil?
+      return false if !@feature_flag.nil? && @feature_flag.to_s.length > 256
+      return false if !@feature_flag.nil? && @feature_flag !~ Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
+      return false if !@group_name.nil? && @group_name.to_s.length > 256
+      return false if !@group_name.nil? && @group_name !~ Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
       return false if @name.nil?
       return false if @name.to_s.length > 256
       return false if @name !~ Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] feature_flag Value to be assigned
+    def feature_flag=(feature_flag)
+      if !feature_flag.nil? && feature_flag.to_s.length > 256
+        fail ArgumentError, 'invalid value for "feature_flag", the character length must be smaller than or equal to 256.'
+      end
+
+      pattern = Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
+      if !feature_flag.nil? && feature_flag !~ pattern
+        fail ArgumentError, "invalid value for \"feature_flag\", must conform to the pattern #{pattern}."
+      end
+
+      @feature_flag = feature_flag
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] group_name Value to be assigned
+    def group_name=(group_name)
+      if !group_name.nil? && group_name.to_s.length > 256
+        fail ArgumentError, 'invalid value for "group_name", the character length must be smaller than or equal to 256.'
+      end
+
+      pattern = Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
+      if !group_name.nil? && group_name !~ pattern
+        fail ArgumentError, "invalid value for \"group_name\", must conform to the pattern #{pattern}."
+      end
+
+      @group_name = group_name
+    end
+
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
@@ -155,6 +234,8 @@ module Svix
       self.class == o.class &&
           deprecated == o.deprecated &&
           description == o.description &&
+          feature_flag == o.feature_flag &&
+          group_name == o.group_name &&
           name == o.name &&
           schemas == o.schemas
     end
@@ -168,43 +249,37 @@ module Svix
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [deprecated, description, name, schemas].hash
+      [deprecated, description, feature_flag, group_name, name, schemas].hash
     end
 
     # Builds the object from hash
     # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      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]]))
+        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 :Time
         Time.parse(value)
@@ -239,7 +314,7 @@ module Svix
       else # model
         # models (e.g. Pet) or oneOf
         klass = Svix.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/svix/models/event_type_import_open_api_in.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.1.1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0
+Generator version: 7.9.0
 
 =end
 
@@ -91,6 +91,7 @@ module Svix
     # 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
       invalid_properties
     end
@@ -98,6 +99,7 @@ module Svix
     # 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'
       true
     end
 
@@ -127,36 +129,30 @@ module Svix
     # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      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]]))
+        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 :Time
         Time.parse(value)
@@ -191,7 +187,7 @@ module Svix
       else # model
         # models (e.g. Pet) or oneOf
         klass = Svix.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/svix/models/event_type_import_open_api_out.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.1.1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0
+Generator version: 7.9.0
 
 =end
 
@@ -59,12 +59,15 @@ module Svix
 
       if attributes.key?(:'data')
         self.data = attributes[:'data']
+      else
+        self.data = 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 @data.nil?
         invalid_properties.push('invalid value for "data", data cannot be nil.')
@@ -76,6 +79,7 @@ module Svix
     # 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 @data.nil?
       true
     end
@@ -104,36 +108,30 @@ module Svix
     # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      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]]))
+        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 :Time
         Time.parse(value)
@@ -168,7 +166,7 @@ module Svix
       else # model
         # models (e.g. Pet) or oneOf
         klass = Svix.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/svix/models/event_type_import_open_api_out_data.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.1.1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0
+Generator version: 7.9.0
 
 =end
 
@@ -66,6 +66,8 @@ module Svix
         if (value = attributes[:'modified']).is_a?(Array)
           self.modified = value
         end
+      else
+        self.modified = nil
       end
 
       if attributes.key?(:'to_modify')
@@ -78,6 +80,7 @@ module Svix
     # 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 @modified.nil?
         invalid_properties.push('invalid value for "modified", modified cannot be nil.')
@@ -89,6 +92,7 @@ module Svix
     # 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 @modified.nil?
       true
     end
@@ -118,36 +122,30 @@ module Svix
     # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      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]]))
+        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 :Time
         Time.parse(value)
@@ -182,7 +180,7 @@ module Svix
       else # model
         # models (e.g. Pet) or oneOf
         klass = Svix.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/svix/models/event_type_in.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.1.1
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.0
+Generator version: 7.9.0
 
 =end
 
@@ -101,6 +101,8 @@ module Svix
 
       if attributes.key?(:'description')
         self.description = attributes[:'description']
+      else
+        self.description = nil
       end
 
       if attributes.key?(:'feature_flag')
@@ -113,6 +115,8 @@ module Svix
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'schemas')
@@ -125,6 +129,7 @@ module Svix
     # 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 @description.nil?
         invalid_properties.push('invalid value for "description", description cannot be nil.')
@@ -167,6 +172,7 @@ module Svix
     # 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 @description.nil?
       return false if !@feature_flag.nil? && @feature_flag.to_s.length > 256
       return false if !@feature_flag.nil? && @feature_flag !~ Regexp.new(/^[a-zA-Z0-9\-_.]+$/)
@@ -257,36 +263,30 @@ module Svix
     # @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 attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      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]]))
+        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 :Time
         Time.parse(value)
@@ -321,7 +321,7 @@ module Svix
       else # model
         # models (e.g. Pet) or oneOf
         klass = Svix.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end