lob 6.0.0.pre.rc → 6.0.0

data/lib/openapi_client/models/tracking_event_certified.rb

@@ -13,7 +13,7 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class TrackingEventCertified
     # a Certified letter tracking event
     attr_accessor :type
@@ -108,13 +108,13 @@ module OpenapiClient
     # @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::TrackingEventCertified` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Lob::TrackingEventCertified` 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::TrackingEventCertified`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Lob::TrackingEventCertified`. 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
       }
@@ -363,7 +363,7 @@ module OpenapiClient
         end
       else # model
         # models (e.g. Pet) or oneOf
-        klass = OpenapiClient.const_get(type)
+        klass = Lob.const_get(type)
         klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end

data/lib/openapi_client/models/tracking_event_details.rb

@@ -13,7 +13,7 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class TrackingEventDetails
     # Find the full table [here](#tag/Tracking-Events). A detailed substatus about the event: * `package_accepted` - Package has been accepted into the carrier network for delivery. * `package_arrived` - Package has arrived at an intermediate location in the carrier network. * `package_departed` - Package has departed from an intermediate location in the carrier network. * `package_processing` - Package is processing at an intermediate location in the carrier network. * `package_processed` - Package has been processed at an intermediate location. * `package_in_local_area` - Package is at a location near the end destination. * `delivery_scheduled` - Package is scheduled for delivery. * `out_for_delivery` - Package is out for delivery. * `pickup_available` - Package is available for pickup at carrier location. * `delivered` - Package has been delivered. * `package_forwarded` - Package has been forwarded. * `returned_to_sender` - Package is to be returned to sender. * `address_issue` - Address information is incorrect. Contact carrier to ensure delivery. * `contact_carrier` - Contact the carrier for more information. * `delayed` - Delivery of package is delayed. * `delivery_attempted` - Delivery of package has been attempted. Contact carrier to ensure delivery. * `delivery_rescheduled` - Delivery of package has been rescheduled. * `location_inaccessible` - Delivery location inaccessible to carrier. Contact carrier to ensure delivery. * `notice_left` - Carrier left notice during attempted delivery. Follow carrier instructions on notice. * `package_damaged` - Package has been damaged. Contact carrier for more details. * `package_disposed` - Package has been disposed. * `package_held` - Package held at carrier location. Contact carrier for more details. * `package_lost` - Package has been lost. Contact carrier for more details. * `package_unclaimed` - Package is unclaimed. * `package_undeliverable` - Package is not able to be delivered. * `reschedule_delivery` - Contact carrier to reschedule delivery. * `other` - Unrecognized carrier status. 
     attr_accessor :event
@@ -84,13 +84,13 @@ module OpenapiClient
     # @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::TrackingEventDetails` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Lob::TrackingEventDetails` 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::TrackingEventDetails`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Lob::TrackingEventDetails`. 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
       }
@@ -252,7 +252,7 @@ module OpenapiClient
         end
       else # model
         # models (e.g. Pet) or oneOf
-        klass = OpenapiClient.const_get(type)
+        klass = Lob.const_get(type)
         klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end

data/lib/openapi_client/models/tracking_event_normal.rb

@@ -13,7 +13,7 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class TrackingEventNormal
     # non-Certified postcards, self mailers, letters, and checks
     attr_accessor :type
@@ -110,13 +110,13 @@ module OpenapiClient
     # @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::TrackingEventNormal` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Lob::TrackingEventNormal` 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::TrackingEventNormal`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Lob::TrackingEventNormal`. 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
       }
@@ -353,7 +353,7 @@ module OpenapiClient
         end
       else # model
         # models (e.g. Pet) or oneOf
-        klass = OpenapiClient.const_get(type)
+        klass = Lob.const_get(type)
         klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end

data/lib/openapi_client/models/upload.rb

@@ -13,7 +13,7 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class Upload
     # Unique identifier prefixed with `upl_`.
     attr_accessor :id
@@ -21,9 +21,6 @@ module OpenapiClient
     # Account ID that made the request
     attr_accessor :account_id
 
-    # Unique identifier prefixed with `cmp_`.
-    attr_accessor :campaign_id
-
     # The environment in which the mailpieces were created. Today, will only be `live`.
     attr_accessor :mode
 
@@ -53,8 +50,14 @@ module OpenapiClient
     # A timestamp in ISO 8601 format of the date the upload was last modified
     attr_accessor :date_modified
 
