first_data_gateway 1.6.0 → 1.9.0

data/lib/openapi_client/models/referenced_order_payment_schedules_request.rb

@@ -3,10 +3,10 @@
 
 #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.10.1.20200226.002
+The version of the OpenAPI document: 6.14.0.20201015.001
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: unset
+OpenAPI Generator version: 4.1.1
 
 =end
 
@@ -15,70 +15,12 @@ require 'date'
 module OpenapiClient
   # Request to create a new payment schedule using a referenced order ID.
   class ReferencedOrderPaymentSchedulesRequest < PaymentSchedulesRequest
-    # Object name of the payment schedules request.
-    attr_accessor :request_type
-
-    # Store ID number.
-    attr_accessor :store_id
-
-    # Date of mandate signature.
-    attr_accessor :start_date
-
-    # Number of times the recurring payment will process.
-    attr_accessor :number_of_payments
-
-    # Number of failures that can be encountered before re-tries cease.
-    attr_accessor :maximum_failures
-
-    # Invoice number.
-    attr_accessor :invoice_number
-
-    # Purchase order number.
-    attr_accessor :purchase_order_number
-
-    attr_accessor :transaction_origin
-
-    # Dynamic merchant name for the cardholder's statement.
-    attr_accessor :dynamic_merchant_name
-
-    attr_accessor :frequency
-
-    attr_accessor :transaction_amount
-
-    attr_accessor :client_locale
-
-    # Client order ID if supplied by client.
-    attr_accessor :order_id
-
-    attr_accessor :billing
-
-    attr_accessor :shipping
-
-    # User supplied comments.
-    attr_accessor :comments
-
     # Order ID used to create recurring payment from existing transaction.
     attr_accessor :referenced_order_id
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'request_type' => :'requestType',
-        :'store_id' => :'storeId',
-        :'start_date' => :'startDate',
-        :'number_of_payments' => :'numberOfPayments',
-        :'maximum_failures' => :'maximumFailures',
-        :'invoice_number' => :'invoiceNumber',
-        :'purchase_order_number' => :'purchaseOrderNumber',
-        :'transaction_origin' => :'transactionOrigin',
-        :'dynamic_merchant_name' => :'dynamicMerchantName',
-        :'frequency' => :'frequency',
-        :'transaction_amount' => :'transactionAmount',
-        :'client_locale' => :'clientLocale',
-        :'order_id' => :'orderId',
-        :'billing' => :'billing',
-        :'shipping' => :'shipping',
-        :'comments' => :'comments',
         :'referenced_order_id' => :'referencedOrderId'
       }
     end
@@ -86,22 +28,6 @@ module OpenapiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'request_type' => :'String',
-        :'store_id' => :'String',
-        :'start_date' => :'Date',
-        :'number_of_payments' => :'Integer',
-        :'maximum_failures' => :'Integer',
-        :'invoice_number' => :'String',
-        :'purchase_order_number' => :'String',
-        :'transaction_origin' => :'TransactionOrigin',
-        :'dynamic_merchant_name' => :'String',
-        :'frequency' => :'Frequency',
-        :'transaction_amount' => :'Amount',
-        :'client_locale' => :'ClientLocale',
-        :'order_id' => :'String',
-        :'billing' => :'Billing',
-        :'shipping' => :'Shipping',
-        :'comments' => :'String',
         :'referenced_order_id' => :'String'
       }
     end
@@ -132,70 +58,6 @@ module OpenapiClient
       # call parent's initialize
       super(attributes)
 
-      if attributes.key?(:'request_type')
-        self.request_type = attributes[:'request_type']
-      end
-
-      if attributes.key?(:'store_id')
-        self.store_id = attributes[:'store_id']
-      end
-
-      if attributes.key?(:'start_date')
-        self.start_date = attributes[:'start_date']
-      end
-
-      if attributes.key?(:'number_of_payments')
-        self.number_of_payments = attributes[:'number_of_payments']
-      end
-
-      if attributes.key?(:'maximum_failures')
-        self.maximum_failures = attributes[:'maximum_failures']
-      end
-
-      if attributes.key?(:'invoice_number')
-        self.invoice_number = attributes[:'invoice_number']
-      end
-
-      if attributes.key?(:'purchase_order_number')
-        self.purchase_order_number = attributes[:'purchase_order_number']
-      end
-
-      if attributes.key?(:'transaction_origin')
-        self.transaction_origin = attributes[:'transaction_origin']
-      end
-
-      if attributes.key?(:'dynamic_merchant_name')
-        self.dynamic_merchant_name = attributes[:'dynamic_merchant_name']
-      end
-
-      if attributes.key?(:'frequency')
-        self.frequency = attributes[:'frequency']
-      end
-
-      if attributes.key?(:'transaction_amount')
-        self.transaction_amount = attributes[:'transaction_amount']
-      end
-
-      if attributes.key?(:'client_locale')
-        self.client_locale = attributes[:'client_locale']
-      end
-
-      if attributes.key?(:'order_id')
-        self.order_id = attributes[:'order_id']
-      end
-
-      if attributes.key?(:'billing')
-        self.billing = attributes[:'billing']
-      end
-
-      if attributes.key?(:'shipping')
-        self.shipping = attributes[:'shipping']
-      end
-
-      if attributes.key?(:'comments')
-        self.comments = attributes[:'comments']
-      end
-
       if attributes.key?(:'referenced_order_id')
         self.referenced_order_id = attributes[:'referenced_order_id']
       end
