lib/dropbox-sign/models/account_response.rb in dropbox-sign-1.5.0 vs lib/dropbox-sign/models/account_response.rb in dropbox-sign-1.6.0

@@ -4,11 +4,11 @@
 #Dropbox Sign v3 API
 
 The version of the OpenAPI document: 3.0.0
 Contact: [e-mail]
 Generated by: https://openapi-generator.tech
-Generator version: 7.7.0
+Generator version: 7.8.0
 
 =end
 
 require 'date'
 require 'time'
@@ -80,15 +80,10 @@
     # Returns all the JSON keys this model knows about
     def self.acceptable_attributes
       attribute_map.values
     end
 
-    # Returns attribute map of this model + parent
-    def self.merged_attributes
-      self.attribute_map
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
         :'account_id' => :'String',
         :'email_address' => :'String',
@@ -102,25 +97,30 @@
         :'locale' => :'String',
         :'usage' => :'AccountResponseUsage'
       }
     end
 
-    # Attribute type mapping of this model + parent
-    def self.merged_types
-      self.openapi_types
-    end
-
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
         :'callback_url',
         :'role_code',
         :'team_id',
         :'locale',
       ])
     end
 
+    # Returns attribute map of this model + parent
+    def self.merged_attributes
+      self.attribute_map
+    end
+
+    # Attribute type mapping of this model + parent
+    def self.merged_types
+      self.openapi_types
+    end
+
     # Returns list of attributes with nullable: true of this model + parent
     def self.merged_nullable
       self.openapi_nullable
     end
 
@@ -301,10 +301,9 @@
           value.each do |k, v|
             hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
           end
         end
       else # model
-        # models (e.g. Pet)
         klass = Dropbox::Sign.const_get(type)
         klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end