-    # Only returned if the resource has been successfully deleted.
-    attr_accessor :deleted
+    attr_accessor :required_address_column_mapping
+
+    attr_accessor :optional_address_column_mapping
+
+    attr_accessor :metadata
+
+    # The mapping of column headers in your file to the merge variables present in your creative. See our <a href=\"https://help.lob.com/print-and-mail/building-a-mail-strategy/campaign-or-triggered-sends/campaign-audience-guide#step-3-map-merge-variable-data-if-applicable-7\" target=\"_blank\">Campaign Audience Guide</a> for additional details. <br />If a merge variable has the same \"name\" as a \"key\" in the `requiredAddressColumnMapping` or `optionalAddressColumnMapping` objects, then they **CANNOT** have a different value in this object. If a different value is provided, then when the campaign is processing it will get overwritten with the mapped value present in the `requiredAddressColumnMapping` or `optionalAddressColumnMapping` objects.
+    attr_accessor :merge_variable_column_mapping
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -83,7 +86,6 @@ module OpenapiClient
       {
         :'id' => :'id',
         :'account_id' => :'accountId',
-        :'campaign_id' => :'campaignId',
         :'mode' => :'mode',
         :'failures_url' => :'failuresUrl',
         :'original_filename' => :'originalFilename',
@@ -94,7 +96,10 @@ module OpenapiClient
         :'bytes_processed' => :'bytesProcessed',
         :'date_created' => :'dateCreated',
         :'date_modified' => :'dateModified',
-        :'deleted' => :'deleted'
+        :'required_address_column_mapping' => :'requiredAddressColumnMapping',
+        :'optional_address_column_mapping' => :'optionalAddressColumnMapping',
+        :'metadata' => :'metadata',
+        :'merge_variable_column_mapping' => :'mergeVariableColumnMapping'
       }
     end
 
@@ -108,7 +113,6 @@ module OpenapiClient
       {
         :'id' => :'String',
         :'account_id' => :'String',
-        :'campaign_id' => :'String',
         :'mode' => :'String',
         :'failures_url' => :'String',
         :'original_filename' => :'String',
@@ -119,13 +123,17 @@ module OpenapiClient
         :'bytes_processed' => :'Integer',
         :'date_created' => :'Time',
         :'date_modified' => :'Time',
-        :'deleted' => :'Boolean'
+        :'required_address_column_mapping' => :'RequiredAddressColumnMapping',
+        :'optional_address_column_mapping' => :'OptionalAddressColumnMapping',
+        :'metadata' => :'UploadsMetadata',
+        :'merge_variable_column_mapping' => :'Object'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'merge_variable_column_mapping'
       ])
     end
 
@@ -133,13 +141,13 @@ module OpenapiClient
     # @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::Upload` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Lob::Upload` 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::Upload`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Lob::Upload`. 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
       }
@@ -152,10 +160,6 @@ module OpenapiClient
         self.account_id = attributes[:'account_id']
       end
 
-      if attributes.key?(:'campaign_id')
-        self.campaign_id = attributes[:'campaign_id']
-      end
-
       if attributes.key?(:'mode')
         self.mode = attributes[:'mode']
       end
@@ -198,8 +202,20 @@ module OpenapiClient
         self.date_modified = attributes[:'date_modified']
       end
 
-      if attributes.key?(:'deleted')
-        self.deleted = attributes[:'deleted']
+      if attributes.key?(:'required_address_column_mapping')
+        self.required_address_column_mapping = attributes[:'required_address_column_mapping']
+      end
+
+      if attributes.key?(:'optional_address_column_mapping')
+        self.optional_address_column_mapping = attributes[:'optional_address_column_mapping']
+      end
+
+      if attributes.key?(:'metadata')
+        self.metadata = attributes[:'metadata']
+      end
+
+      if attributes.key?(:'merge_variable_column_mapping')
+        self.merge_variable_column_mapping = attributes[:'merge_variable_column_mapping']
       end
     end
 
@@ -220,15 +236,6 @@ module OpenapiClient
         invalid_properties.push('invalid value for "account_id", account_id cannot be nil.')
       end
 
-      if @campaign_id.nil?
-        invalid_properties.push('invalid value for "campaign_id", campaign_id cannot be nil.')
-      end
-
-      pattern = Regexp.new(/^cmp_[a-zA-Z0-9]+$/)
-      if @campaign_id !~ pattern
-        invalid_properties.push("invalid value for \"campaign_id\", must conform to the pattern #{pattern}.")
-      end
-
       if @mode.nil?
         invalid_properties.push('invalid value for "mode", mode cannot be nil.')
       end
