first_data_gateway 1.2.0 → 1.7.0

data/lib/openapi_client/models/china_domestic_payment_method.rb

@@ -3,7 +3,7 @@
 
 #The documentation here is designed to provide all of the technical guidance required to consume and integrate with our APIs for payment processing. To learn more about our APIs please visit https://docs.firstdata.com/org/gateway.
 
-OpenAPI spec version: 6.6.0.20190329.001
+The version of the OpenAPI document: 6.12.0.20200605.001
 
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: unset
@@ -57,19 +57,39 @@ module OpenapiClient
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # List of class defined in allOf (OpenAPI v3)
+    def self.openapi_all_of
+      [
+      :'ChinaDomesticPaymentMethodAllOf'
+      ]
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OpenapiClient::ChinaDomesticPaymentMethod` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # 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 `OpenapiClient::ChinaDomesticPaymentMethod`. 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.has_key?(:'chinaDomestic')
-        self.china_domestic = attributes[:'chinaDomestic']
+      if attributes.key?(:'china_domestic')
+        self.china_domestic = attributes[:'china_domestic']
       end
 
-      if attributes.has_key?(:'brand')
+      if attributes.key?(:'brand')
         self.brand = attributes[:'brand']
       end
     end
@@ -94,7 +114,7 @@ module OpenapiClient
     def valid?
       return false if @china_domestic.nil?
       return false if @brand.nil?
-      brand_validator = EnumAttributeValidator.new('String', ['ALIPAY_DOMESTIC', 'CUP_DOMESTIC', 'WECHAT_DOMESTIC'])
+      brand_validator = EnumAttributeValidator.new('String', ["ALIPAY_DOMESTIC", "CUP_DOMESTIC", "WECHAT_DOMESTIC"])
       return false unless brand_validator.valid?(@brand)
       true
     end
@@ -102,9 +122,9 @@ module OpenapiClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] brand Object to be assigned
     def brand=(brand)
-      validator = EnumAttributeValidator.new('String', ['ALIPAY_DOMESTIC', 'CUP_DOMESTIC', 'WECHAT_DOMESTIC'])
+      validator = EnumAttributeValidator.new('String', ["ALIPAY_DOMESTIC", "CUP_DOMESTIC", "WECHAT_DOMESTIC"])
       unless validator.valid?(brand)
-        fail ArgumentError, 'invalid value for "brand", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"brand\", must be one of #{validator.allowable_values}."
       end
       @brand = brand
     end
@@ -125,7 +145,7 @@ module OpenapiClient
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [china_domestic, brand].hash
     end
@@ -133,17 +153,24 @@ module OpenapiClient
     # 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)
+    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, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
+      openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+          # 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)
+            self.send("#{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?
+          self.send("#{key}=", _deserialize(type, attributes[attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -166,7 +193,7 @@ module OpenapiClient
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -187,8 +214,12 @@ module OpenapiClient
           end
         end
       else # model
-        temp_model = OpenapiClient.const_get(type).new
-        temp_model.build_from_hash(value)
+        klass = OpenapiClient.const_get(type)
+        if klass.respond_to?(:openapi_discriminator_name)
+          klass = OpenapiClient.const_get(value[klass.attribute_map[klass.openapi_discriminator_name]])
+        end
+ 
+        klass.build_from_hash(value)
       end
     end
 
@@ -206,11 +237,15 @@ module OpenapiClient
 
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
-    def to_hash
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = self.class.openapi_nullable)
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash

data/lib/openapi_client/models/china_domestic_payment_method_all_of.rb

@@ -0,0 +1,264 @@
+=begin
+#Payment Gateway API Specification.
+
+#The documentation here is designed to provide all of the technical guidance required to consume and integrate with our APIs for payment processing. To learn more about our APIs please visit https://docs.firstdata.com/org/gateway.
+
+The version of the OpenAPI document: 6.12.0.20200605.001
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: unset
+
+=end
+
+require 'date'
+
+module OpenapiClient
+  class ChinaDomesticPaymentMethodAllOf
+    attr_accessor :china_domestic
+
+    attr_accessor :brand
+
+    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
+      {
+        :'china_domestic' => :'chinaDomestic',
+        :'brand' => :'brand'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'china_domestic' => :'ChinaDomestic',
+        :'brand' => :'String'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # Initializes the object
+    # @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 `OpenapiClient::ChinaDomesticPaymentMethodAllOf` 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 `OpenapiClient::ChinaDomesticPaymentMethodAllOf`. 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?(:'china_domestic')
+        self.china_domestic = attributes[:'china_domestic']
+      end
+
+      if attributes.key?(:'brand')
+        self.brand = attributes[:'brand']
+      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
+      invalid_properties = Array.new
+      if @china_domestic.nil?
+        invalid_properties.push('invalid value for "china_domestic", china_domestic cannot be nil.')
+      end
+
+      if @brand.nil?
+        invalid_properties.push('invalid value for "brand", brand cannot be nil.')
+      end
+
+      invalid_properties
+    end
+
+    # 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 @china_domestic.nil?
+      return false if @brand.nil?
+      brand_validator = EnumAttributeValidator.new('String', ["ALIPAY_DOMESTIC", "CUP_DOMESTIC", "WECHAT_DOMESTIC"])
+      return false unless brand_validator.valid?(@brand)
+      true
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] brand Object to be assigned
+    def brand=(brand)
+      validator = EnumAttributeValidator.new('String', ["ALIPAY_DOMESTIC", "CUP_DOMESTIC", "WECHAT_DOMESTIC"])
+      unless validator.valid?(brand)
+        fail ArgumentError, "invalid value for \"brand\", must be one of #{validator.allowable_values}."
+      end
+      @brand = brand
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          china_domestic == o.china_domestic &&
+          brand == o.brand
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [china_domestic, brand].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, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
+      return nil unless attributes.is_a?(Hash)
+      openapi_types.each_pair do |key, type|
+        if 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[attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[attribute_map[key]]))
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    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)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        klass = OpenapiClient.const_get(type)
+        if klass.respond_to?(:openapi_discriminator_name)
+          klass = OpenapiClient.const_get(value[klass.attribute_map[klass.openapi_discriminator_name]])
+        end
+ 
+        klass.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = self.class.openapi_nullable)
+      hash = {}
+      attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

data/lib/openapi_client/models/china_pn_r_sale_transaction.rb

@@ -3,7 +3,7 @@
 
 #The documentation here is designed to provide all of the technical guidance required to consume and integrate with our APIs for payment processing. To learn more about our APIs please visit https://docs.firstdata.com/org/gateway.
 
-OpenAPI spec version: 6.6.0.20190329.001
+The version of the OpenAPI document: 6.12.0.20200605.001
 
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: unset
@@ -14,33 +14,12 @@ require 'date'
 
 module OpenapiClient
   # Request to create sale transaction using China PnR.
-  class ChinaPnRSaleTransaction
-    # Object name of the primary transaction request.
-    attr_accessor :request_type
-
-    # An optional outlet ID for clients that support multiple stores in the same app.
-    attr_accessor :store_id
-
-    # The unique merchant transaction ID from the request header, if supplied.
-    attr_accessor :merchant_transaction_id
-
-    attr_accessor :transaction_amount
-
-    attr_accessor :transaction_origin
-
-    attr_accessor :order
-
+  class ChinaPnRSaleTransaction < PrimaryTransaction
     attr_accessor :payment_method
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'request_type' => :'requestType',
-        :'store_id' => :'storeId',
-        :'merchant_transaction_id' => :'merchantTransactionId',
-        :'transaction_amount' => :'transactionAmount',
-        :'transaction_origin' => :'transactionOrigin',
-        :'order' => :'order',
         :'payment_method' => :'paymentMethod'
       }
     end
@@ -48,73 +27,51 @@ module OpenapiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'request_type' => :'String',
-        :'store_id' => :'String',
-        :'merchant_transaction_id' => :'String',
-        :'transaction_amount' => :'Amount',
-        :'transaction_origin' => :'TransactionOrigin',
-        :'order' => :'Order',
         :'payment_method' => :'ChinaDomesticPaymentMethod'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # List of class defined in allOf (OpenAPI v3)
+    def self.openapi_all_of
+      [
+      :'ChinaPnRSaleTransactionAllOf',
+      :'PrimaryTransaction'
+      ]
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'requestType')
-        self.request_type = attributes[:'requestType']
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OpenapiClient::ChinaPnRSaleTransaction` initialize method"
       end
 