@@ -205,26 +67,6 @@ module OpenapiClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = super
-      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 !@number_of_payments.nil? && @number_of_payments > 999
-        invalid_properties.push('invalid value for "number_of_payments", must be smaller than or equal to 999.')
-      end
-
-      if !@number_of_payments.nil? && @number_of_payments < 1
-        invalid_properties.push('invalid value for "number_of_payments", must be greater than or equal to 1.')
-      end
-
-      if !@maximum_failures.nil? && @maximum_failures > 999
-        invalid_properties.push('invalid value for "maximum_failures", must be smaller than or equal to 999.')
-      end
-
-      if !@maximum_failures.nil? && @maximum_failures < 1
-        invalid_properties.push('invalid value for "maximum_failures", must be greater than or equal to 1.')
-      end
-
       if @referenced_order_id.nil?
         invalid_properties.push('invalid value for "referenced_order_id", referenced_order_id cannot be nil.')
       end
@@ -240,54 +82,11 @@ 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 !@store_id.nil? && @store_id.to_s.length > 20
-      return false if !@number_of_payments.nil? && @number_of_payments > 999
-      return false if !@number_of_payments.nil? && @number_of_payments < 1
-      return false if !@maximum_failures.nil? && @maximum_failures > 999
-      return false if !@maximum_failures.nil? && @maximum_failures < 1
       return false if @referenced_order_id.nil?
       return false if @referenced_order_id !~ Regexp.new(/^(?!\s*$).+/)
       true && super
     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] number_of_payments Value to be assigned
-    def number_of_payments=(number_of_payments)
-      if !number_of_payments.nil? && number_of_payments > 999
-        fail ArgumentError, 'invalid value for "number_of_payments", must be smaller than or equal to 999.'
-      end
-
-      if !number_of_payments.nil? && number_of_payments < 1
-        fail ArgumentError, 'invalid value for "number_of_payments", must be greater than or equal to 1.'
-      end
-
-      @number_of_payments = number_of_payments
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] maximum_failures Value to be assigned
-    def maximum_failures=(maximum_failures)
-      if !maximum_failures.nil? && maximum_failures > 999
-        fail ArgumentError, 'invalid value for "maximum_failures", must be smaller than or equal to 999.'
-      end
-
-      if !maximum_failures.nil? && maximum_failures < 1
-        fail ArgumentError, 'invalid value for "maximum_failures", must be greater than or equal to 1.'
-      end
-
-      @maximum_failures = maximum_failures
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] referenced_order_id Value to be assigned
     def referenced_order_id=(referenced_order_id)
@@ -308,22 +107,6 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          request_type == o.request_type &&
-          store_id == o.store_id &&
-          start_date == o.start_date &&
-          number_of_payments == o.number_of_payments &&
-          maximum_failures == o.maximum_failures &&
-          invoice_number == o.invoice_number &&
-          purchase_order_number == o.purchase_order_number &&
-          transaction_origin == o.transaction_origin &&
-          dynamic_merchant_name == o.dynamic_merchant_name &&
-          frequency == o.frequency &&
-          transaction_amount == o.transaction_amount &&
-          client_locale == o.client_locale &&
-          order_id == o.order_id &&
-          billing == o.billing &&
-          shipping == o.shipping &&
-          comments == o.comments &&
           referenced_order_id == o.referenced_order_id && super(o)
     end
 
@@ -336,7 +119,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [request_type, store_id, start_date, number_of_payments, maximum_failures, invoice_number, purchase_order_number, transaction_origin, dynamic_merchant_name, frequency, transaction_amount, client_locale, order_id, billing, shipping, comments, referenced_order_id].hash
+      [referenced_order_id].hash
     end
 
     # Builds the object from hash
@@ -349,18 +132,18 @@ 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 build_from_hash(attributes, attribute_map = self.class.attribute_map, openapi_types = self.class.openapi_types)
       return nil unless attributes.is_a?(Hash)
-      super(attributes)
-      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 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
 
@@ -404,7 +187,12 @@ module OpenapiClient
           end
         end
       else # model