@@ -261,6 +268,18 @@ module OpenapiClient
         invalid_properties.push('invalid value for "date_modified", date_modified cannot be nil.')
       end
 
+      if @required_address_column_mapping.nil?
+        invalid_properties.push('invalid value for "required_address_column_mapping", required_address_column_mapping cannot be nil.')
+      end
+
+      if @optional_address_column_mapping.nil?
+        invalid_properties.push('invalid value for "optional_address_column_mapping", optional_address_column_mapping cannot be nil.')
+      end
+
+      if @metadata.nil?
+        invalid_properties.push('invalid value for "metadata", metadata cannot be nil.')
+      end
+
       invalid_properties
     end
 
@@ -270,8 +289,6 @@ module OpenapiClient
       return false if @id.nil?
       return false if @id !~ Regexp.new(/^upl_[a-zA-Z0-9]+$/)
       return false if @account_id.nil?
-      return false if @campaign_id.nil?
-      return false if @campaign_id !~ Regexp.new(/^cmp_[a-zA-Z0-9]+$/)
       return false if @mode.nil?
       mode_validator = EnumAttributeValidator.new('String', ["test", "live"])
       return false unless mode_validator.valid?(@mode)
@@ -282,6 +299,9 @@ module OpenapiClient
       return false if @bytes_processed.nil?
       return false if @date_created.nil?
       return false if @date_modified.nil?
+      return false if @required_address_column_mapping.nil?
+      return false if @optional_address_column_mapping.nil?
+      return false if @metadata.nil?
       true
     end
 
@@ -300,21 +320,6 @@ module OpenapiClient
       @id = id
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] campaign_id Value to be assigned
-    def campaign_id=(campaign_id)
-      if campaign_id.nil?
-        fail ArgumentError, 'campaign_id cannot be nil'
-      end
-
-      pattern = Regexp.new(/^cmp_[a-zA-Z0-9]+$/)
-      if campaign_id !~ pattern
-        fail ArgumentError, "invalid value for \"campaign_id\", must conform to the pattern #{pattern}."
-      end
-
-      @campaign_id = campaign_id
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] mode Object to be assigned
     def mode=(mode)
@@ -332,7 +337,6 @@ module OpenapiClient
       self.class == o.class &&
           id == o.id &&
           account_id == o.account_id &&
-          campaign_id == o.campaign_id &&
           mode == o.mode &&
           failures_url == o.failures_url &&
           original_filename == o.original_filename &&
@@ -343,7 +347,10 @@ module OpenapiClient
           bytes_processed == o.bytes_processed &&
           date_created == o.date_created &&
           date_modified == o.date_modified &&
-          deleted == o.deleted
+          required_address_column_mapping == o.required_address_column_mapping &&
+          optional_address_column_mapping == o.optional_address_column_mapping &&
+          metadata == o.metadata &&
+          merge_variable_column_mapping == o.merge_variable_column_mapping
     end
 
     # @see the `==` method
@@ -355,7 +362,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, account_id, campaign_id, mode, failures_url, original_filename, state, total_mailpieces, failed_mailpieces, validated_mailpieces, bytes_processed, date_created, date_modified, deleted].hash
+      [id, account_id, mode, failures_url, original_filename, state, total_mailpieces, failed_mailpieces, validated_mailpieces, bytes_processed, date_created, date_modified, required_address_column_mapping, optional_address_column_mapping, metadata, merge_variable_column_mapping].hash
     end
 
 
@@ -435,7 +442,7 @@ module OpenapiClient
         end
       else # model
         # models (e.g. Pet) or oneOf
-        klass = OpenapiClient.const_get(type)
+        klass = Lob.const_get(type)
         klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end

data/lib/openapi_client/models/upload_create_export.rb

@@ -13,7 +13,7 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class UploadCreateExport
     attr_accessor :message
 
@@ -72,13 +72,13 @@ module OpenapiClient
     # @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::UploadCreateExport` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Lob::UploadCreateExport` 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::UploadCreateExport`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Lob::UploadCreateExport`. 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
       }
@@ -227,7 +227,7 @@ module OpenapiClient
         end
       else # model
         # models (e.g. Pet) or oneOf
-        klass = OpenapiClient.const_get(type)
+        klass = Lob.const_get(type)
         klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end

data/lib/openapi_client/models/upload_file.rb

@@ -13,7 +13,7 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class UploadFile
     attr_accessor :message
 
@@ -72,13 +72,13 @@ module OpenapiClient
     # @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::UploadFile` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Lob::UploadFile` 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::UploadFile`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Lob::UploadFile`. 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
       }