-      if attributes.has_key?(:'storeId')
-        self.store_id = attributes[:'storeId']
-      end
-
-      if attributes.has_key?(:'merchantTransactionId')
-        self.merchant_transaction_id = attributes[:'merchantTransactionId']
-      end
-
-      if attributes.has_key?(:'transactionAmount')
-        self.transaction_amount = attributes[:'transactionAmount']
-      end
-
-      if attributes.has_key?(:'transactionOrigin')
-        self.transaction_origin = attributes[:'transactionOrigin']
-      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 `OpenapiClient::ChinaPnRSaleTransaction`. 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.has_key?(:'order')
-        self.order = attributes[:'order']
-      end
+      # call parent's initialize
+      super(attributes)
 
-      if attributes.has_key?(:'paymentMethod')
-        self.payment_method = attributes[:'paymentMethod']
+      if attributes.key?(:'payment_method')
+        self.payment_method = attributes[:'payment_method']
       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
-      invalid_properties = Array.new
-      if @request_type.nil?
-        invalid_properties.push('invalid value for "request_type", request_type cannot be nil.')
-      end
-
-      if !@store_id.nil? && @store_id.to_s.length > 20
-        invalid_properties.push('invalid value for "store_id", the character length must be smaller than or equal to 20.')
-      end
-
-      if !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
-        invalid_properties.push('invalid value for "merchant_transaction_id", the character length must be smaller than or equal to 40.')
-      end
-
-      if @transaction_amount.nil?
-        invalid_properties.push('invalid value for "transaction_amount", transaction_amount cannot be nil.')
-      end
-
+      invalid_properties = super
       if @payment_method.nil?
         invalid_properties.push('invalid value for "payment_method", payment_method cannot be nil.')
       end