-        OpenapiClient.const_get(type).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
 
@@ -422,11 +210,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 = super
-      self.class.attribute_map.each_pair do |attr, param|
+    def to_hash(attribute_map = self.class.attribute_map, openapi_nullable = Set.new([]))
+      hash = super(self.class.superclass.attribute_map, 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

data/lib/openapi_client/models/referenced_order_payment_schedules_request_all_of.rb

@@ -3,10 +3,10 @@
 
 #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.10.1.20200226.002
+The version of the OpenAPI document: 6.14.0.20201015.001
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: unset
+OpenAPI Generator version: 4.1.1
 
 =end
 
@@ -14,70 +14,12 @@ require 'date'
 
 module OpenapiClient
   class ReferencedOrderPaymentSchedulesRequestAllOf
-    # Object name of the payment schedules request.
-    attr_accessor :request_type
-
-    # Store ID number.
-    attr_accessor :store_id
-
-    # Date of mandate signature.
-    attr_accessor :start_date
-
-    # Number of times the recurring payment will process.
-    attr_accessor :number_of_payments
-
-    # Number of failures that can be encountered before re-tries cease.
-    attr_accessor :maximum_failures
-
-    # Invoice number.
-    attr_accessor :invoice_number
-
-    # Purchase order number.
-    attr_accessor :purchase_order_number
-
-    attr_accessor :transaction_origin
-
-    # Dynamic merchant name for the cardholder's statement.
-    attr_accessor :dynamic_merchant_name
-
-    attr_accessor :frequency
-
-    attr_accessor :transaction_amount
-
-    attr_accessor :client_locale
-
-    # Client order ID if supplied by client.
-    attr_accessor :order_id
-
-    attr_accessor :billing
-
-    attr_accessor :shipping
-
-    # User supplied comments.
-    attr_accessor :comments
-
     # Order ID used to create recurring payment from existing transaction.
     attr_accessor :referenced_order_id
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'request_type' => :'requestType',
-        :'store_id' => :'storeId',
-        :'start_date' => :'startDate',
-        :'number_of_payments' => :'numberOfPayments',
-        :'maximum_failures' => :'maximumFailures',
-        :'invoice_number' => :'invoiceNumber',
-        :'purchase_order_number' => :'purchaseOrderNumber',
-        :'transaction_origin' => :'transactionOrigin',
-        :'dynamic_merchant_name' => :'dynamicMerchantName',
-        :'frequency' => :'frequency',
-        :'transaction_amount' => :'transactionAmount',
-        :'client_locale' => :'clientLocale',
-        :'order_id' => :'orderId',
-        :'billing' => :'billing',
-        :'shipping' => :'shipping',
-        :'comments' => :'comments',
         :'referenced_order_id' => :'referencedOrderId'
       }
     end
@@ -85,22 +27,6 @@ module OpenapiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'request_type' => :'String',
-        :'store_id' => :'String',
-        :'start_date' => :'Date',
-        :'number_of_payments' => :'Integer',
-        :'maximum_failures' => :'Integer',
-        :'invoice_number' => :'String',
-        :'purchase_order_number' => :'String',
-        :'transaction_origin' => :'TransactionOrigin',
-        :'dynamic_merchant_name' => :'String',
-        :'frequency' => :'Frequency',
-        :'transaction_amount' => :'Amount',
-        :'client_locale' => :'ClientLocale',
-        :'order_id' => :'String',
-        :'billing' => :'Billing',
-        :'shipping' => :'Shipping',
-        :'comments' => :'String',
         :'referenced_order_id' => :'String'
       }
     end
@@ -120,70 +46,6 @@ module OpenapiClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'request_type')
-        self.request_type = attributes[:'request_type']
-      end
-
-      if attributes.key?(:'store_id')
-        self.store_id = attributes[:'store_id']
-      end
-
-      if attributes.key?(:'start_date')
-        self.start_date = attributes[:'start_date']
-      end
-
-      if attributes.key?(:'number_of_payments')
-        self.number_of_payments = attributes[:'number_of_payments']
-      end
-
-      if attributes.key?(:'maximum_failures')
-        self.maximum_failures = attributes[:'maximum_failures']
-      end
-
-      if attributes.key?(:'invoice_number')
-        self.invoice_number = attributes[:'invoice_number']
-      end
-
-      if attributes.key?(:'purchase_order_number')
-        self.purchase_order_number = attributes[:'purchase_order_number']
-      end
-
-      if attributes.key?(:'transaction_origin')
-        self.transaction_origin = attributes[:'transaction_origin']
-      end
-
-      if attributes.key?(:'dynamic_merchant_name')
-        self.dynamic_merchant_name = attributes[:'dynamic_merchant_name']
-      end
-
-      if attributes.key?(:'frequency')
-        self.frequency = attributes[:'frequency']
-      end
-
-      if attributes.key?(:'transaction_amount')
-        self.transaction_amount = attributes[:'transaction_amount']
-      end
-
-      if attributes.key?(:'client_locale')
-        self.client_locale = attributes[:'client_locale']
-      end
-
-      if attributes.key?(:'order_id')
-        self.order_id = attributes[:'order_id']
-      end
-
-      if attributes.key?(:'billing')
-        self.billing = attributes[:'billing']
-      end
-
-      if attributes.key?(:'shipping')
-        self.shipping = attributes[:'shipping']
-      end
-
-      if attributes.key?(:'comments')
-        self.comments = attributes[:'comments']
-      end
-
       if attributes.key?(:'referenced_order_id')
         self.referenced_order_id = attributes[:'referenced_order_id']
       end
@@ -193,26 +55,6 @@ module OpenapiClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      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 !@number_of_payments.nil? && @number_of_payments > 999
-        invalid_properties.push('invalid value for "number_of_payments", must be smaller than or equal to 999.')
-      end
-
-      if !@number_of_payments.nil? && @number_of_payments < 1
-        invalid_properties.push('invalid value for "number_of_payments", must be greater than or equal to 1.')
-      end
-
-      if !@maximum_failures.nil? && @maximum_failures > 999
-        invalid_properties.push('invalid value for "maximum_failures", must be smaller than or equal to 999.')
-      end
-
-      if !@maximum_failures.nil? && @maximum_failures < 1
-        invalid_properties.push('invalid value for "maximum_failures", must be greater than or equal to 1.')
-      end
-
       if @referenced_order_id.nil?
         invalid_properties.push('invalid value for "referenced_order_id", referenced_order_id cannot be nil.')
       end
@@ -228,54 +70,11 @@ 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 !@store_id.nil? && @store_id.to_s.length > 20
-      return false if !@number_of_payments.nil? && @number_of_payments > 999
-      return false if !@number_of_payments.nil? && @number_of_payments < 1
-      return false if !@maximum_failures.nil? && @maximum_failures > 999
-      return false if !@maximum_failures.nil? && @maximum_failures < 1
       return false if @referenced_order_id.nil?
       return false if @referenced_order_id !~ Regexp.new(/^(?!\s*$).+/)
       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] number_of_payments Value to be assigned
-    def number_of_payments=(number_of_payments)
-      if !number_of_payments.nil? && number_of_payments > 999
-        fail ArgumentError, 'invalid value for "number_of_payments", must be smaller than or equal to 999.'
-      end
-
-      if !number_of_payments.nil? && number_of_payments < 1
-        fail ArgumentError, 'invalid value for "number_of_payments", must be greater than or equal to 1.'
-      end
-
-      @number_of_payments = number_of_payments
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] maximum_failures Value to be assigned
-    def maximum_failures=(maximum_failures)
-      if !maximum_failures.nil? && maximum_failures > 999
-        fail ArgumentError, 'invalid value for "maximum_failures", must be smaller than or equal to 999.'
-      end
-
-      if !maximum_failures.nil? && maximum_failures < 1
-        fail ArgumentError, 'invalid value for "maximum_failures", must be greater than or equal to 1.'
-      end
-
-      @maximum_failures = maximum_failures
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] referenced_order_id Value to be assigned
     def referenced_order_id=(referenced_order_id)
@@ -296,22 +95,6 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          request_type == o.request_type &&
-          store_id == o.store_id &&
-          start_date == o.start_date &&
-          number_of_payments == o.number_of_payments &&
-          maximum_failures == o.maximum_failures &&
-          invoice_number == o.invoice_number &&
-          purchase_order_number == o.purchase_order_number &&
-          transaction_origin == o.transaction_origin &&
-          dynamic_merchant_name == o.dynamic_merchant_name &&
-          frequency == o.frequency &&
-          transaction_amount == o.transaction_amount &&
-          client_locale == o.client_locale &&
-          order_id == o.order_id &&
-          billing == o.billing &&
-          shipping == o.shipping &&
-          comments == o.comments &&
           referenced_order_id == o.referenced_order_id
     end
 
@@ -324,7 +107,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [request_type, store_id, start_date, number_of_payments, maximum_failures, invoice_number, purchase_order_number, transaction_origin, dynamic_merchant_name, frequency, transaction_amount, client_locale, order_id, billing, shipping, comments, referenced_order_id].hash
+      [referenced_order_id].hash
     end
 
     # Builds the object from hash
@@ -337,17 +120,17 @@ 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 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 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
 
@@ -391,7 +174,12 @@ module OpenapiClient
           end
         end
       else # model
-        OpenapiClient.const_get(type).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
 
@@ -409,11 +197,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 = Set.new([]))
       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