@@ -227,7 +227,7 @@ module OpenapiClient
         end
       else # model
         # models (e.g. Pet) or oneOf
-        klass = OpenapiClient.const_get(type)
+        klass = Lob.const_get(type)
         klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end

data/lib/openapi_client/models/upload_state.rb

@@ -13,7 +13,7 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class UploadState
     PREPROCESSING = "Preprocessing".freeze
     DRAFT = "Draft".freeze

data/lib/openapi_client/models/upload_updatable.rb

@@ -13,18 +13,28 @@ OpenAPI Generator version: 5.2.1
 require 'date'
 require 'time'
 
-module OpenapiClient
+module Lob
   class UploadUpdatable
-    attr_accessor :state
-
     # Original filename provided when the upload is created.
     attr_accessor :original_filename
 
+    attr_accessor :required_address_column_mapping
+
+    attr_accessor :optional_address_column_mapping
+
+    attr_accessor :metadata
+
+    # The mapping of column headers in your file to the merge variables present in your creative. See our <a href=\"https://help.lob.com/print-and-mail/building-a-mail-strategy/campaign-or-triggered-sends/campaign-audience-guide#step-3-map-merge-variable-data-if-applicable-7\" target=\"_blank\">Campaign Audience Guide</a> for additional details. <br />If a merge variable has the same \"name\" as a \"key\" in the `requiredAddressColumnMapping` or `optionalAddressColumnMapping` objects, then they **CANNOT** have a different value in this object. If a different value is provided, then when the campaign is processing it will get overwritten with the mapped value present in the `requiredAddressColumnMapping` or `optionalAddressColumnMapping` objects.
+    attr_accessor :merge_variable_column_mapping
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'state' => :'state',
-        :'original_filename' => :'originalFilename'
+        :'original_filename' => :'originalFilename',
+        :'required_address_column_mapping' => :'requiredAddressColumnMapping',
+        :'optional_address_column_mapping' => :'optionalAddressColumnMapping',
+        :'metadata' => :'metadata',
+        :'merge_variable_column_mapping' => :'mergeVariableColumnMapping'
       }
     end
 
@@ -36,14 +46,18 @@ module OpenapiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'state' => :'UploadState',
-        :'original_filename' => :'String'
+        :'original_filename' => :'String',
+        :'required_address_column_mapping' => :'RequiredAddressColumnMapping',
+        :'optional_address_column_mapping' => :'OptionalAddressColumnMapping',
+        :'metadata' => :'UploadsMetadata',
+        :'merge_variable_column_mapping' => :'Object'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'merge_variable_column_mapping'
       ])
     end
 
@@ -51,26 +65,36 @@ module OpenapiClient
     # @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::UploadUpdatable` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Lob::UploadUpdatable` 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::UploadUpdatable`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Lob::UploadUpdatable`. 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?(:'state')
-        self.state = attributes[:'state']
-      else
-        self.state = 'Draft'
-      end
-
       if attributes.key?(:'original_filename')
         self.original_filename = attributes[:'original_filename']
       end
+
+      if attributes.key?(:'required_address_column_mapping')
+        self.required_address_column_mapping = attributes[:'required_address_column_mapping']
+      end
+
+      if attributes.key?(:'optional_address_column_mapping')
+        self.optional_address_column_mapping = attributes[:'optional_address_column_mapping']
+      end
+
+      if attributes.key?(:'metadata')
+        self.metadata = attributes[:'metadata']
+      end
+
+      if attributes.key?(:'merge_variable_column_mapping')
+        self.merge_variable_column_mapping = attributes[:'merge_variable_column_mapping']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -91,8 +115,11 @@ module OpenapiClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          state == o.state &&
-          original_filename == o.original_filename
+          original_filename == o.original_filename &&
+          required_address_column_mapping == o.required_address_column_mapping &&
+          optional_address_column_mapping == o.optional_address_column_mapping &&
+          metadata == o.metadata &&
+          merge_variable_column_mapping == o.merge_variable_column_mapping
     end
 
     # @see the `==` method
@@ -104,7 +131,7 @@ module OpenapiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [state, original_filename].hash
+      [original_filename, required_address_column_mapping, optional_address_column_mapping, metadata, merge_variable_column_mapping].hash
     end
 
 
@@ -184,7 +211,7 @@ module OpenapiClient
         end
       else # model
         # models (e.g. Pet) or oneOf
-        klass = OpenapiClient.const_get(type)
+        klass = Lob.const_get(type)
         klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end