@@ -125,32 +82,8 @@ module OpenapiClient
     # 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 @request_type.nil?
-      return false if !@store_id.nil? && @store_id.to_s.length > 20
-      return false if !@merchant_transaction_id.nil? && @merchant_transaction_id.to_s.length > 40
-      return false if @transaction_amount.nil?
       return false if @payment_method.nil?
-      true
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] store_id Value to be assigned
-    def store_id=(store_id)
-      if !store_id.nil? && store_id.to_s.length > 20
-        fail ArgumentError, 'invalid value for "store_id", the character length must be smaller than or equal to 20.'
-      end
-
-      @store_id = store_id
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] merchant_transaction_id Value to be assigned
-    def merchant_transaction_id=(merchant_transaction_id)
-      if !merchant_transaction_id.nil? && merchant_transaction_id.to_s.length > 40
-        fail ArgumentError, 'invalid value for "merchant_transaction_id", the character length must be smaller than or equal to 40.'
-      end
-
-      @merchant_transaction_id = merchant_transaction_id
+      true && super
     end
 
     # Checks equality by comparing each attribute.
@@ -158,13 +91,7 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          request_type == o.request_type &&
-          store_id == o.store_id &&
-          merchant_transaction_id == o.merchant_transaction_id &&
-          transaction_amount == o.transaction_amount &&
-          transaction_origin == o.transaction_origin &&
-          order == o.order &&
-          payment_method == o.payment_method
+          payment_method == o.payment_method && super(o)
     end
 
     # @see the `==` method
@@ -174,25 +101,33 @@ module OpenapiClient
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
-      [request_type, store_id, merchant_transaction_id, transaction_amount, transaction_origin, order, payment_method].hash
+      [payment_method].hash
     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)
+    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, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
+      super(attributes, self.class.superclass.attribute_map, self.class.superclass.openapi_types)
+      openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+          # 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)
+            self.send("#{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?
+          self.send("#{key}=", _deserialize(type, attributes[attribute_map[key]]))
         end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
@@ -215,7 +150,7 @@ module OpenapiClient
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -236,8 +171,12 @@ module OpenapiClient
           end
         end
       else # model
-        temp_model = OpenapiClient.const_get(type).new
-        temp_model.build_from_hash(value)
+        klass = OpenapiClient.const_get(type)
+        if klass.respond_to?(:openapi_discriminator_name)
+          klass = OpenapiClient.const_get(value[klass.attribute_map[klass.openapi_discriminator_name]])
+        end
+ 
+        klass.build_from_hash(value)
       end
     end
 
@@ -255,11 +194,15 @@ module OpenapiClient
 
     # Returns the object in the form of hash
     # @return [Hash] Returns the object in the form of hash
-    def to_hash
-      hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = self.class.openapi_nullable)
+      hash = super(self.class.superclass.attribute_map, self.class.superclass.openapi_nullable)
+      attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash